部分配置更新

huimv-farm-environ/pom.xml

@@ -83,6 +83,11 @@
             <artifactId>velocity-engine-core</artifactId>
             <version>2.0</version>
         </dependency>
+        <!-- redis -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -7,6 +7,7 @@ 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,5 +22,7 @@ public interface EcoDeviceFlowService extends IService<EcoDeviceFlow> {
 
     Result getLastFlow(HttpServletRequest request);
 
-    void save(JSONObject dataJo) throws ParseException;
+    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/impl/EcoDeviceFlowServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.dto.EcoDeviceDto;
 import com.huimv.environ.eco.entity.dto.LastFlowDto;
 import com.huimv.environ.eco.mapper.EcoDeviceFlowMapper;
 import com.huimv.environ.eco.mapper.EcoDeviceMapper;
@@ -18,6 +19,9 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -41,7 +45,7 @@ public class EcoDeviceFlowServiceImpl extends ServiceImpl<EcoDeviceFlowMapper, E
     }
 
     @Override
-    public void save(JSONObject dataJo) throws ParseException {
+    public void save(JSONObject dataJo, Date todayTime) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         EcoDeviceFlow ecoDeviceFlow = new EcoDeviceFlow();
         ecoDeviceFlow.setDeviceCode(dataJo.getString("deviceKey"));
@@ -70,7 +74,47 @@ public class EcoDeviceFlowServiceImpl extends ServiceImpl<EcoDeviceFlowMapper, E
         ecoDeviceFlow.setId2Value(id2Value);
         ecoDeviceFlow.setId2AlarmStatus(id2Jo.getBoolean("isAlarm"));
         ecoDeviceFlow.setId2AlarmMsg(id2Jo.getString("alarmMsg"));
-        ecoDeviceFlow.setAddTime(dateUtil.getTodayDateTime());
+        ecoDeviceFlow.setAddTime(todayTime);
         ecoDeviceFlowMapper.insert(ecoDeviceFlow);
     }
+
+
+    @Override
+    public Result listByRoom(HttpServletRequest request, Map<String, String> paramsMap) throws ParseException {
+        String farmId = request.getHeader("farmId");
+        String unitId = paramsMap.get("unitId");
+        String startDate = paramsMap.get("startDate");
+        String endDate = paramsMap.get("endDate");
+        String type = paramsMap.get("type");
+
+        List<EcoDeviceDto> ecoDeviceDtos = null;
+        //默认显示
+        if (type==null) {
+            unitId = "77";
+            DateUtil dateUtil = new DateUtil();
+            startDate = dateUtil.getTodayDate().toString();
+            ecoDeviceDtos = ecoDeviceFlowMapper.listDayDevice(farmId, unitId, startDate);
+        } else {
+
+            //自定义查询
+            if ("4".equals(type)) {
+                ecoDeviceDtos = ecoDeviceFlowMapper.listDevice(farmId, unitId, startDate, endDate);
+            }
+            //今日查询
+            else if ("3".equals(type)) {
+                ecoDeviceDtos = ecoDeviceFlowMapper.listDayDevice(farmId, unitId, startDate);
+            }
+            //本周查询
+            else if ("2".equals(type)) {
+                ecoDeviceDtos = ecoDeviceFlowMapper.listWeekDevice(farmId, unitId);
+            }
+            //本月查询
+            else if ("1".equals(type)) {
+                ecoDeviceDtos = ecoDeviceFlowMapper.listMonthDevice(farmId, unitId);
+            }
+
+        }
+
+        return new Result(ResultCode.SUCCESS, ecoDeviceDtos);
+    }
 }

huimv-farm-environ/src/main/resources/application-lishui.yml

@@ -15,7 +15,25 @@ spring:
       ddl-auto: none
     database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
     show-sql: true
+
+  #redis
   redis:
+    database: 2
     host: 122.112.224.199
+#    host: 121.36.134.218
     port: 6379
     password: hm123456
+    timeout: 5000ms
+    jedis:
+      pool:
+        max-active: 20
+        max-wait: -1
+        max-idle: 10
+        min-idle: 0
+    lettuce:
+      pool:
+        max-active: 3
+        min-idle: 2
+        max-idle: 3
+        max-wait: 1
+      shutdown-timeout: 100

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

@@ -13,3 +13,5 @@ url.threshold.service=http://localhost:8010/produce/threshold/getThresholdByFarm
 #
 #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