保温灯，保温板单独配置

huimv-env-platform/huimv-env-device/src/main/java/com/huimv/env/device/service/impl/DeviceServiceImpl.java

@@ -340,12 +340,12 @@ public class DeviceServiceImpl implements IDeviceService {
         if (valueData >= electricityMeterData){
             value = valueData-electricityMeterData;
         }else {
-            value = valueData;
+            value = 0;
         }
         EnvElectricityMeter envElectricityMeter = new EnvElectricityMeter();
         envElectricityMeter.setDeviceCode(dataJo.getString("deviceCode"));
         envElectricityMeter.setSensorSn(dataJo.getInteger("sensorSn"));
-        envElectricityMeter.setElectricityMeter(new BigDecimal(mathUtil.countMeter(value)));
+        envElectricityMeter.setElectricityMeter(new BigDecimal(value));
         envElectricityMeter.setElectricityMeterData(valueData);
         envElectricityMeter.setAskTime(dateUtil.handleAskTime(dataJo.getString("askTime")));
         envElectricityMeter.setAddTime(nowTimestamp);

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvDeviceRegisterController.java

@@ -48,7 +48,6 @@ public class EnvDeviceRegisterController {
     public Result saveRegister(@RequestBody Map<String,String> paramMap){
         return  deviceRegisterService.saveRegister(paramMap);
     }
-
     @PostMapping("/remove")
     public Result remove(@RequestBody Map<String,String> paramMap){
         String ids = paramMap.get("ids");
@@ -60,13 +59,9 @@ public class EnvDeviceRegisterController {
         }
         return new Result(10000,"删除成功",true) ;
     }
-
-
-
     @PostMapping("/lsitAllDeivce")
     public Result lsitAllDeivce(@RequestBody Map<String, String> map, HttpServletRequest request){
         return deviceRegisterService.lsitAllDeivce(map,request);
-
     }
     @PostMapping("/unbindingBaseDeviceCofig")
     public Result unbindingBaseDeviceCofig(@RequestBody Map<String, String> map, HttpServletRequest request){
@@ -83,8 +78,6 @@ public class EnvDeviceRegisterController {
     @PostMapping("/screenDeviceCofig")
     public Result screenDeviceCofig(@RequestBody Map<String, String> map, HttpServletRequest request){
         return deviceRegisterService.screenDeviceCofig(map,request);
-
     }
 
-
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/controller/BaseDeviceCofigController.java

@@ -33,22 +33,17 @@ public class BaseDeviceCofigController {
 
     @PostMapping("/listBaseDeviceCofig")
     public Result listBaseDeviceCofig(@RequestBody Map<String, String> map, HttpServletRequest request){
-
         List<BaseDeviceCofig> list = baseDeviceCofigService.list(null);
         if (ObjectUtil.isNotEmpty(list)) {
             return new Result(ResultCode.SUCCESS, list);
         }else {
             return new Result(10001,"没有数据", false);
         }
-
     }
 
     @PostMapping("/listAllDataByUnitId")
     public Result listAllDataByUnitId(@RequestBody Map<String, String> map, HttpServletRequest request){
-
       return baseDeviceCofigService.listAllDataByUnitId(map,request);
-
-
     }
 
 

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/dao/entity/EnvDeviceEquipment.java

@@ -46,6 +46,7 @@ public class EnvDeviceEquipment implements Serializable {
     private Integer uploadStart;
 
    private Integer   binding;
+   private String   deviceAlias;
 
 
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvDeviceRegisterServiceImpl.java

@@ -118,6 +118,7 @@ public class EnvDeviceRegisterServiceImpl extends ServiceImpl<EnvDeviceRegisterM
             envDeviceEquipment.setUnitId(Integer.parseInt(unitId));
             envDeviceEquipment.setDeviceCode(deviceCode1);
             envDeviceEquipment.setEquipmentPort(port);
+//            envDeviceEquipment.setDeviceAlias(port);
             envDeviceEquipmentMapper.insert(envDeviceEquipment);
             port++;
         }
@@ -216,13 +217,13 @@ public class EnvDeviceRegisterServiceImpl extends ServiceImpl<EnvDeviceRegisterM
     public Result screenDeviceCofig(Map<String, String> map, HttpServletRequest request) {
         String unitId = map.get("unitId");
         List list = new ArrayList();
-        boolean exists1 = lampConfigMapper.exists(new QueryWrapper<LampConfig>().eq("unig_id", unitId).eq("upload_start", 1));
-        boolean exists2 = lampConfigMapper.exists(new QueryWrapper<LampConfig>().eq("unig_id", unitId).eq("board_gear", 0));
+        boolean exists1 = lampConfigMapper.exists(new QueryWrapper<LampConfig>().eq("unit_id", unitId).eq("upload_start", 1));
+        boolean exists2 = lampConfigMapper.exists(new QueryWrapper<LampConfig>().eq("unit_id", unitId).ne("board_gear", 0));
         boolean exists3 = envDeviceEquipmentMapper.exists(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id", unitId).eq("upload_start", 1).eq("equipment_name", "照明"));
         boolean exists4 = envDeviceEquipmentMapper.exists(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id", unitId).eq("upload_start", 1).eq("equipment_name", "风机"));
         boolean exists5 = envDeviceEquipmentMapper.exists(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id", unitId).eq("upload_start", 1).eq("equipment_name", "刮粪板"));
         list.add(exists1);
-        list.add(!exists2);
+        list.add(exists2);
         list.add(exists3);
         list.add(exists4);
         list.add(exists5);