Merge branch '20210223' of http://114.135.61.188:53000/UIMS/Code into 20210223

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

@@ -102,15 +102,17 @@ public class ComDisplayController {
             receFee.get(0).setYieldWaterUsage(monitorDataReportService.getAmountCount(companyOrgId, null, "水厂", 3, 2).divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP).doubleValue());
             receFee.get(0).setMeterReadingArrivalRate(receFee.get(0).getMeterReadingArrivalRate() != null ? BigDecimal.valueOf(receFee.get(0).getMeterReadingArrivalRate()).multiply(BigDecimal.valueOf(100)).divide(BigDecimal.valueOf(1), 2, BigDecimal.ROUND_HALF_UP).doubleValue() : 0.00);
             double amount = receFee.get(0).getYieldWaterUsage() - waterUsage;
-            if (receFee.get(0).getYieldWaterUsage() == 0d)
+            if (receFee.get(0).getYieldWaterUsage() == 0d) {
                 receFee.get(0).setWaterFeeRecoveryRate(BigDecimal.valueOf(0).divide(BigDecimal.valueOf(100), 2, BigDecimal.ROUND_HALF_UP).doubleValue());
-            else
+            } else {
                 receFee.get(0).setWaterFeeRecoveryRate(BigDecimal.valueOf(amount).multiply(BigDecimal.valueOf(100)).divide(BigDecimal.valueOf(receFee.get(0).getYieldWaterUsage()), 2, BigDecimal.ROUND_HALF_UP).doubleValue());
+            }
         }
-        if (receFee.size() > 0)
+        if (receFee.size() > 0) {
             return new AjaxMessage<>(ResultStatus.OK, receFee.get(0));
-        else
+        } else {
             return new AjaxMessage<>(ResultStatus.OK, null);
+        }
     }
 
     @RequestMapping(value="selectPipeNetLayer" , method = RequestMethod.GET)

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

@@ -211,16 +211,18 @@ public class MonitorInfoController {
                     Double value = map.get(item.getAttributeId()).getDataValue();
                     if (value != null) {
                         if (deviceAttributeSpecsEntities.size() > 0) {
-                            for (DeviceAttributeSpecsEntity specsEntity : deviceAttributeSpecsEntities)
+                            for (DeviceAttributeSpecsEntity specsEntity : deviceAttributeSpecsEntities) {
                                 if (Integer.valueOf(specsEntity.getSpecsValue()) == value.intValue()) {
                                     item.setMonitorValue(specsEntity.getSpecsName());
                                 }
+                            }
 
                         } else {
                             DeviceAttributeEntity deviceAttributeEntity = deviceAttributeService.getById(item.getAttributeId());
                             String unit = "";
-                            if (deviceAttributeEntity != null && deviceAttributeEntity.getUnit() != null)
+                            if (deviceAttributeEntity != null && deviceAttributeEntity.getUnit() != null) {
                                 unit = deviceAttributeEntity.getUnit();
+                            }
                             item.setMonitorValue(String.format("%.3f", map.get(item.getAttributeId()).getDataValue()) + unit);
                         }
                     }

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

@@ -48,10 +48,11 @@ public class ParmSettingController{
         parmSettingEntity.setCompanyOrgId(companyOrgId);
         parmSettingEntity.setParmType(parmType);
         List<ParmSettingEntity> list = parmSettingService.findList(parmSettingEntity);
-        if (list.size() > 0)
+        if (list.size() > 0) {
             return new AjaxMessage<>(ResultStatus.OK, list.get(0));
-        else
+        } else {
             return new AjaxMessage<>(ResultStatus.OBJECT_ERROR);
+        }
     }
 
 

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

@@ -58,8 +58,9 @@ public class SceneTypeController {
     @ResponseBody
     public AjaxMessage<List<SceneTypeEntity>> selectTreeList(@ApiParam(value = "父级ID", required = false) @RequestParam(required = false) Long id) {
         SceneTypeEntity sceneType = new SceneTypeEntity();
-        if (id == null)
+        if (id == null) {
             id = 0L;
+        }
         sceneType.setParentScenetypeId(id);
         List<SceneTypeEntity> page = sceneTypeService.findList2(sceneType);
         return new AjaxMessage<>(ResultStatus.OK, page);

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

@@ -38,12 +38,13 @@ public class SecSupplyController {
     @ResponseBody
     public AjaxMessage<List<AmountDayThirtyDto>> findAmountDayThirty(@ApiParam(value = "一级场景类型", required = true) @RequestParam Integer sceneType) {
         SceneEntity sceneEntity = new SceneEntity();
-        if (sceneType.equals(1))
+        if (sceneType.equals(1)) {
             sceneEntity.setSceneTypeName("水源");
-        else if (sceneType.equals(2))
+        } else if (sceneType.equals(2)) {
             sceneEntity.setSceneTypeName("水厂");
-        else
+        } else {
             sceneEntity.setSceneTypeName("泵站");
+        }
         List<AmountDayThirtyDto> list = secSupplyService.getAmountDayThirty(sceneEntity);
         return new AjaxMessage<>(ResultStatus.OK, list);
     }
@@ -53,12 +54,13 @@ public class SecSupplyController {
     public AjaxMessage<AmountTotalDto> findAmountTotalByTypeName(@ApiParam(value = "一级场景类型", required = true) @RequestParam Integer sceneType) {
         AmountTotalDto amountTotalDto = new AmountTotalDto();
         SceneEntity sceneEntity = new SceneEntity();
-        if (sceneType.equals(1))
+        if (sceneType.equals(1)) {
             sceneEntity.setSceneTypeName("水源");
-        else if (sceneType.equals(2))
+        } else if (sceneType.equals(2)) {
             sceneEntity.setSceneTypeName("水厂");
-        else
+        } else {
             sceneEntity.setSceneTypeName("泵站");
+        }
         amountTotalDto = secSupplyService.findAmountTotalByTypeName(sceneEntity);
         return new AjaxMessage<>(ResultStatus.OK, amountTotalDto);
     }
@@ -67,12 +69,13 @@ public class SecSupplyController {
     @ResponseBody
     public  AjaxMessage<WaterPieDto> selectWaterQualityByTypeName(@ApiParam(value = "一级场景类型", required = true) @RequestParam Integer sceneType) {
         SceneEntity sceneEntity = new SceneEntity();
-        if (sceneType.equals(1))
+        if (sceneType.equals(1)) {
             sceneEntity.setSceneTypeName("水源");
-        else if (sceneType.equals(2))
+        } else if (sceneType.equals(2)) {
             sceneEntity.setSceneTypeName("水厂");
-        else
+        } else {
             sceneEntity.setSceneTypeName("泵站");
+        }
         WaterPieDto waterPieDto = secSupplyService.selectWaterQualityByTypeName(sceneEntity);
         return new AjaxMessage<>(ResultStatus.OK, waterPieDto);
     }

sms_water/src/main/java/com/huaxu/service/AppDataService.java

@@ -161,24 +161,27 @@ public class AppDataService {
                         Double value = map.get(item.getAttributeId().longValue()).getDataValue();
                         if (value != null) {
                             if (deviceAttributeSpecsEntities.size() > 0) {
-                                for (DeviceAttributeSpecsEntity specsEntity : deviceAttributeSpecsEntities)
+                                for (DeviceAttributeSpecsEntity specsEntity : deviceAttributeSpecsEntities) {
                                     if (Integer.valueOf(specsEntity.getSpecsValue()) == value.intValue()) {
                                         sceneDataDto.setMonitorValue(specsEntity.getSpecsName());
                                     }
+                                }
                             } else {
                                 DeviceAttributeEntity deviceAttributeEntity = deviceAttributeService.getById(item.getAttributeId());
                                 String unit = "";
-                                if (deviceAttributeEntity != null && deviceAttributeEntity.getUnit() != null)
+                                if (deviceAttributeEntity != null && deviceAttributeEntity.getUnit() != null) {
                                     unit = deviceAttributeEntity.getUnit();
+                                }
                                 sceneDataDto.setMonitorValue(String.format("%.3f", map.get(item.getAttributeId().longValue()).getDataValue()) + unit);
                             }
                         }
                     }
                     //判断是否报警
-                    if (mapAlarm.containsKey(item.getAttributeId().intValue()))
+                    if (mapAlarm.containsKey(item.getAttributeId().intValue())) {
                         sceneDataDto.setIsAlarm(1);
-                    else
+                    } else {
                         sceneDataDto.setIsAlarm(0);
+                    }
                     sceneDataDtos.add(sceneDataDto);
                 }
             }else

sms_water/src/main/java/com/huaxu/service/DayReportService.java

@@ -60,8 +60,9 @@ public class DayReportService extends AbstractReportService<DayReportMapper, Day
         DeviceDto deviceDto = new DeviceDto();
         for (Long id : ids) {
             deviceDto.setSceneIds(sceneService.findByParentIdsLike(id));
-            if (deviceDto.getSceneIds().size() > 0)
+            if (deviceDto.getSceneIds().size() > 0) {
                 devices.addAll(deviceService.selectList(deviceDto));
+            }
         }
         if (devices.size() > 0) {
             //根据设备ID查询报表测点信息
@@ -105,8 +106,9 @@ public class DayReportService extends AbstractReportService<DayReportMapper, Day
                 //item.setDataValues(reportAttributeDtos);
                 Map<String, ReportAttributeDto> mapData = new LinkedHashMap<>();
                 for (ReportAttributeDto itemData : reportAttributeDtos) {
-                    if (!mapData.containsKey(itemData.getAttributeName()))
+                    if (!mapData.containsKey(itemData.getAttributeName())) {
                         mapData.put(itemData.getAttributeName(), itemData);
+                    }
                 }
                 List<Map<String, Object>> maps = new ArrayList<>();
                 for (String key : mapsTitle.keySet()) {
@@ -129,13 +131,15 @@ public class DayReportService extends AbstractReportService<DayReportMapper, Day
     //计算固定的参数项
     @Override
     public void calcUsage(ReportDto item, List<ReportDto> reportDtos) {
-        if (item == null || reportDtos.size() == 0)
+        if (item == null || reportDtos.size() == 0) {
             return;
+        }
         //固定参数项
         int index = -1;
         for (int i = 0; i < reportDtos.size(); i++) {
-            if (reportDtos.get(i).getHour().equals(item.getHour()))
+            if (reportDtos.get(i).getHour().equals(item.getHour())) {
                 index = i;
+            }
         }
         if (index == -1) {
             return;

sms_water/src/main/java/com/huaxu/service/DeviceSetupMethodService.java

@@ -123,8 +123,9 @@ public class DeviceSetupMethodService extends ServiceImpl<DeviceSetupMethodMappe
         String methodParms = "";
         //查询设备
         DeviceEntity deviceEntity = deviceService.selectById(deviceId);
-        if (deviceEntity == null)
+        if (deviceEntity == null) {
             return false;
+        }
         //查询操作方法
         DeviceSetupMethodEntity info = new DeviceSetupMethodEntity();
         info.setType(type);

sms_water/src/main/java/com/huaxu/service/MonthReportService.java

@@ -65,8 +65,9 @@ public class MonthReportService extends AbstractReportService<MonthReportMapper,
         DeviceDto deviceDto = new DeviceDto();
         for (Long id : ids) {
             deviceDto.setSceneIds(sceneService.findByParentIdsLike(id));
-            if (deviceDto.getSceneIds().size() > 0)
+            if (deviceDto.getSceneIds().size() > 0) {
                 devices.addAll(deviceService.selectList(deviceDto));
+            }
         }
         if (devices.size() > 0) {
             MonthReportEntity monthReportEntity = new MonthReportEntity();
@@ -88,8 +89,9 @@ public class MonthReportService extends AbstractReportService<MonthReportMapper,
             int numCount = 0;
             for (ReportAttributeDto title : reportAttributeDtos2) {
                 dataTitle.add(title.getAttributeName());
-                if (!mapsTitle.containsKey(title.getAttributeName()))
+                if (!mapsTitle.containsKey(title.getAttributeName())) {
                     mapsTitle.put(title.getAttributeName(), numCount++);
+                }
             }
             //固定参数项
             List<ReportDto> reportDtos = monthReportMapper.findReport(reportDto);
@@ -105,8 +107,9 @@ public class MonthReportService extends AbstractReportService<MonthReportMapper,
                 // item.setDataValues(reportAttributeDtos);
                 Map<String, ReportAttributeDto> mapData = new LinkedHashMap<>();
                 for (ReportAttributeDto itemData : reportAttributeDtos) {
-                    if (!mapData.containsKey(itemData.getAttributeName()))
+                    if (!mapData.containsKey(itemData.getAttributeName())) {
                         mapData.put(itemData.getAttributeName(), itemData);
+                    }
                 }
                 List<Map<String, Object>> maps = new ArrayList<>();
                 for (String key : mapsTitle.keySet()) {
@@ -128,13 +131,15 @@ public class MonthReportService extends AbstractReportService<MonthReportMapper,
     //计算固定的参数项
     @Override
     public void calcUsage(ReportDto item, List<ReportDto> reportDtos) {
-        if (item == null || reportDtos.size() == 0)
+        if (item == null || reportDtos.size() == 0) {
             return;
+        }
         //固定参数项
         int index = -1;
         for (int i = 0; i < reportDtos.size(); i++) {
-            if (reportDtos.get(i).getDay().equals(item.getDay()))
+            if (reportDtos.get(i).getDay().equals(item.getDay())) {
                 index = i;
+            }
         }
         if (index == -1){
             return;

sms_water/src/main/java/com/huaxu/service/SceneService.java

@@ -73,10 +73,12 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
             sceneEntities.addAll(findByParentLike(item.getId()));
         }
         for (SceneEntity item : sceneEntities) {
-            if (item.getCompanyOrgId() != null)
+            if (item.getCompanyOrgId() != null) {
                 item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId().intValue()));
-            if (item.getDeptOrgId() != null)
+            }
+            if (item.getDeptOrgId() != null) {
                 item.setDeptOrgName(orgInfoUtil.getOrgName(item.getDeptOrgId().intValue()));
+            }
         }
         List<SceneEntity> sceneTree = getSceneTree(sceneEntities, Long.valueOf(0), 1);
         sceneEntityPage.setRecords(sceneTree);
@@ -162,8 +164,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
             scene.setDateUpdate(new Date());
             scene.setDateCreate(new Date());
         }
-        if (scene.getDeptOrgId() != null && scene.getDeptOrgId() == 0)
+        if (scene.getDeptOrgId() != null && scene.getDeptOrgId() == 0) {
             scene.setDeptOrgId(null);
+        }
 
         // 如果没有设置父节点，则代表为跟节点，有则获取父节点实体
         if (scene.getParentSceneId() == null || StringUtils.isBlank(scene.getParentSceneId().toString())) {
@@ -209,8 +212,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
     public List<SceneEntity> findByParentLike(Long id) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         SceneEntity scene = new SceneEntity();
-        if (id != null)
+        if (id != null) {
             scene.setParentSceneIds("%," + id + ",%");
+        }
         scene.setTenantId(currentUser.getTenantId());
         scene.setStatus(1);
         scene.setProgramItems(currentUser.getProgramItemList());
@@ -227,8 +231,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
     public List<Long> findByParentIdsLike(Long id) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         SceneEntity scene = new SceneEntity();
-        if (id != null)
+        if (id != null) {
             scene.setParentSceneIds("%," + id + ",%");
+        }
         scene.setTenantId(currentUser.getTenantId());
         scene.setStatus(1);
         scene.setProgramItems(currentUser.getProgramItemList());
@@ -268,8 +273,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
     public boolean updateSceneById(SceneEntity scene) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         scene.setUpdateBy(currentUser.getName());
-        if (scene.getDeptOrgId() != null && scene.getDeptOrgId() == 0)
+        if (scene.getDeptOrgId() != null && scene.getDeptOrgId() == 0) {
             scene.setDeptOrgId(null);
+        }
         // 获取修改前的parentIds，用于更新子节点的parentIds
         SceneEntity cScene = sceneMapper.findSceneById(scene.getId());
         String oldParentIds = cScene.getParentSceneIds();
@@ -347,7 +353,7 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
         SceneEntity sceneEntity = sceneMapper.findSceneById(id);
         SceneImageEntity sceneImageEntity = new SceneImageEntity();
         sceneImageEntity.setSceneId(id);
-        sceneImageEntity.setImageType(3l);
+        sceneImageEntity.setImageType(3L);
         List<SceneImageEntity> sceneImageEntities = sceneImageService.findList(sceneImageEntity);
         sceneEntity.setSceneImages(sceneImageEntities);
         return sceneEntity;
@@ -380,8 +386,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
         sceneEntity.setUserType(currentUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         sceneEntity.setPermissonType(currentUser.getPermissonType());
-        if (id != null)
+        if (id != null) {
             sceneEntity.setParentSceneIds("%," + id + ",%");
+        }
         List<SceneEntity> sceneEntities = sceneMapper.findByParentId(sceneEntity);
         for (SceneEntity item : sceneEntities) {
             SceneImageEntity sceneImageEntity = new SceneImageEntity();
@@ -401,8 +408,9 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
         sceneEntity.setUserType(currentUser.getType());
         //1是公司，2是公司及以下，3部门，4部门及以下，5自定义
         sceneEntity.setPermissonType(currentUser.getPermissonType());
-        if (id != null)
+        if (id != null) {
             sceneEntity.setParentSceneIds("%," + id + ",%");
+        }
         List<SceneEntity> sceneEntities = sceneMapper.findByParentId(sceneEntity);
         for (SceneEntity item : sceneEntities) {
             SceneImageEntity sceneImageEntity = new SceneImageEntity();
@@ -412,10 +420,11 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
             item.setSceneImages(sceneImageEntities);
             //判断此场景是否有报警
             List<AlarmDetailsDto> alarmList = alarmDetailsService.selectBySceneId(item.getId().intValue());
-            if (alarmList.size() > 0)
+            if (alarmList.size() > 0) {
                 item.setIsAlarm(1);
-            else
+            } else {
                 item.setIsAlarm(0);
+            }
         }
 
         List<SceneEntity> sceneTree = getSceneTree(sceneEntities, Long.valueOf(0), 1);

sms_water/src/main/java/com/huaxu/service/SecSupplyService.java

@@ -38,8 +38,9 @@ public class SecSupplyService {
      */
     public List<AmountDayThirtyDto> getAmountDayThirty(SceneEntity sceneEntity) {
         List<SceneEntity> sceneEntities = sceneService.selectByTypeName(sceneEntity);
-        if (sceneEntities.size() == 0)
+        if (sceneEntities.size() == 0) {
             return null;
+        }
         MonthReportEntity monthReportEntity = new MonthReportEntity();
         monthReportEntity.setParentSceneLists(sceneEntities);
         List<MonthReportEntity> monthReportEntities = monthReportService.findAmountBySceneIds(monthReportEntity);
@@ -57,8 +58,9 @@ public class SecSupplyService {
             AmountDayThirtyDto amountDayThirtyDto = new AmountDayThirtyDto();
             if (maps.containsKey(df.format(d).toString())) {
                 amountDayThirtyDto.setAmountTime(d);
-                if (maps.get(df.format(d)) != null)
+                if (maps.get(df.format(d)) != null) {
                     amountDayThirtyDto.setAmount((double) Math.round(maps.get(df.format(d)) * 1000) / 1000);
+                }
             } else {
                 amountDayThirtyDto.setAmountTime(d);
                 amountDayThirtyDto.setAmount(0d);
@@ -76,7 +78,7 @@ public class SecSupplyService {
      */
     public AmountTotalDto findAmountTotalByTypeName(SceneEntity sceneEntity) {
         BigDecimal multipleData;
-        if(sceneEntity.getSceneTypeName().equals("泵站")){
+        if("泵站".equals(sceneEntity.getSceneTypeName())){
             multipleData = new BigDecimal("1");
         }else{
             multipleData = new BigDecimal("10000");
@@ -198,8 +200,9 @@ public class SecSupplyService {
 
     public WaterPieDto selectWaterQualityByTypeName(SceneEntity sceneEntity) {
         List<SceneEntity> sceneEntities = sceneService.selectByTypeName(sceneEntity);
-        if (sceneEntities.size() == 0)
+        if (sceneEntities.size() == 0) {
             return null;
+        }
         WaterPieDto waterPieDto = new WaterPieDto();
         DeviceParmEntity deviceParmEntity = new DeviceParmEntity();
         deviceParmEntity.setSceneEntities(sceneEntities);

sms_water/src/main/java/com/huaxu/service/ThingSettingService.java

@@ -50,10 +50,12 @@ public class ThingSettingService extends ServiceImpl<ThingSettingMapper, ThingSe
         List<ThingSettingEntity> thingSettingEntities = thingSettingMapper.findList(thingSettingEntity);
 
         for (ThingSettingEntity item : thingSettingEntities) {
-            if (item.getCompanyOrgId() != null)
+            if (item.getCompanyOrgId() != null) {
                 item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId().intValue()));
-            if (item.getDeptOrgId() != null)
+            }
+            if (item.getDeptOrgId() != null) {
                 item.setDeptOrgName(orgInfoUtil.getOrgName(item.getDeptOrgId().intValue()));
+            }
         }
         return thingSettingEntities;
     }
@@ -86,8 +88,9 @@ public class ThingSettingService extends ServiceImpl<ThingSettingMapper, ThingSe
             thingSetting.setDateUpdate(new Date());
             thingSetting.setDateCreate(new Date());
         }
-        if (thingSetting.getDeptOrgId() != null && thingSetting.getDeptOrgId() == 0)
+        if (thingSetting.getDeptOrgId() != null && thingSetting.getDeptOrgId() == 0) {
             thingSetting.setDeptOrgId(null);
+        }
         if (this.save(thingSetting)) {
             return true;
         }
@@ -100,8 +103,9 @@ public class ThingSettingService extends ServiceImpl<ThingSettingMapper, ThingSe
     public boolean updateThingSettingById(ThingSettingEntity thingSetting) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         thingSetting.setUpdateBy(currentUser.getName());
-        if (thingSetting.getDeptOrgId() != null && thingSetting.getDeptOrgId() == 0)
+        if (thingSetting.getDeptOrgId() != null && thingSetting.getDeptOrgId() == 0) {
             thingSetting.setDeptOrgId(null);
+        }
         if (this.updateById(thingSetting)) {
             return true;
         }

sms_water/src/main/java/com/huaxu/service/ThingyearSettingService.java

@@ -49,10 +49,12 @@ public class ThingyearSettingService extends ServiceImpl<ThingyearSettingMapper,
         thingyearSettingEntity.setPermissonType(currentUser.getPermissonType());
         List<ThingyearSettingEntity> thingSettingEntities = thingyearSettingMapper.findList(thingyearSettingEntity);
         for (ThingyearSettingEntity item : thingSettingEntities) {
-            if (item.getCompanyOrgId() != null)
+            if (item.getCompanyOrgId() != null) {
                 item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId().intValue()));
-            if (item.getDeptOrgId() != null)
+            }
+            if (item.getDeptOrgId() != null) {
                 item.setDeptOrgName(orgInfoUtil.getOrgName(item.getDeptOrgId().intValue()));
+            }
         }
         return thingSettingEntities;
     }
@@ -85,8 +87,9 @@ public class ThingyearSettingService extends ServiceImpl<ThingyearSettingMapper,
             thingyearSetting.setDateUpdate(new Date());
             thingyearSetting.setDateCreate(new Date());
         }
-        if (thingyearSetting.getDeptOrgId() != null && thingyearSetting.getDeptOrgId() == 0)
+        if (thingyearSetting.getDeptOrgId() != null && thingyearSetting.getDeptOrgId() == 0) {
             thingyearSetting.setDeptOrgId(null);
+        }
         if (this.save(thingyearSetting)) {
             return true;
         }
@@ -99,8 +102,9 @@ public class ThingyearSettingService extends ServiceImpl<ThingyearSettingMapper,
     public boolean updateThingyearSettingById(ThingyearSettingEntity thingyearSetting) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         thingyearSetting.setUpdateBy(currentUser.getName());
-        if (thingyearSetting.getDeptOrgId() != null && thingyearSetting.getDeptOrgId() == 0)
+        if (thingyearSetting.getDeptOrgId() != null && thingyearSetting.getDeptOrgId() == 0) {
             thingyearSetting.setDeptOrgId(null);
+        }
         if (this.updateById(thingyearSetting)) {
             return true;
         }

sms_water/src/main/java/com/huaxu/service/YearReportService.java

@@ -66,8 +66,9 @@ public class YearReportService extends AbstractReportService<YearReportMapper, Y
         DeviceDto deviceDto = new DeviceDto();
         for (Long id : ids) {
             deviceDto.setSceneIds(sceneService.findByParentIdsLike(id));
-            if (deviceDto.getSceneIds().size() > 0)
+            if (deviceDto.getSceneIds().size() > 0) {
                 devices.addAll(deviceService.selectList(deviceDto));
+            }
         }
         if(devices.size()>0) {
             YearReportEntity yearReportEntity = new YearReportEntity();
@@ -87,8 +88,9 @@ public class YearReportService extends AbstractReportService<YearReportMapper, Y
             int numCount = 0;
             for (ReportAttributeDto title : reportAttributeDtos2) {
                 dataTitle.add(title.getAttributeName());
-                if (!mapsTitle.containsKey(title.getAttributeName()))
+                if (!mapsTitle.containsKey(title.getAttributeName())) {
                     mapsTitle.put(title.getAttributeName(), numCount++);
+                }
             }
             //固定参数项
             List<ReportDto> reportDtos = yearReportMapper.findReport(reportDto);
@@ -105,8 +107,9 @@ public class YearReportService extends AbstractReportService<YearReportMapper, Y
                 // item.setDataValues(reportAttributeDtos);
                 Map<String, ReportAttributeDto> mapData = new LinkedHashMap<>();
                 for (ReportAttributeDto itemData : reportAttributeDtos) {
-                    if (!mapData.containsKey(itemData.getAttributeName()))
+                    if (!mapData.containsKey(itemData.getAttributeName())) {
                         mapData.put(itemData.getAttributeName(), itemData);
+                    }
                 }
                 List<Map<String, Object>> maps = new ArrayList<>();
                 for (String key : mapsTitle.keySet()) {