Newspaper vor 2 Jahren
Ursprung
Commit
321055c872

+ 36 - 0
src/main/java/com/huimv/admin/controller/EnvDayagePeizhiController.java

@@ -1,10 +1,17 @@
 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 java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -17,4 +24,33 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/env-dayage-peizhi")
 public class EnvDayagePeizhiController {
 
+    @Autowired
+    private IEnvDayagePeizhiService envDayagePeizhiService;
+    @PostMapping("/listDeploy")
+    public Result listDeploy(@RequestBody Map<String, String> paramsMap){
+        return envDayagePeizhiService.listDeploy(paramsMap);
+    }
+
+    @PostMapping("/listDeployByDevice")
+    public Result listDeployByDevice(@RequestBody Map<String, String> paramsMap){
+        return envDayagePeizhiService.listDeployByDevice(paramsMap);
+    }
+
+    @PostMapping("/rename")
+    public Result rename(@RequestBody Map<String, String> paramsMap){
+        return envDayagePeizhiService.rename(paramsMap);
+    }
+    @PostMapping("/listDayAge")
+    public Result listDayAge(@RequestBody Map<String, String> paramsMap){
+        return envDayagePeizhiService.listDayAge(paramsMap);
+    }
+    @PostMapping("/apply")
+    public Result apply(@RequestBody Map<String, String> paramsMap){
+        return envDayagePeizhiService.apply(paramsMap);
+    }
+
+    @PostMapping("/uplode")
+    public Result uplode(@RequestBody Map<String, String> paramsMap){
+        return envDayagePeizhiService.uplode(paramsMap);
+    }
 }

+ 13 - 0
src/main/java/com/huimv/admin/controller/EnvFengPeizhiController.java

@@ -1,10 +1,17 @@
 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 java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -16,5 +23,11 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/env-feng-peizhi")
 public class EnvFengPeizhiController {
+    @Autowired
+    private IEnvFengPeizhiService envFengPeizhiService;
 
+    @PostMapping("/listWind")
+    public Result listWind(@RequestBody Map<String, String> paramsMap){
+        return envFengPeizhiService.listWind(paramsMap);
+    }
 }

+ 1 - 1
src/main/java/com/huimv/admin/entity/EnvDayagePeizhi.java

@@ -66,7 +66,7 @@ public class EnvDayagePeizhi implements Serializable {
      */
     private Integer usingStart;
 
-    private String other1;
+    private String deployName;
 
     private String other2;
 

+ 7 - 2
src/main/java/com/huimv/admin/entity/EnvDevice.java

@@ -3,11 +3,13 @@ package com.huimv.admin.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -67,9 +69,9 @@ public class EnvDevice implements Serializable {
 
     private Integer farmId;
 
-    private String fengJiNum;
+    private Integer fengJiNum;
 
-    private String xiaoChuangNum;
+    private Integer xiaoChuangNum;
 
     private String ohter3;
 
@@ -79,4 +81,7 @@ public class EnvDevice implements Serializable {
 
     private Integer stageType;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime disposeTime;
+
 }

+ 4 - 2
src/main/java/com/huimv/admin/entity/EnvFengPeizhi.java

@@ -3,6 +3,8 @@ package com.huimv.admin.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import lombok.Data;
@@ -38,7 +40,7 @@ public class EnvFengPeizhi implements Serializable {
     /**
      * 温差
      */
-    private Integer tempDiff;
+    private BigDecimal tempDiff;
 
     /**
      * 定速
@@ -100,7 +102,7 @@ public class EnvFengPeizhi implements Serializable {
      */
     private Integer usingStart;
 
-    private String other1;
+    private String deployName;
 
     private String other2;
 

+ 14 - 0
src/main/java/com/huimv/admin/service/IEnvDayagePeizhiService.java

@@ -1,8 +1,11 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.EnvDayagePeizhi;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IEnvDayagePeizhiService extends IService<EnvDayagePeizhi> {
 
+    Result listDeploy(Map<String, String> paramsMap);
+
+    Result listDayAge(Map<String, String> paramsMap);
+
+    Result listDeployByDevice(Map<String, String> paramsMap);
+
+    Result rename(Map<String, String> paramsMap);
+
+    Result apply(Map<String, String> paramsMap);
+
+    Result uplode(Map<String, String> paramsMap);
 }

+ 4 - 0
src/main/java/com/huimv/admin/service/IEnvFengPeizhiService.java

@@ -1,8 +1,11 @@
 package com.huimv.admin.service;
 
+import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.entity.EnvFengPeizhi;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IEnvFengPeizhiService extends IService<EnvFengPeizhi> {
 
+    Result listWind(Map<String, String> paramsMap);
 }

+ 123 - 0
src/main/java/com/huimv/admin/service/impl/EnvDayagePeizhiServiceImpl.java

@@ -1,10 +1,27 @@
 package com.huimv.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.EnvFengPeizhi;
 import com.huimv.admin.mapper.EnvDayagePeizhiMapper;
+import com.huimv.admin.mapper.EnvDeviceMapper;
+import com.huimv.admin.mapper.EnvFengPeizhiMapper;
 import com.huimv.admin.service.IEnvDayagePeizhiService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -17,4 +34,110 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnvDayagePeizhiServiceImpl extends ServiceImpl<EnvDayagePeizhiMapper, EnvDayagePeizhi> implements IEnvDayagePeizhiService {
 
+    @Resource
+    private EnvDayagePeizhiMapper envDayagePeizhiMapper;
+    @Resource
+    private EnvFengPeizhiMapper envFengPeizhiMapper;
+    @Resource
+    private EnvDeviceMapper envDeviceMapper;
+    @Override
+    public Result listDeploy(Map<String, String> paramsMap) {
+        String farmId = paramsMap.get("farmId");
+        envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>().eq("farmId",farmId));
+        return null;
+    }
+
+    @Override
+    public Result listDeployByDevice(Map<String, String> paramsMap) {
+        String deviceCode = paramsMap.get("deviceCode");
+        List<EnvDayagePeizhi> envDayagePeizhis = envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>()
+                .eq("device_code", deviceCode)
+                .groupBy("time_dayage"));
+        return new Result(ResultCode.SUCCESS,envDayagePeizhis);
+    }
+
+    @Override
+    @Transactional
+    public Result rename(Map<String, String> paramsMap) {
+        String deployName = paramsMap.get("newDeployName");
+        String timeDayAge = paramsMap.get("timeDayAge");
+        List<EnvDayagePeizhi> time_dayage = envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>().eq("time_dayage", timeDayAge));
+        for (EnvDayagePeizhi envDayagePeizhi : time_dayage) {
+            envDayagePeizhi.setDeployName(deployName);
+            envDayagePeizhiMapper.updateById(envDayagePeizhi);
+        }
+        List<EnvFengPeizhi> windDeploy = envFengPeizhiMapper.selectList(new QueryWrapper<EnvFengPeizhi>().eq("time_feng", timeDayAge));
+        for (EnvFengPeizhi envWindPeizhi : windDeploy) {
+            envWindPeizhi.setDeployName(deployName);
+            envFengPeizhiMapper.updateById(envWindPeizhi);
+        }
+        return Result.SUCCESS();
+    }
+
+    @Override
+    @Transactional
+    public Result apply(Map<String, String> paramsMap) {
+        String deviceCode = paramsMap.get("deviceCode");
+        String timeDayAge = paramsMap.get("timeDayAge");
+        String farmId = paramsMap.get("farmId");
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime time = LocalDateTime.parse(timeDayAge, formatter);
+        System.out.println(time);
+        EnvDevice envDevice = envDeviceMapper.selectOne(new QueryWrapper<EnvDevice>().eq("device_sort_code", deviceCode).eq("farm_id", farmId));
+        envDevice.setDisposeTime(time);
+        envDeviceMapper.updateById(envDevice);
+        //应用的变1
+        List<EnvDayagePeizhi> envDayagePeizhis = envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>().eq("device_code", deviceCode).eq("time_dayage", time));
+        for (EnvDayagePeizhi envDayagePeizhi : envDayagePeizhis) {
+            envDayagePeizhi.setUsingStart(1);
+            envDayagePeizhiMapper.updateById(envDayagePeizhi);
+        }
+        List<EnvFengPeizhi> envFengPeizhis = envFengPeizhiMapper.selectList(new QueryWrapper<EnvFengPeizhi>().eq("device_code", deviceCode).eq("time_feng", time));
+        for (EnvFengPeizhi envFengPeizhi : envFengPeizhis) {
+            envFengPeizhi.setUsingStart(1);
+            envFengPeizhiMapper.updateById(envFengPeizhi);
+        }
+        //其他0
+        List<EnvDayagePeizhi> envDayage = envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>().eq("device_code", deviceCode).ne("time_dayage", time));
+        for (EnvDayagePeizhi envDayagePeizhi : envDayage) {
+            envDayagePeizhi.setUsingStart(0);
+            envDayagePeizhiMapper.updateById(envDayagePeizhi);
+        }
+        List<EnvFengPeizhi> envFeng = envFengPeizhiMapper.selectList(new QueryWrapper<EnvFengPeizhi>().eq("device_code", deviceCode).ne("time_feng", time));
+        for (EnvFengPeizhi envFengPeizhi : envFeng) {
+            envFengPeizhi.setUsingStart(0);
+            envFengPeizhiMapper.updateById(envFengPeizhi);
+        }
+        return Result.SUCCESS();
+    }
+
+    @Override
+    public Result uplode(Map<String, String> paramsMap) {
+        String timeDayAge = paramsMap.get("timeDayAge");
+        String deviceCode = paramsMap.get("deviceCode");
+        List<EnvDayagePeizhi> envDayagePeizhis = envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>().eq("device_code", deviceCode).eq("time_dayage", timeDayAge));
+        for (EnvDayagePeizhi envDayagePeizhi : envDayagePeizhis) {
+            envDayagePeizhi.setOpenStatus(1);
+            envDayagePeizhiMapper.updateById(envDayagePeizhi);
+        }
+        List<EnvFengPeizhi> envFengPeizhis = envFengPeizhiMapper.selectList(new QueryWrapper<EnvFengPeizhi>().eq("device_code", deviceCode).eq("time_feng", timeDayAge));
+        for (EnvFengPeizhi envFengPeizhi : envFengPeizhis) {
+            envFengPeizhi.setOpenStatus(1);
+            envFengPeizhiMapper.updateById(envFengPeizhi);
+        }
+        return Result.SUCCESS();
+    }
+
+    @Override
+    public Result listDayAge(Map<String, String> paramsMap) {
+        String deviceCode = paramsMap.get("deviceCode");
+        String timeDayAge = paramsMap.get("timeDayAge");
+        List<EnvDayagePeizhi> envDayagePeizhis = envDayagePeizhiMapper.selectList(new QueryWrapper<EnvDayagePeizhi>()
+                .eq("device_code", deviceCode)
+                .eq("time_dayage", timeDayAge)
+                .orderByAsc("level_dayage"));
+        return new Result(ResultCode.SUCCESS,envDayagePeizhis);
+    }
+
+
 }

+ 43 - 0
src/main/java/com/huimv/admin/service/impl/EnvFengPeizhiServiceImpl.java

@@ -1,11 +1,22 @@
 package com.huimv.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.EnvFengPeizhi;
 import com.huimv.admin.mapper.EnvFengPeizhiMapper;
 import com.huimv.admin.service.IEnvFengPeizhiService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +28,36 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnvFengPeizhiServiceImpl extends ServiceImpl<EnvFengPeizhiMapper, EnvFengPeizhi> implements IEnvFengPeizhiService {
 
+    @Resource
+    private EnvFengPeizhiMapper envFengPeizhiMapper;
+
+    @Override
+    public Result listWind(Map<String, String> paramsMap) {
+        String deviceCode = paramsMap.get("deviceCode");
+        String timeFeng = paramsMap.get("timeFeng");
+        List<EnvFengPeizhi> envDayFengPeizhis = envFengPeizhiMapper.selectList(new QueryWrapper<EnvFengPeizhi>()
+                .eq("device_code", deviceCode)
+                .eq("time_feng", timeFeng)
+                .orderByAsc("level_feng"));
+        List list = new ArrayList();
+        for (EnvFengPeizhi envDayFengPeizhi : envDayFengPeizhis) {
+            Map map = new HashMap();
+            map.put("level","M"+envDayFengPeizhi.getLevelFeng());
+            map.put("tempGap",envDayFengPeizhi.getTempDiff());
+            String fans = envDayFengPeizhi.getFansCtrl();
+            int j = 1;
+            for (int i = fans.length()-1; i >= 0; i--) {
+                map.put("风机"+j,fans.charAt(i));
+                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);
+    }
 }