修改

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyElectricity/service/impl/EnergyElectricityServiceImpl.java

@@ -125,12 +125,18 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
                             pigpenList.addAll(basePigpens1.stream().map(basePigpen1 -> basePigpen1.getId()).collect(Collectors.toList()));
                         }
                     }
+                    if (ObjectUtil.isEmpty(pigpenList)){
+                        pigpenList.add(pigpenId);
+                    }
                     break;
                 case 1:
                     List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getParentId, pigpenId));
                     if (ObjectUtil.isNotEmpty(basePigpens1)){
                         pigpenList.addAll(basePigpens1.stream().map(basePigpen1 -> basePigpen1.getId()).collect(Collectors.toList()));
                     }
+                    if (ObjectUtil.isEmpty(pigpenList)){
+                        pigpenList.add(pigpenId);
+                    }
                     break;
                 case 2:
                     pigpenList.add(pigpenId);
@@ -141,6 +147,7 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
         }else {
             location = "全场";
         }
+
         EnergyElectricityTrendVo electricityTrend = new EnergyElectricityTrendVo();
         List<EnergyElectricityListVo> energyElectricityList;
         if (type.equals("0")){
@@ -203,12 +210,18 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
                             pigpenList.addAll(basePigpens1.stream().map(basePigpen1 -> basePigpen1.getId()).collect(Collectors.toList()));
                         }
                     }
+                    if (ObjectUtil.isEmpty(pigpenList)){
+                        pigpenList.add(pigpenId);
+                    }
                     break;
                 case 1:
                     List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getParentId, pigpenId));
                     if (ObjectUtil.isNotEmpty(basePigpens1)){
                         pigpenList.addAll(basePigpens1.stream().map(basePigpen1 -> basePigpen1.getId()).collect(Collectors.toList()));
                     }
+                    if (ObjectUtil.isEmpty(pigpenList)){
+                        pigpenList.add(pigpenId);
+                    }
                     break;
                 case 2:
                     pigpenList.add(pigpenId);

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyWater/service/impl/EnergyWaterServiceImpl.java

@@ -122,12 +122,18 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
                             pigpenList.addAll(basePigpens1.stream().map(basePigpen1 -> basePigpen1.getId()).collect(Collectors.toList()));
                         }
                     }
+                    if (ObjectUtil.isEmpty(pigpenList)){
+                        pigpenList.add(pigpenId);
+                    }
                     break;
                 case 1:
                     List<BasePigpen> basePigpens1 = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getParentId, pigpenId));
                     if (ObjectUtil.isNotEmpty(basePigpens1)){
                         pigpenList.addAll(basePigpens1.stream().map(basePigpen1 -> basePigpen1.getId()).collect(Collectors.toList()));
                     }
+                    if (ObjectUtil.isEmpty(pigpenList)){
+                        pigpenList.add(pigpenId);
+                    }
                     break;
                 case 2:
                     pigpenList.add(pigpenId);

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energythreshold/service/impl/EnergyThresholdServiceImpl.java

@@ -87,8 +87,11 @@ public class EnergyThresholdServiceImpl extends ServiceImpl<EnergyThresholdMappe
     public void saveThreshold(EnergyThresholdSaveParam energyThresholdSaveParam) {
         String orgId = energyThresholdSaveParam.getOrgId();
         EnergyThreshold energyThreshold = this.getOne(new QueryWrapper<EnergyThreshold>().lambda().eq(EnergyThreshold::getOrgId, orgId).eq(EnergyThreshold::getUnitId, energyThresholdSaveParam.getUnitId()));
+        if (ObjectUtil.isEmpty(energyThreshold)){
+            energyThreshold = new EnergyThreshold();
+        }
         BeanUtil.copyProperties(energyThresholdSaveParam,energyThreshold);
-        this.updateById(energyThreshold);
+        this.saveOrUpdate(energyThreshold);
     }
 
     @Override

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envThreshold/service/impl/EnvThresholdServiceImpl.java

@@ -90,8 +90,11 @@ public class EnvThresholdServiceImpl extends ServiceImpl<EnvThresholdMapper, Env
     public void saveThreshold(EnvThresholdSaveParam envThresholdSaveParam) {
         String orgId = envThresholdSaveParam.getOrgId();
         EnvThreshold envThreshold = this.getOne(new QueryWrapper<EnvThreshold>().lambda().eq(EnvThreshold::getOrgId, orgId).eq(EnvThreshold::getUnitId, envThresholdSaveParam.getUnitId()));
+        if (ObjectUtil.isEmpty(envThreshold)){
+            envThreshold = new EnvThreshold();
+        }
         BeanUtil.copyProperties(envThresholdSaveParam,envThreshold);
-        this.updateById(envThreshold);
+        this.saveOrUpdate(envThreshold);
     }
 
     @Override

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envdata/service/impl/EnvDataServiceImpl.java

@@ -231,6 +231,9 @@ public class EnvDataServiceImpl extends ServiceImpl<EnvDataMapper, EnvData> impl
 
         EnvThreshold envThreshold = envThresholdMapper.selectOne(new QueryWrapper<EnvThreshold>().lambda().eq(EnvThreshold::getUnitId, pigpenId));
         if (ObjectUtil.isNotEmpty(envThreshold)){
+            if (envThreshold.getIsEnable() == 0){
+                return;
+            }
             if (sea == 1){
                 if ((tem.compareTo(envThreshold.getSpringTemLower()) < 0 )){
                     WarningInfo warningInfo = new WarningInfo();

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envdevice/param/EnvDeviceAddParam.java

@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -56,11 +57,13 @@ public class EnvDeviceAddParam extends EnvDeviceOrgIdParam{
     /** 风机数量 */
     @ApiModelProperty(value = "风机数量", required = true, position = 6)
     @NotNull(message = "fanNum不能为空")
+    @Max(20)
     private Integer fanNum;
 
     /** 水帘数量 */
     @ApiModelProperty(value = "水帘数量", required = true, position = 7)
     @NotNull(message = "curtainNum不能为空")
+    @Max(10)
     private Integer curtainNum;
 
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envdevice/param/EnvDeviceEditParam.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.Max;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -59,11 +60,13 @@ public class EnvDeviceEditParam extends EnvDeviceOrgIdParam{
     /** 风机数量 */
     @ApiModelProperty(value = "风机数量", required = true, position = 6)
     @NotNull(message = "fanNum不能为空")
+    @Max(20)
     private Integer fanNum;
 
     /** 水帘数量 */
     @ApiModelProperty(value = "水帘数量", required = true, position = 7)
     @NotNull(message = "curtainNum不能为空")
+    @Max(10)
     private Integer curtainNum;
 
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envdevice/service/impl/EnvDeviceServiceImpl.java

@@ -72,7 +72,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id",orgId).orderByAsc("id");
         if(ObjectUtil.isNotEmpty(envDevicePageParam.getDeviceType())) {
-            queryWrapper.eq("device_type", envDevicePageParam.getDeviceType());
+            queryWrapper.eq("device_type_id", envDevicePageParam.getDeviceType());
         }
         String installPosition = envDevicePageParam.getInstallPosition();
         List<String> pigpenList = new ArrayList<>();
@@ -101,6 +101,9 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
                     pigpenList.add(installPosition);
                     break;
             }
+            if (ObjectUtil.isEmpty(pigpenList)){
+                pigpenList.add(installPosition);
+            }
             queryWrapper.lambda().in(EnvDevice::getInstallPosition, pigpenList);
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);

snowy-web-app/src/main/java/vip/xiaonuo/modular/warning/warningInfo/mapper/mapping/WarningInfoMapper.xml

@@ -10,7 +10,7 @@
             `warning_info`
         WHERE
             org_id = #{orgId}
-            AND warning_time BETWEEN DATE_SUB(CURDATE(), INTERVAL 6 DAY) AND CURDATE()
+            AND warning_time BETWEEN DATE_SUB(CURDATE(), INTERVAL 6 DAY) AND NOW()
         GROUP BY
             DATE(warning_time)
         ORDER BY

snowy-web-app/src/main/java/vip/xiaonuo/modular/warning/warningInfo/service/impl/WarningInfoServiceImpl.java

@@ -31,6 +31,9 @@ import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.core.param.OrgIdParam;
 import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
 import vip.xiaonuo.modular.base.baseConfig.mapper.BaseConfigMapper;
+import vip.xiaonuo.modular.base.pigpen.entity.BasePigpen;
+import vip.xiaonuo.modular.base.pigpen.mapper.BasePigpenMapper;
+import vip.xiaonuo.modular.energy.energyDevice.entity.EnergyDevice;
 import vip.xiaonuo.modular.warning.warningInfo.entity.WarningInfo;
 import vip.xiaonuo.modular.warning.warningInfo.entity.vo.WarningInfoListVo;
 import vip.xiaonuo.modular.warning.warningInfo.entity.vo.WarningInfoProportionVo;
@@ -66,17 +69,48 @@ public class WarningInfoServiceImpl extends ServiceImpl<WarningInfoMapper, Warni
     @Autowired
     private WarningInfoMapper warningInfoMapper;
 
+    @Autowired
+    private BasePigpenMapper basePigpenMapper;
+
     @Override
     public Page<WarningInfo> page(WarningInfoPageParam warningInfoPageParam) {
-        String type = warningInfoPageParam.getType();
+        String type1 = warningInfoPageParam.getType();
         QueryWrapper<WarningInfo> queryWrapper = new QueryWrapper<>();
         if(ObjectUtil.isNotEmpty(warningInfoPageParam.getWarningType())) {
             queryWrapper.lambda().eq(WarningInfo::getWarningTypeId, warningInfoPageParam.getWarningType());
         }
+        List<String> pigpenList = new ArrayList<>();
         if(ObjectUtil.isNotEmpty(warningInfoPageParam.getUnitId())) {
-            queryWrapper.lambda().eq(WarningInfo::getUnitId, warningInfoPageParam.getUnitId());
+            BasePigpen basePigpen = basePigpenMapper.selectById(warningInfoPageParam.getUnitId());
+            Integer type = basePigpen.getType();
+            switch (type){
+                case 0:
+                    List<BasePigpen> basePigpens = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getParentId, basePigpen.getId()));
+                    if (ObjectUtil.isNotEmpty(basePigpens)){
+                        pigpenList.addAll(basePigpens.stream().map(basePigpen1 -> basePigpen1.getId()).collect(Collectors.toList()));
+                    }
+                    for (BasePigpen pigpen : basePigpens) {
+                        List<BasePigpen> childPigpens = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getParentId, pigpen.getId()));
+                        if (ObjectUtil.isNotEmpty(childPigpens)){
+                            pigpenList.addAll(childPigpens.stream().map(basePigpen2 -> basePigpen2.getId()).collect(Collectors.toList()));
+                        }
+                    }
+                    break;
+                case 1:
+                    List<BasePigpen> pigpens = basePigpenMapper.selectList(new QueryWrapper<BasePigpen>().lambda().eq(BasePigpen::getParentId, basePigpen.getId()));
+                    if (ObjectUtil.isNotEmpty(pigpens)){
+                        pigpenList.addAll(pigpens.stream().map(basePigpen3 -> basePigpen3.getId()).collect(Collectors.toList()));
+                    }
+                case 2:
+                    pigpenList.add(warningInfoPageParam.getUnitId());
+                    break;
+            }
+            if (ObjectUtil.isEmpty(pigpenList)){
+                return new Page<>();
+            }
+            queryWrapper.lambda().in(WarningInfo::getUnitId, pigpenList);
         }
-        switch (type) {
+        switch (type1) {
             case "0":
                 // 处理今日的逻辑
                 queryWrapper.lambda().between(WarningInfo::getWarningTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()));