配置

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

@@ -4,11 +4,7 @@ package com.huimv.admin.controller;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.service.IEnvDayagePeizhiService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-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 java.util.Map;
 
@@ -22,6 +18,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/env-dayage-peizhi")
+@CrossOrigin
 public class EnvDayagePeizhiController {
 
     @Autowired

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

@@ -4,11 +4,7 @@ package com.huimv.admin.controller;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.service.IEnvFengPeizhiService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-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 java.util.Map;
 
@@ -22,6 +18,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/env-feng-peizhi")
+@CrossOrigin
 public class EnvFengPeizhiController {
     @Autowired
     private IEnvFengPeizhiService envFengPeizhiService;

src/main/java/com/huimv/admin/entity/EnvDayagePeizhi.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -54,6 +56,7 @@ public class EnvDayagePeizhi implements Serializable {
     /**
      * 时间戳标志
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime timeDayage;
 
     /**

src/main/java/com/huimv/admin/entity/EnvFengPeizhi.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -90,6 +92,7 @@ public class EnvFengPeizhi implements Serializable {
     /**
      * 时间戳标志
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime timeFeng;
 
     /**

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

@@ -9,6 +9,7 @@ import java.time.LocalDateTime;
 public class PublicDeployVo {
     private String location;
     private String deployName;
+    private String deviceCode;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime timeDayage;
 }

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

@@ -1,8 +1,11 @@
 package com.huimv.admin.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.entity.EnvDayagePeizhi;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.admin.entity.vo.PublicDeployVo;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
 
@@ -16,5 +19,5 @@ import java.util.List;
  */
 public interface EnvDayagePeizhiMapper extends BaseMapper<EnvDayagePeizhi> {
 
-    List<PublicDeployVo> listPublicDeploy();
+    IPage<PublicDeployVo> listPublicDeploy(IPage<PublicDeployVo> page);
 }

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

@@ -1,6 +1,8 @@
 package com.huimv.admin.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
 import com.huimv.admin.entity.EnvDayagePeizhi;
@@ -47,7 +49,11 @@ public class EnvDayagePeizhiServiceImpl extends ServiceImpl<EnvDayagePeizhiMappe
     private EnvDeviceFanMapper envDeviceFanMapper;
     @Override
     public Result listDeploy(Map<String, String> paramsMap) {
-        List<PublicDeployVo> publicDeployVos = envDayagePeizhiMapper.listPublicDeploy();
+        String pageNum = paramsMap.get("pageNum");
+        String pageSize = paramsMap.get("pageSize");
+        Page<PublicDeployVo> page = new Page(Integer.parseInt(pageNum),Integer.parseInt(pageSize));
+
+        IPage<PublicDeployVo> publicDeployVos = envDayagePeizhiMapper.listPublicDeploy(page);
         return new Result(ResultCode.SUCCESS,publicDeployVos);
     }
 
@@ -64,13 +70,14 @@ public class EnvDayagePeizhiServiceImpl extends ServiceImpl<EnvDayagePeizhiMappe
     @Transactional
     public Result rename(Map<String, String> paramsMap) {
         String deployName = paramsMap.get("newDeployName");
+        String deviceCode = paramsMap.get("deviceCode");
         String timeDayAge = paramsMap.get("timeDayAge");
-        List<EnvDayagePeizhi> time_dayage = envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>().eq("time_dayage", timeDayAge));
+        List<EnvDayagePeizhi> time_dayage = envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>().eq("time_dayage", timeDayAge).eq("device_code",deviceCode));
         for (EnvDayagePeizhi envDayagePeizhi : time_dayage) {
             envDayagePeizhi.setDeployName(deployName);
             envDayagePeizhiMapper.updateById(envDayagePeizhi);
         }
-        List<EnvFengPeizhi> windDeploy = envFengPeizhiMapper.selectList(new QueryWrapper<EnvFengPeizhi>().eq("time_feng", timeDayAge));
+        List<EnvFengPeizhi> windDeploy = envFengPeizhiMapper.selectList(new QueryWrapper<EnvFengPeizhi>().eq("time_feng", timeDayAge).eq("device_code",deviceCode));
         for (EnvFengPeizhi envWindPeizhi : windDeploy) {
             envWindPeizhi.setDeployName(deployName);
             envFengPeizhiMapper.updateById(envWindPeizhi);

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

@@ -656,7 +656,21 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         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));
-
+        if (ObjectUtil.isNull(sensorNum)){
+            sensorNum =0;
+        }
+        if (ObjectUtil.isNull(fanNum)){
+            fanNum =0;
+        }
+        if (ObjectUtil.isNull(fenestruleNum)){
+            fenestruleNum =0;
+        }
+        if (ObjectUtil.isNull(lightNum)){
+            lightNum =0;
+        }
+        if (ObjectUtil.isNull(heatNum)){
+            heatNum =0;
+        }
         map.put("sensorNum",sensorNum);
         map.put("fanNum",fanNum);
         map.put("fenestruleNum",fenestruleNum);

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

@@ -44,18 +44,22 @@ public class EnvFengPeizhiServiceImpl extends ServiceImpl<EnvFengPeizhiMapper, E
             Map map = new HashMap();
             map.put("level","M"+envDayFengPeizhi.getLevelFeng());
             map.put("tempGap",envDayFengPeizhi.getTempDiff());
+            List detailList = new ArrayList();
+            map.put("detail",detailList);
             String fans = envDayFengPeizhi.getFansCtrl();
             int j = 1;
             for (int i = fans.length()-1; i >= 0; i--) {
-                map.put("风机"+j,fans.charAt(i));
+                Map detailMap = new HashMap();
+                detailMap.put("风机"+j,fans.charAt(i));
+                detailMap.put("constantSpeed",envDayFengPeizhi.getFanEnable());
+                detailMap.put("timeControl",envDayFengPeizhi.getCycleMode());
+                detailMap.put("changeSpeed",envDayFengPeizhi.getVarFanEnable());
+                detailMap.put("speed",envDayFengPeizhi.getSpeed());
+                detailMap.put("openTime",envDayFengPeizhi.getRunGap());
+                detailMap.put("stopTime",envDayFengPeizhi.getStopGap());
+                detailList.add(detailMap);
                 j++;
             }
-            map.put("constantSpeed",envDayFengPeizhi.getFanEnable());
-            map.put("timeControl",envDayFengPeizhi.getCycleMode());
-            map.put("changeSpeed",envDayFengPeizhi.getVarFanEnable());
-            map.put("speed",envDayFengPeizhi.getSpeed());
-            map.put("openTime",envDayFengPeizhi.getRunGap());
-            map.put("stopTime",envDayFengPeizhi.getStopGap());
             list.add(map);
         }
         return new Result(ResultCode.SUCCESS,list);

src/main/resources/mapper/EnvDayagePeizhiMapper.xml

@@ -3,7 +3,7 @@
 <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
+        SELECT  d.build_location AS location,pz.device_code  ,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