Merge branch 'master' of D:\idea4\huimv.farm.datacenter with conflicts.

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/EcoDeviceFlowController.java

@@ -34,10 +34,14 @@ public class EcoDeviceFlowController {
         return ecoDeviceFlowService.getLastFlow(paramsMap);
     }
 
-
     @PostMapping("/listByRoom")
     public Result listByRoom( HttpServletRequest request,@RequestBody Map<String, String> paramsMap) throws ParseException {
         return ecoDeviceFlowService.listByRoom(request, paramsMap);
     }
+
+    @PostMapping("/listDayDetails")
+    public Result listDayDetails( HttpServletRequest request,@RequestBody Map<String, String> paramsMap) throws ParseException {
+        return ecoDeviceFlowService.listDayDetails(request, paramsMap);
+    }
 }
 

huimv-farm-environ/src/main/java/com/huimv/environ/eco/controller/EcoDryListController.java

@@ -1,10 +1,19 @@
 package com.huimv.environ.eco.controller;
 
 
+import com.huimv.common.utils.Result;
+import com.huimv.environ.eco.service.EcoDryListService;
+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 javax.servlet.http.HttpServletRequest;
+import java.text.ParseException;
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -14,8 +23,15 @@ import org.springframework.web.bind.annotation.RestController;
  * @since 2022-11-11
  */
 @RestController
-@RequestMapping("/eco-dry-list")
+@RequestMapping("/ecoDryList")
 public class EcoDryListController {
+    @Autowired
+    private EcoDryListService ecoDryListService;
+
+    @PostMapping("/listDayEvent")
+    public Result listDayEvent(HttpServletRequest request, @RequestBody Map<String, String> paramsMap) throws ParseException {
+        return ecoDryListService.listDayEvent(request, paramsMap);
+    }
 
 }
 

huimv-farm-environ/src/main/java/com/huimv/environ/eco/schedule/ScheduleTask.java

@@ -53,7 +53,7 @@ public class ScheduleTask {
     private String URL_ENVIRON_DEVICE_SERVICE;
 //    private static String URL = "http://www.0531yun.com/app/GetDeviceData";
 
-    @Scheduled(cron = "0 0/5 * * * ?")  //每5分钟执行一次
+//    @Scheduled(cron = "0 0/5 * * * ?")  //每5分钟执行一次
 //    @Scheduled(cron = "*/10 * * * * ?")  //每10秒钟执行一次
     public void getDeviceFlow() throws ParseException {
         DateUtil dateUtil = new DateUtil();

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/EcoDeviceFlowService.java

@@ -25,4 +25,5 @@ public interface EcoDeviceFlowService extends IService<EcoDeviceFlow> {
     void save(JSONObject dataJo, Date todayTime) throws ParseException;
 
     Result listByRoom(HttpServletRequest request, Map<String, String> paramsMap) throws ParseException;
+
 }

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/EcoDryListService.java

@@ -1,9 +1,11 @@
 package com.huimv.environ.eco.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.huimv.common.utils.Result;
 import com.huimv.environ.eco.entity.EcoDryList;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.Map;
@@ -21,4 +23,8 @@ public interface EcoDryListService extends IService<EcoDryList> {
     void saveDryList(Map deviceMap, JSONObject dataJo, JSONObject thresholdJo, Date todayTime) throws ParseException;
 
     void sendLowDryTempAlarm(String alarmInfo, String farmId, String warningTime, String uploadTime);
+
+    Result listDayEvent(HttpServletRequest request, Map<String, String> paramsMap) throws ParseException;
+
+    Result listDayDetails(HttpServletRequest request, Map<String, String> paramsMap);
 }

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EcoDeviceFlowServiceImpl.java

@@ -39,8 +39,8 @@ public class EcoDeviceFlowServiceImpl extends ServiceImpl<EcoDeviceFlowMapper, E
     private EcoDeviceFlowMapper ecoDeviceFlowMapper;
 
     @Override
-    public Result getLastFlow(Map<String, String> paramsMap) {
-        String farmId = paramsMap.get("farmId");
+    public Result getLastFlow(HttpServletRequest request) {
+        String farmId = request.getHeader("farmId");
         return new Result(ResultCode.SUCCESS,ecoDeviceFlowMapper.getLastFlow(farmId));
     }
 
@@ -81,7 +81,7 @@ public class EcoDeviceFlowServiceImpl extends ServiceImpl<EcoDeviceFlowMapper, E
 
     @Override
     public Result listByRoom(HttpServletRequest request, Map<String, String> paramsMap) throws ParseException {
-        String farmId = paramsMap.get("farmId");
+        String farmId = request.getHeader("farmId");
         String unitId = paramsMap.get("unitId");
         String startDate = paramsMap.get("startDate");
         String endDate = paramsMap.get("endDate");

huimv-farm-environ/src/main/java/com/huimv/environ/eco/service/impl/EcoDryListServiceImpl.java

@@ -3,6 +3,10 @@ package com.huimv.environ.eco.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
+import com.huimv.environ.eco.entity.EcoDeviceFlow;
 import com.huimv.environ.eco.entity.EcoDryList;
 import com.huimv.environ.eco.mapper.EcoDryListMapper;
 import com.huimv.environ.eco.service.EcoDryListService;
@@ -18,11 +22,10 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -171,4 +174,46 @@ public class EcoDryListServiceImpl extends ServiceImpl<EcoDryListMapper, EcoDryL
             return false;
         }
     }
+
+    /**
+     * @Method : listDayEvent
+     * @Description : 查看烘干时间
+     * @Params : [request, paramsMap]
+     * @Return : com.huimv.common.utils.Result
+     * @Author : ZhuoNing
+     * @Date : 2022/11/14
+     * @Time : 9:24
+     */
+    @Override
+    public Result listDayEvent(HttpServletRequest request, Map<String, String> paramsMap) throws ParseException {
+        //pageNo
+        String pageNo = paramsMap.get("pageNo") + "";
+        if (StringUtils.isBlank(pageNo)) {
+            pageNo = "1";
+        }
+        //pageSize
+        String pageSize = paramsMap.get("pageSize") + "";
+        if (StringUtils.isBlank(pageSize)) {
+            pageSize = "10";
+        }
+        DateUtil dateUtil = new DateUtil();
+        //farmId
+        String farmId = paramsMap.get("farmId");
+        QueryWrapper<EcoDryList> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_id",farmId);
+        queryWrapper.orderByDesc("add_time");
+        Page<EcoDryList> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
+        Page<EcoDryList> pageEcoDryList = ecoDryListMapper.selectPage(page, queryWrapper);
+        List<EcoDryList> ecoDryListList = pageEcoDryList.getRecords();
+        List dataList = new ArrayList();
+        for(EcoDryList ecoDryList:ecoDryListList){
+            JSONObject ecoDryJo = JSONObject.parseObject(JSONObject.toJSONString(ecoDryList));
+            ecoDryJo.put("addTime",dateUtil.formatDateTime(ecoDryList.getAddTime()));
+            dataList.add(ecoDryJo);
+        }
+        pageEcoDryList.setRecords(dataList);
+        return new Result(ResultCode.SUCCESS, pageEcoDryList);
+    }
+
+
 }

huimv-farm-environ/src/main/resources/application.properties

@@ -7,11 +7,15 @@ spring.profiles.active=lishui
 
 #
 url.environ.device.service=http://www.0531yun.com/app/GetDeviceData
+
 #
-#url.threshold.service=http://192.168.1.67:8010/produce/threshold/getThresholdByFarmId
-url.threshold.service=http://localhost:8010/produce/threshold/getThresholdByFarmId
+url.threshold.service=http://192.168.1.67:8010/produce/threshold/getThresholdByFarmId
+#url.threshold.service=http://localhost:8010/produce/threshold/getThresholdByFarmId
+
 #
-#url.warning.service=http://192.168.1.67:8010/produce/warningInfo/newAlarm
-url.warning.service=http://localhost:8010/produce/warningInfo/newAlarm
+url.warning.service=http://192.168.1.67:8010/produce/warningInfo/newAlarm
+#url.warning.service=http://localhost:8010/produce/warningInfo/newAlarm
+
 #第一次烘干结束，第二次烘干开始之间的间隔持续时间
 dry.twice.duration.minute=0
+

huimv-farm-environ/src/test/java/com/huimv/environ/eco/TaskTest.java

@@ -20,6 +20,8 @@ import java.text.ParseException;
 public class TaskTest {
     @Autowired
     private ScheduleTask test;
+    @Autowired
+    private EcoDryListService ecoDryListService;
 
     @Test
     public void testDevice() throws ParseException {
@@ -42,8 +44,6 @@ public class TaskTest {
         }
     }
 
-    @Autowired
-    private EcoDryListService ecoDryListService;
     @Test
     public void testSendDryTempAlarm(){
         String alarmInfo = "2022-11-12,当前温度[40]未达到烘干阈值温度[50]";