screen-manage 更新版本获取因子接口以及分配因子接口

kaiyu

2021-05-27 d7e7a651810d74e1d0d474090cb9fd78ffd5427b

screen-manage
              更新版本获取因子接口以及分配因子接口

 screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java

@@ -36,9 +36,9 @@
    private Integer versionId;

    /**
     * 因子code
     * 因子Id
     */
    private String sensorCode;
    private Integer sensorId;

    /**
     * 单位字典key

 screen-manage/src/main/java/com/moral/api/pojo/vo/Version/VersionQueryVO.java

@@ -87,7 +87,7 @@
    private static SensorVO convertToSensorVO(Sensor sensor) {
        SensorVO vo = new SensorVO();
        vo.setName(sensor.getName());
        vo.setCode(sensor.getCode());
        vo.setId(sensor.getId());
        vo.setUnit(sensor.getUnit());
        vo.setMaxValue(sensor.getMaxValue());
        vo.setMinValue(sensor.getMinValue());

 screen-manage/src/main/java/com/moral/api/service/impl/SensorServiceImpl.java

@@ -142,7 +142,7 @@
                wrapper_Version.eq("sensor_code",oldSensor.getCode());
                wrapper_Version.eq("is_delete","0");
                VersionSensorUnit versionSensorUnit = new VersionSensorUnit();
                versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString());
               // versionSensorUnit.setSensorCode(updateSensorMap.get(key).toString());
                versionSensorUnitMapper.update(versionSensorUnit,wrapper_Version);
                content = content+"编号:"+oldSensor.getCode()+"->"+updateSensorMap.get(key)+";";
            }

 screen-manage/src/main/resources/mapper/VersionMapper.xml

@@ -22,7 +22,6 @@
        <collection property="sensors" column="id" ofType="com.moral.api.entity.Sensor">
            <id property="id" column="sid"></id>
            <result property="name" column="sname"></result>
            <result property="code" column="scode"></result>
            <result property="unitKey" column="dataKey"></result>
            <result property="unit" column="dataValue"></result>
            <result property="maxValue" column="max_value"></result>
@@ -32,7 +31,7 @@

    <select id="queryVersionsAndSensorUnitByIds" resultMap="VersionSensorUnitMap">
    SELECT
      v.`id`,v.`name`,v.`desc`,v.`create_time`,v.`update_time`,s.`id` AS sid,s.`code` as scode,s.`name` AS sname ,u.dataKey,u.dataValue,vsu.`max_value` ,vsu.`min_value`
      v.`id`,v.`name`,v.`desc`,v.`create_time`,v.`update_time`,s.`id` AS sid,s.`name` AS sname ,u.dataKey,u.dataValue,vsu.`max_value` ,vsu.`min_value`
    FROM
      `version` v
    LEFT JOIN
@@ -42,7 +41,7 @@
    LEFT JOIN
      sensor s
    ON
      s.`code` = vsu.`sensor_code` AND s.`is_delete` = 0
      s.`id` = vsu.`sensor_id` AND s.`is_delete` = 0
    LEFT JOIN
    (
      SELECT