考评周期、考评等级

operation_manager/src/main/resources/mapper/evaluation/EvaluationItemValueMapper.xml

@@ -54,7 +54,7 @@
 
         <where>
             <if test="evaluationItemId != null ">and a.evaluation_item_id = #{evaluationItemId}</if>
-            <if test="tenantId != null ">and a.tenantId = #{tenantId}</if>
+            <if test="tenantId != null ">and a.TENANT_ID = #{tenantId}</if>
         </where>
     </select>
 
@@ -70,7 +70,7 @@
             </if>
             <if test="evaluationItemValue.dateUpdate != null ">and a.date_update = #{evaluationItemValue.dateUpdate}
             </if>
-            <if test="evaluationItemValue.tenantId != null ">and a.tenantId = #{evaluationItemValue.tenantId}</if>
+            <if test="evaluationItemValue.tenantId != null ">and a.TENANT_ID = #{evaluationItemValue.tenantId}</if>
             and a.status=1
         </where>
     </select>

sms_water/src/main/java/com/huaxu/controller/MonitorInfoController.java

@@ -133,59 +133,83 @@ public class MonitorInfoController {
         }
         List<MonitorInfoEntity> page = monitorInfoService.findList(monitorInfoEntity);
         for (MonitorInfoEntity item : page) {
-            if (item.getMonitorType().equals(0L)) {
-                //查询报警信息
-                List<AlarmDetailsDto> alarmDetailsDtos = alarmDetailsService.selectByDeviceId(id,item.getDeviceId().intValue());
-                Map<Integer, AlarmDetailsDto> mapAlarm = new HashMap<>();
-                //将缓存中的实时数据放到map中方便进行遍历
-                for (AlarmDetailsDto alarmDetailsDto : alarmDetailsDtos) {
-                    mapAlarm.put(alarmDetailsDto.getAttributeId(), alarmDetailsDto);
-                }
-                byte[] bytes = redisUtil.get(("sms_water_" + item.getDeviceCode()).getBytes());
-                if (bytes != null && bytes.length > 0) {
-                    MonitorDataEntity monitorDataEntity = (MonitorDataEntity) ByteArrayUtils.bytesToObject(bytes).get();
-                    Map<Long, MonitorDataValueEntity> map = new HashMap<>();
-                    //将缓存中的实时数据放到map中方便进行遍历
-                    for (MonitorDataValueEntity dateValue : monitorDataEntity.getDataValues()) {
-                        map.put(dateValue.getAttributeId(), dateValue);
-                    }
-                    //判断如果是标签则进行map中取值
-                    if (item.getMonitorType().equals(0L))//标签
-                    {
-                        //按属性ID查询标签值
-                        DeviceAttributeSpecsEntity deviceAttributeSpecsEntity = new DeviceAttributeSpecsEntity();
-                        deviceAttributeSpecsEntity.setAttributeId(item.getAttributeId());
-                        List<DeviceAttributeSpecsEntity> deviceAttributeSpecsEntities = deviceAttributeSpecsService.findList(deviceAttributeSpecsEntity);
-                        if (map.containsKey(item.getAttributeId())) {
-                            Double value = map.get(item.getAttributeId()).getDataValue();
-                            if (value != null) {
-                                if (deviceAttributeSpecsEntities.size() > 0) {
-                                    for (DeviceAttributeSpecsEntity specsEntity : deviceAttributeSpecsEntities)
-                                        if (Integer.valueOf(specsEntity.getSpecsValue()) == value.intValue()) {
-                                            item.setMonitorValue(specsEntity.getSpecsName());
-                                        }
+            switch (item.getMonitorType().intValue()) {
+                case 0:
+                    getMonitorInfo(id, item);
+                    break;
+                case 3:
+                case 4:
+                case 5:
+                    break;
+            }
+        }
+        return new AjaxMessage<>(ResultStatus.OK, page);
+    }
 
-                                } else {
-                                    DeviceAttributeEntity deviceAttributeEntity = deviceAttributeService.getById(item.getAttributeId());
-                                    String unit = "";
-                                    if (deviceAttributeEntity != null && deviceAttributeEntity.getUnit() != null)
-                                        unit = deviceAttributeEntity.getUnit();
-                                    item.setMonitorValue(String.format("%.3f", map.get(item.getAttributeId()).getDataValue()) + unit);
+    /**
+     * 更新指令状态
+     * @param sceneId
+     * @param item
+     */
+    public  void updateCommonState(Long sceneId,MonitorInfoEntity item) {
+
+    }
+
+    /**
+     * 更新标签值
+     * @param sceneId
+     * @param item
+     */
+    public  void getMonitorInfo(Long sceneId,MonitorInfoEntity item) {
+        //查询报警信息
+        List<AlarmDetailsDto> alarmDetailsDtos = alarmDetailsService.selectByDeviceId(sceneId, item.getDeviceId().intValue());
+        Map<Integer, AlarmDetailsDto> mapAlarm = new HashMap<>();
+        //将缓存中的实时数据放到map中方便进行遍历
+        for (AlarmDetailsDto alarmDetailsDto : alarmDetailsDtos) {
+            mapAlarm.put(alarmDetailsDto.getAttributeId(), alarmDetailsDto);
+        }
+        byte[] bytes = redisUtil.get(("sms_water_" + item.getDeviceCode()).getBytes());
+        if (bytes != null && bytes.length > 0) {
+            MonitorDataEntity monitorDataEntity = (MonitorDataEntity) ByteArrayUtils.bytesToObject(bytes).get();
+            Map<Long, MonitorDataValueEntity> map = new HashMap<>();
+            //将缓存中的实时数据放到map中方便进行遍历
+            for (MonitorDataValueEntity dateValue : monitorDataEntity.getDataValues()) {
+                map.put(dateValue.getAttributeId(), dateValue);
+            }
+            //判断如果是标签则进行map中取值
+            if (item.getMonitorType().equals(0L))//标签
+            {
+                //按属性ID查询标签值
+                DeviceAttributeSpecsEntity deviceAttributeSpecsEntity = new DeviceAttributeSpecsEntity();
+                deviceAttributeSpecsEntity.setAttributeId(item.getAttributeId());
+                List<DeviceAttributeSpecsEntity> deviceAttributeSpecsEntities = deviceAttributeSpecsService.findList(deviceAttributeSpecsEntity);
+                if (map.containsKey(item.getAttributeId())) {
+                    Double value = map.get(item.getAttributeId()).getDataValue();
+                    if (value != null) {
+                        if (deviceAttributeSpecsEntities.size() > 0) {
+                            for (DeviceAttributeSpecsEntity specsEntity : deviceAttributeSpecsEntities)
+                                if (Integer.valueOf(specsEntity.getSpecsValue()) == value.intValue()) {
+                                    item.setMonitorValue(specsEntity.getSpecsName());
                                 }
-                            }
-                        }
-                        //判断是否报警
-                        if (mapAlarm.containsKey(item.getAttributeId().intValue())){
-                            item.setIsAlarm(1);
-                            item.setMonitorValue(item.getMonitorValue()+"("+mapAlarm.get(item.getAttributeId().intValue()).getAlarmRange()+")");
-                        }else{
-                            item.setIsAlarm(0);
+
+                        } else {
+                            DeviceAttributeEntity deviceAttributeEntity = deviceAttributeService.getById(item.getAttributeId());
+                            String unit = "";
+                            if (deviceAttributeEntity != null && deviceAttributeEntity.getUnit() != null)
+                                unit = deviceAttributeEntity.getUnit();
+                            item.setMonitorValue(String.format("%.3f", map.get(item.getAttributeId()).getDataValue()) + unit);
                         }
                     }
                 }
+                //判断是否报警
+                if (mapAlarm.containsKey(item.getAttributeId().intValue())) {
+                    item.setIsAlarm(1);
+                    item.setMonitorValue(item.getMonitorValue() + "(" + mapAlarm.get(item.getAttributeId().intValue()).getAlarmRange() + ")");
+                } else {
+                    item.setIsAlarm(0);
+                }
             }
         }
-        return new AjaxMessage<>(ResultStatus.OK, page);
     }
 
     @RequestMapping(value="getDeviceParmByDeviceId" , method = RequestMethod.GET)
@@ -268,4 +292,15 @@ public class MonitorInfoController {
         int result = monitorInfoService.delMonitorInfoByIds(ids) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
+    /**
+     * 操作标签--查询设备属性
+     */
+    @ApiOperation(value = "操作标签--查询设备属性")
+    @RequestMapping(value = "/getSceneParmBySceneId", method = RequestMethod.GET)
+    @ResponseBody
+    public AjaxMessage<List<DeviceParmEntity>> getSceneParmBySceneId(@ApiParam(value = "场景类型ID", required = true) Long id) {
+        List<DeviceParmEntity> deviceParmEntities = deviceParmService.selectByScendId(id.intValue());
+        return new AjaxMessage<>(ResultStatus.OK, deviceParmEntities);
+    }
+
 }

sms_water/src/main/java/com/huaxu/entity/MonitorInfoEntity.java

@@ -58,7 +58,7 @@ public class MonitorInfoEntity{
     private Integer imageType;
 
     /** 标签类型 */
-    @ApiModelProperty(value = "标签类型(0标签 1普通标记 2跳转标记)")
+    @ApiModelProperty(value = "标签类型(0标签 1普通标记 2跳转标记 3水泵控制 4 压力调节 5阀门控制)")
     private Long monitorType;
 
     /** 标签值 */
@@ -95,6 +95,11 @@ public class MonitorInfoEntity{
     @TableField(exist = false)
     private Integer isAlarm;
 
+    /** 指令执行状态(0执行中 1执行成功 2执行失败) */
+    @ApiModelProperty(value = "指令执行状态(0执行中 1执行成功 2执行失败)")
+    @TableField(exist = false)
+    private Integer commonState;
+
     /** 类型 */
     @ApiModelProperty(value = "类型(0综合调度 1综合展示)")
     private Integer type;