配置

src/main/java/com/huimv/admin/service/impl/EnvDayagePeizhiServiceImpl.java

@@ -61,7 +61,7 @@ public class EnvDayagePeizhiServiceImpl extends ServiceImpl<EnvDayagePeizhiMappe
     public Result listDeployByDevice(Map<String, String> paramsMap) {
         String deviceCode = paramsMap.get("deviceCode");
         List<EnvDayagePeizhi> envDayagePeizhis = envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>()
-                .eq("device_code", deviceCode)
+                .eq("device_code", deviceCode).or().eq("open_status",1)
                 .groupBy("time_dayage"));
         return new Result(ResultCode.SUCCESS,envDayagePeizhis);
     }
@@ -101,7 +101,7 @@ public class EnvDayagePeizhiServiceImpl extends ServiceImpl<EnvDayagePeizhiMappe
         for (EnvFengPeizhi envFengPeizhi : timeDayAge1) {
             String fansCtrl = envFengPeizhi.getFansCtrl();
             Integer fanNum = envDeviceFanMapper.selectCount(new QueryWrapper<EnvDeviceFan>().eq("device_code", deviceCode).eq("farm_id", farmId));
-            if (fanNum != fansCtrl.length()+1){
+            if (fanNum != fansCtrl.length()){
                 return new Result(ResultCode.FAIL,"设备风机数量不等于配置所需！");
             }
         }

src/main/java/com/huimv/admin/service/impl/EnvDeviceServiceImpl.java

@@ -144,8 +144,8 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         envDevice.setStageType(basePigpen.getStageCode());
 
         QueryWrapper<EnvDevice> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("device_name", envDevice1.getDeviceName()).eq("farm_id", envDevice1.getFarmId())
-                .or().eq("device_code", envDevice1.getDeviceCode());
+        queryWrapper.eq("device_name", envDevice1.getDeviceName()).or().eq("farm_id", envDevice1.getFarmId())
+                .or().eq("device_code", envDevice1.getDeviceCode()).or().eq("unit_id",envDevice1.getUnitId());
         EnvDevice device = envDeviceMapper.selectOne(queryWrapper);
         if (ObjectUtil.isEmpty(device)) {
             QueryWrapper<EnvDevice> queryWrapper1 = new QueryWrapper<>();

src/main/resources/mapper/EnvDeviceMapper.xml

@@ -31,10 +31,11 @@
     </select>
 
     <select id="list" resultType="com.huimv.admin.entity.vo.EnvDeviceVo">
-          select d.device_code,d.device_sort_code,d.device_name,d.build_location,d.device_status,d.feng_ji_num,d.xiao_chuang_num,d.dispose_time,dp.deploy_name
+          select d.id,d.device_code,d.device_sort_code,d.unit_id,d.device_name,d.build_location,d.device_status,d.feng_ji_num,d.xiao_chuang_num,d.dispose_time,dp.deploy_name
           from `env_device` d left join `env_dayage_peizhi` dp
           on d.dispose_time  = dp.time_dayage
             ${ew.customSqlSegment}
+            GROUP BY d.device_code
     </select>
 
 </mapper>