配置

src/main/java/com/huimv/admin/controller/EnvDeviceController.java

@@ -5,10 +5,7 @@ import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.EnvDevice;
 import com.huimv.admin.service.IEnvDeviceService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
@@ -87,5 +84,9 @@ public class EnvDeviceController {
     public Result selectList(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) {
         return envDeviceService.selectList(httpServletRequest,paramsMap);
     }
+    @PostMapping("/listDetail")
+    public Result listDetail(@RequestBody Map<String, String> paramsMap){
+        return envDeviceService.listDetail(paramsMap);
+    }
 
 }

src/main/java/com/huimv/admin/entity/vo/PublicDeployVo.java

@@ -0,0 +1,14 @@
+package com.huimv.admin.entity.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class PublicDeployVo {
+    private String location;
+    private String deployName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime timeDayage;
+}

src/main/java/com/huimv/admin/mapper/EnvDayagePeizhiMapper.java

@@ -2,6 +2,9 @@ package com.huimv.admin.mapper;
 
 import com.huimv.admin.entity.EnvDayagePeizhi;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.admin.entity.vo.PublicDeployVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnvDayagePeizhiMapper extends BaseMapper<EnvDayagePeizhi> {
 
+    List<PublicDeployVo> listPublicDeploy();
 }

src/main/java/com/huimv/admin/service/IEnvDeviceService.java

@@ -39,4 +39,6 @@ public interface IEnvDeviceService extends IService<EnvDevice> {
     Result bandingUnitId(HttpServletRequest httpServletRequest, EnvDevice envDevice);
 
     Result listPigpenAll(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listDetail(Map<String, String> paramsMap);
 }

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

@@ -5,8 +5,11 @@ import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.EnvDayagePeizhi;
 import com.huimv.admin.entity.EnvDevice;
+import com.huimv.admin.entity.EnvDeviceFan;
 import com.huimv.admin.entity.EnvFengPeizhi;
+import com.huimv.admin.entity.vo.PublicDeployVo;
 import com.huimv.admin.mapper.EnvDayagePeizhiMapper;
+import com.huimv.admin.mapper.EnvDeviceFanMapper;
 import com.huimv.admin.mapper.EnvDeviceMapper;
 import com.huimv.admin.mapper.EnvFengPeizhiMapper;
 import com.huimv.admin.service.IEnvDayagePeizhiService;
@@ -40,11 +43,12 @@ public class EnvDayagePeizhiServiceImpl extends ServiceImpl<EnvDayagePeizhiMappe
     private EnvFengPeizhiMapper envFengPeizhiMapper;
     @Resource
     private EnvDeviceMapper envDeviceMapper;
+    @Resource
+    private EnvDeviceFanMapper envDeviceFanMapper;
     @Override
     public Result listDeploy(Map<String, String> paramsMap) {
-        String farmId = paramsMap.get("farmId");
-        envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>().eq("farmId",farmId));
-        return null;
+        List<PublicDeployVo> publicDeployVos = envDayagePeizhiMapper.listPublicDeploy();
+        return new Result(ResultCode.SUCCESS,publicDeployVos);
     }
 
     @Override
@@ -86,6 +90,15 @@ public class EnvDayagePeizhiServiceImpl extends ServiceImpl<EnvDayagePeizhiMappe
         EnvDevice envDevice = envDeviceMapper.selectOne(new QueryWrapper<EnvDevice>().eq("device_sort_code", deviceCode).eq("farm_id", farmId));
         envDevice.setDisposeTime(time);
         envDeviceMapper.updateById(envDevice);
+        List<EnvFengPeizhi> timeDayAge1 = envFengPeizhiMapper.selectList(new QueryWrapper<EnvFengPeizhi>().eq("time_feng",timeDayAge));
+        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){
+                return new Result(ResultCode.FAIL,"设备风机数量不等于配置所需！");
+            }
+        }
+
         //应用的变1
         List<EnvDayagePeizhi> envDayagePeizhis = envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>().eq("device_code", deviceCode).eq("time_dayage", time));
         for (EnvDayagePeizhi envDayagePeizhi : envDayagePeizhis) {
@@ -112,6 +125,7 @@ public class EnvDayagePeizhiServiceImpl extends ServiceImpl<EnvDayagePeizhiMappe
     }
 
     @Override
+    @Transactional
     public Result uplode(Map<String, String> paramsMap) {
         String timeDayAge = paramsMap.get("timeDayAge");
         String deviceCode = paramsMap.get("deviceCode");

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

@@ -277,7 +277,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         pressureMapper.insert(pressure);
 
 
-        for (int i = 1; i < Integer.parseInt(envDevice1.getFengJiNum())+1; i++) {
+        for (int i = 1; i < envDevice1.getFengJiNum()+1; i++) {
             EnvDeviceFan fan = new EnvDeviceFan();
             fan.setDeviceCode(envDevice1.getDeviceSortCode());
             fan.setChipCode(envDevice1.getDeviceSortCode() + "11" + i);
@@ -287,7 +287,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
             fan.setOther1(String.valueOf(i));
             fanMapper.insert(fan);
         }
-        for (int i = 1; i < Integer.parseInt(envDevice1.getXiaoChuangNum())+1; i++) {
+        for (int i = 1; i < envDevice1.getXiaoChuangNum()+1; i++) {
             EnvDeviceFenestrule fenestrulen = new EnvDeviceFenestrule();
             fenestrulen.setDeviceCode(envDevice1.getDeviceSortCode());
             fenestrulen.setChipCode(envDevice1.getDeviceSortCode() + "12" + i);
@@ -646,6 +646,26 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         return new Result(ResultCode.SUCCESS, objects);
     }
 
+    @Override
+    public Result listDetail(Map<String, String> paramsMap) {
+        String deviceCode = paramsMap.get("deviceCode");
+        String farmId = paramsMap.get("farmId");
+        Map map = new HashMap();
+        Integer sensorNum = envDeviceRecentlyDataMapper.selectCount(new QueryWrapper<EnvDeviceRecentlyData>().eq("device_code", deviceCode).eq("farm_Id",farmId));
+        Integer fanNum = fanMapper.selectCount(new QueryWrapper<EnvDeviceFan>().eq("device_code", deviceCode).eq("farm_Id",farmId));
+        Integer fenestruleNum = fenestruleMapper.selectCount(new QueryWrapper<EnvDeviceFenestrule>().eq("device_code", deviceCode).eq("farm_Id",farmId));
+        Integer lightNum = otherMapper.selectCount(new QueryWrapper<EnvDeviceOther>().eq("device_code", deviceCode).eq("other1", 1).eq("farm_Id",farmId));
+        Integer heatNum = otherMapper.selectCount(new QueryWrapper<EnvDeviceOther>().eq("device_code", deviceCode).eq("other1", 2).eq("farm_Id",farmId));
+
+        map.put("sensorNum",sensorNum);
+        map.put("fanNum",fanNum);
+        map.put("fenestruleNum",fenestruleNum);
+        map.put("lightNum",lightNum);
+        map.put("heatNum",heatNum);
+
+        return new Result(ResultCode.SUCCESS,map);
+    }
+
 //    //添加新的设备
 //    private void syncConfig(String shackId,HttpEntity httpEntity,String farmId) {
 //        try {

src/main/resources/mapper/EnvDayagePeizhiMapper.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huimv.admin.mapper.EnvDayagePeizhiMapper">
 
+    <select id="listPublicDeploy" resultType="com.huimv.admin.entity.vo.PublicDeployVo">
+        SELECT  d.build_location AS location,deploy_name,time_dayage
+            FROM `env_dayage_peizhi` pz LEFT JOIN `env_device` d
+            ON pz.device_code = d.device_sort_code
+	        WHERE pz.open_status = 1
+	        GROUP BY pz.time_dayage
+    </select>
 </mapper>