微信推送

huimv-env-platform/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -4,6 +4,7 @@ com\huimv\env\common\dao\repo\EnvSprayTimeEntityRepo.class
 com\huimv\env\common\dao\entity\EnvDeviceRegisterEntity.class
 com\huimv\env\common\dao\entity\EnvSprayStatusEntity.class
 com\huimv\env\common\dao\entity\EnvAmmoniaEntity.class
+com\huimv\env\common\service\impl\TempThresholdServiceImpl.class
 com\huimv\env\common\service\ISensorRegisterService.class
 com\huimv\env\common\dao\entity\EnvPushMessageEntity.class
 com\huimv\env\common\service\IPigpenService.class
@@ -11,9 +12,12 @@ com\huimv\env\common\utils\RegexUtil.class
 com\huimv\env\common\dao\repo\EnvTempThresholdEntityRepo.class
 com\huimv\env\common\utils\Const.class
 com\huimv\env\common\service\impl\SensorRegisterServiceImpl.class
+com\huimv\env\common\service\ITempThresholdService.class
 com\huimv\env\common\service\IDeviceRegisterService.class
 com\huimv\env\common\dao\entity\EnvHumiEntity.class
 com\huimv\env\common\dao\repo\EnvAlarmTypeEntityRepo.class
+com\huimv\env\common\service\ISprayTimeService.class
+com\huimv\env\common\service\ISprayConfigService.class
 com\huimv\env\common\dao\repo\EnvHumiEntityRepo.class
 com\huimv\env\common\dao\repo\EnvTempEntityRepo.class
 com\huimv\env\common\dao\repo\EnvDeviceRegisterEntityRepo.class
@@ -23,13 +27,17 @@ com\huimv\env\common\dao\entity\EnvAlarmTypeEntity.class
 com\huimv\env\common\service\impl\PushMessageServiceImpl.class
 com\huimv\env\common\service\impl\DeviceRegisterServiceImpl.class
 com\huimv\env\common\service\IPushMessageService.class
+com\huimv\env\common\service\impl\SprayTimeServiceImpl.class
 com\huimv\env\common\dao\entity\EnvSprayConfigEntity.class
+com\huimv\env\common\service\impl\SprayStatusServiceImpl.class
 com\huimv\env\common\dao\repo\EnvSprayConfigEntityRepo.class
 com\huimv\env\common\dao\entity\EnvTempThresholdEntity.class
 com\huimv\env\common\dao\repo\BasePigpenEntityRepo.class
 com\huimv\env\common\dao\repo\EnvPushMessageEntityRepo.class
+com\huimv\env\common\service\impl\SprayConfigServiceImpl.class
 com\huimv\env\common\utils\DateUtil.class
 com\huimv\env\common\utils\MathUtil.class
+com\huimv\env\common\service\ISprayStatusService.class
 com\huimv\env\common\dao\entity\EnvSensorRegisterEntity.class
 com\huimv\env\common\dao\repo\EnvSprayStatusEntityRepo.class
 com\huimv\env\common\dao\entity\EnvTempEntity.class

huimv-env-platform/huimv-env-input/target/classes/application-dev.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-env-input
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -41,35 +41,35 @@ spring:
     publisher-returns: true
 
   #redis
-  redis:
-    database: 0
-    host: 192.168.1.68
-    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
+#  redis:
+#    database: 0
+#    host: 192.168.1.68
+#    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
 
-  data:
-    redis:
-      repositories:
-        enabled: false
+#  data:
+#    redis:
+#      repositories:
+#        enabled: false
 
   #是否缓存空值
-  cache:
-    redis:
-      cache-null-values: false
+#  cache:
+#    redis:
+#      cache-null-values: false
 
 
 

huimv-env-platform/huimv-env-input/target/classes/application.properties

@@ -1,20 +1,20 @@
-spring.profiles.active=dev
+spring.profiles.active=prod
 
-#�����������
+#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 management.endpoints.web.exposure.include=*
 
 #########################################################
-###             ����undertowȡ��tomcat                ###
+###             \uFFFD\uFFFD\uFFFD\uFFFDundertow\u0221\uFFFD\uFFFDtomcat                ###
 #########################################################
-# �Ƿ�� undertow ��־��Ĭ��Ϊ false
+# \uFFFD\u01F7\uFFFD\uFFFD undertow \uFFFD\uFFFD\u05BE\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA false
 server.undertow.accesslog.enabled=false
-# ���÷�����־����Ŀ¼
+# \uFFFD\uFFFD\uFFFD\u00F7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\u013F\u00BC
 server.undertow.accesslog.dir=logs
-# ָ���������̵߳� I/0 �߳�����Ĭ��Ϊ 2 ���� CPU �ĸ���
+# \u05B8\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\u0335\uFFFD I/0 \uFFFD\u07F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA 2 \uFFFD\uFFFD\uFFFD\uFFFD CPU \uFFFD\u0138\uFFFD\uFFFD\uFFFD
 server.undertow.io-threads=
-# ָ���������̸߳�����Ĭ��Ϊ I/O �̸߳����� 8 ��
+# \u05B8\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\u0338\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA I/O \uFFFD\u07F3\u0338\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD 8 \uFFFD\uFFFD
 server.undertow.worker-threads=
-# ���� HTTP POST ���ݵ���󳤶ȣ�Ĭ�ϲ�������
+# \uFFFD\uFFFD\uFFFD\uFFFD HTTP POST \uFFFD\uFFFD\uFFFD\u0775\uFFFD\uFFFD\uFFFD\uDB8E\uDD36\u0223\uFFFD\u012C\uFFFD\u03F2\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 server.undertow.max-http-post-size=0
 
 #########################################################
@@ -22,10 +22,10 @@ server.undertow.max-http-post-size=0
 #########################################################
 management.security.enabled=false
 
-# ���ݴ�������
+# \uFFFD\uFFFD\uFFFD\u0774\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 data.input.flow=2
 
-# �Ƿ�д���������(1:д�� 0:��д��)
+# \uFFFD\u01F7\uFFFD\u0434\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD(1:\u0434\uFFFD\uFFFD 0:\uFFFD\uFFFD\u0434\uFFFD\uFFFD)
 data.test.input=0
 
 

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/EnvSprayTimeController.java

@@ -1,6 +1,8 @@
 package com.huimv.env.manage.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.huimv.env.manage.entity.EnvSprayTime;
 import com.huimv.env.manage.service.IEnvHumiService;
 import com.huimv.env.manage.service.IEnvSprayTimeService;
@@ -8,6 +10,8 @@ import com.huimv.env.manage.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.CrossOrigin;
+
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -40,6 +44,8 @@ public class EnvSprayTimeController {
        Integer duration  = (( Integer.parseInt(closeTime.substring(0,2)) -  Integer.parseInt(openTime.substring(0,2))) * 60*60)
                             + ((Integer.parseInt(closeTime.substring(3)) -Integer.parseInt(openTime.substring(3))) *60 );
         envSprayTime.setDuration(duration);
+        List<EnvSprayTime> list = envSprayTimeService.list(new QueryWrapper<EnvSprayTime>().eq("device_code",envSprayTime.getDeviceCode()));
+        envSprayTime.setOpenMode(list.get(0).getOpenMode());
         envSprayTimeService.save(envSprayTime);
         return  new Result(10000,"添加成功",false);
 
@@ -57,6 +63,24 @@ public class EnvSprayTimeController {
 
     }
 
+    @PostMapping("/updateTime")
+    public Result updateTime(@RequestBody Map<String,String> map){
+
+        String deviceCode = map.get("deviceCode");
+        String openTime = map.get("openTime");
+        String closeTime = map.get("closeTime");
+        UpdateWrapper<EnvSprayTime> wrapper = new UpdateWrapper<>();
+        wrapper.eq("device_code",deviceCode);
+
+       String openMode =  (Integer.parseInt(openTime)) +","+(Integer.parseInt(closeTime));
+        EnvSprayTime envSprayTime = new EnvSprayTime();
+
+        envSprayTime.setOpenMode(openMode);
+        envSprayTimeService.update(envSprayTime,wrapper);
+
+        return  new Result(10000,"添加成功",false);
+
+    }
 
 
     @GetMapping("/delete")

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/LoginController.java

@@ -1,5 +1,6 @@
 package com.huimv.env.manage.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.huimv.env.manage.exception.ExceptionEnum;
 import com.huimv.env.manage.exception.MiException;
 import com.huimv.env.manage.token.*;
@@ -13,6 +14,7 @@ import com.huimv.env.manage.session.AccessToken;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -114,4 +116,19 @@ public class LoginController {
 
 
 
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @GetMapping("/wechatLogin")
+    public String wechatLogin(@RequestParam(name = "js_code")String js_code){
+        String URL  = "https://api.weixin.qq.com/sns/jscode2session";
+        String appid  = "wxc5b3319392e20e72";
+        String secret  = "49d31f71e5300c28634e7753a36fede5";
+        String grant_type  = "authorization_code";
+
+        String forObject = restTemplate.getForObject(URL + "?appid=" + appid + "&secret=" + secret + "&grant_type=" + grant_type + "&js_code=" + js_code, String.class);
+        System.out.println(forObject);
+        return forObject;
+
+    }
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/SysAccountMultilevelController.java

@@ -1,6 +1,7 @@
 package com.huimv.env.manage.controller;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.env.manage.token.*;
 import com.huimv.env.manage.utils.Result;
@@ -11,8 +12,10 @@ import com.huimv.env.manage.service.IAccountGroupService;
 import com.huimv.env.manage.service.ISysAccountMultilevelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -71,7 +74,6 @@ public class SysAccountMultilevelController {
         accountMultilevelService.updateById(sysAccountMultilevel);
 
         return new Result(10000,"修改成功",true);
-
     }
 
     @GetMapping("/remove")
@@ -103,4 +105,6 @@ public class SysAccountMultilevelController {
     }
 
 
+
+
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/entity/SysAccountMultilevel.java

@@ -44,6 +44,13 @@ public class SysAccountMultilevel extends Model {
     private Integer lastFarmId;
 
     private String userName;
+
     private Integer type;
 
+    private String openId;
+
+    private String imgUrl;
+
+    private String wechatName;
+
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/entity/dto/EnvDeviceRegisterDto.java

@@ -24,8 +24,10 @@ public class EnvDeviceRegisterDto {
     private String unitId;
 
     private String farmCode;
+    private Integer openStatus;
 
     private BigDecimal temp;
+    private BigDecimal humi;
 
     private BigDecimal ammonia;
     private Integer runMode;

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/EnvAmmoniaMapper.java

@@ -1,7 +1,14 @@
 package com.huimv.env.manage.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.env.manage.entity.EnvAmmonia;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.env.manage.entity.dto.TimeData;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +20,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnvAmmoniaMapper extends BaseMapper<EnvAmmonia> {
 
+    List<TimeData> listByTime(@Param(Constants.WRAPPER) QueryWrapper<EnvAmmonia> ammoniaWrapper);
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/EnvHumiMapper.java

@@ -1,7 +1,13 @@
 package com.huimv.env.manage.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.env.manage.entity.EnvHumi;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.env.manage.entity.dto.TimeData;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnvHumiMapper extends BaseMapper<EnvHumi> {
 
+    List<TimeData> listByTime(@Param(Constants.WRAPPER)  QueryWrapper<EnvHumi> humiWrapper);
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/EnvTempMapper.java

@@ -1,7 +1,13 @@
 package com.huimv.env.manage.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.env.manage.entity.EnvTemp;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.env.manage.entity.dto.TimeData;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnvTempMapper extends BaseMapper<EnvTemp> {
 
+    List<TimeData> listByTime(@Param(Constants.WRAPPER) QueryWrapper<EnvTemp> tempWrapper);
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/EnvHumiServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.env.manage.entity.EnvAmmonia;
 import com.huimv.env.manage.entity.EnvHumi;
 import com.huimv.env.manage.entity.EnvTemp;
+import com.huimv.env.manage.entity.dto.TimeData;
 import com.huimv.env.manage.mapper.EnvAmmoniaMapper;
 import com.huimv.env.manage.mapper.EnvHumiMapper;
 import com.huimv.env.manage.mapper.EnvTempMapper;
@@ -17,10 +18,7 @@ import com.huimv.env.manage.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -54,16 +52,35 @@ public class EnvHumiServiceImpl extends ServiceImpl<EnvHumiMapper, EnvHumi> impl
         }
         startTime = startTime+"00:00:00";
         endTime = endTime+"23:59:59";
+        Map<String,List> endMap  = new HashMap();
+        QueryWrapper<EnvAmmonia> ammoniaWrapper = new QueryWrapper<EnvAmmonia>().eq("device_code", deviceCode).between("ask_time", startTime, endTime);
+        List<TimeData> ammoinData  =  envAmmoniaMapper.listByTime(ammoniaWrapper);
 
 
-        List<EnvAmmonia> envAmmonias = envAmmoniaMapper.selectList(new QueryWrapper<EnvAmmonia>().eq("device_code", deviceCode).between("ask_time", startTime, endTime));
-        List<EnvHumi> envHumis = envHumiMapper.selectList(new QueryWrapper<EnvHumi>().eq("device_code", deviceCode).between("ask_time", startTime, endTime));
-        List<EnvTemp> envTemps = envTempMapper.selectList(new QueryWrapper<EnvTemp>().eq("device_code", deviceCode).between("ask_time", startTime, endTime));
+        QueryWrapper<EnvHumi> humiWrapper = new QueryWrapper<EnvHumi>().eq("device_code", deviceCode).between("ask_time", startTime, endTime);
+        List<TimeData> humiData  =  envHumiMapper.listByTime(humiWrapper);
 
-        Map<String,List> resultMap = new HashMap();
-        resultMap.put("envAmmonias",envAmmonias);
-        resultMap.put("envHumis",envHumis);
-        resultMap.put("envTemps",envTemps);
-        return new Result(ResultCode.SUCCESS,resultMap);
+
+        QueryWrapper<EnvTemp> tempWrapper = new QueryWrapper<EnvTemp>().eq("device_code", deviceCode).between("ask_time", startTime, endTime);
+        List<TimeData> tempData  =  envTempMapper.listByTime(tempWrapper);
+
+        int size = Math.min(tempData.size(), humiData.size());
+        List<Map> list  = new ArrayList<>();
+        for (int i = 0; i <size ; i++){
+            Map map = new HashMap();
+            TimeData humiData1 = humiData.get(i);
+            TimeData tempData1 = tempData.get(i);
+            map.put("hourTime",humiData1.getHourTime());
+            map.put("humi",humiData1.getDataValue());
+            map.put("temp",tempData1.getDataValue());
+            list.add(map);
+        }
+
+
+
+        endMap.put("ammoin",ammoinData);
+        endMap.put("humiAndtemp",list);
+//        endMap.put("",tempData);
+        return new Result(ResultCode.SUCCESS,endMap);
     }
 }

huimv-env-platform/huimv-env-manage/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
     name: huimv-eartag2-manage
 
   datasource:
-    url: jdbc:mysql://192.168.1.7:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://115.238.57.190:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

huimv-env-platform/huimv-env-manage/src/main/resources/application.properties

@@ -1,10 +1,10 @@
-spring.profiles.active=dev
-#spring.profiles.active=prod2
+#spring.profiles.active=dev
+spring.profiles.active=prod
 
 # mysql:/cache:
 device.online.access_mode=mysql
 
-# ��ӻ������豸����ʱ��
+# \uFFFD\uFFFD\u04FB\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u8C78\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\uFFFD
 cache.chipIdExpire=48
 
 #
@@ -12,16 +12,16 @@ service.farmAllStatus.url=/deviceController/updateFarmAllStatus
 service.farmAllStatus.host=192.168.1.68
 service.farmAllStatus.ip=8092
 
-###################################################����undertowȡ��tomcat
-# �Ƿ�� undertow ��־��Ĭ��Ϊ false
+###################################################\uFFFD\uFFFD\uFFFD\uFFFDundertow\u0221\uFFFD\uFFFDtomcat
+# \uFFFD\u01F7\uFFFD\uFFFD undertow \uFFFD\uFFFD\u05BE\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA false
 server.undertow.accesslog.enabled=false
-# ���÷�����־����Ŀ¼
+# \uFFFD\uFFFD\uFFFD\u00F7\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\u013F\u00BC
 server.undertow.accesslog.dir=logs
-# ָ���������̵߳� I/0 �߳�����Ĭ��Ϊ 2 ���� CPU �ĸ���
+# \u05B8\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\u0335\uFFFD I/0 \uFFFD\u07F3\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA 2 \uFFFD\uFFFD\uFFFD\uFFFD CPU \uFFFD\u0138\uFFFD\uFFFD\uFFFD
 server.undertow.io-threads=
-# ָ���������̸߳�����Ĭ��Ϊ I/O �̸߳����� 8 ��
+# \u05B8\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u07F3\u0338\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u012C\uFFFD\uFFFD\u03AA I/O \uFFFD\u07F3\u0338\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD 8 \uFFFD\uFFFD
 server.undertow.worker-threads=
-# ���� HTTP POST ���ݵ���󳤶ȣ�Ĭ�ϲ�������
+# \uFFFD\uFFFD\uFFFD\uFFFD HTTP POST \uFFFD\uFFFD\uFFFD\u0775\uFFFD\uFFFD\uFFFD\uDB8E\uDD36\u0223\uFFFD\u012C\uFFFD\u03F2\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 server.undertow.max-http-post-size=0
 
 

huimv-env-platform/huimv-env-manage/src/main/resources/com/huimv/env/manage/mapper/EnvAmmoniaMapper.xml

@@ -7,7 +7,7 @@
         <id column="id" property="id" />
         <result column="device_code" property="deviceCode" />
         <result column="sensor_sn" property="sensorSn" />
-        <result column="temp" property="temp" />
+        <result column="ammonia" property="ammonia" />
         <result column="ask_time" property="askTime" />
         <result column="add_time" property="addTime" />
         <result column="add_date" property="addDate" />
@@ -15,5 +15,12 @@
         <result column="unit_id" property="unitId" />
         <result column="farm_code" property="farmCode" />
     </resultMap>
+    <select id="listByTime" resultType="com.huimv.env.manage.entity.dto.TimeData">
+        SELECT CAST(CONCAT(
+        SUBSTR(DATE_ADD(DATE_SUB(ask_time, INTERVAL MINUTE(ask_time) MINUTE), INTERVAL FLOOR(MINUTE(ask_time) / 30) * 30 MINUTE),
+               1, 17), '00') AS DATETIME) hourTime,ammonia  dataValue
+FROM `env_ammonia`
+  ${ew.customSqlSegment}   GROUP BY hourTime
+    </select>
 
 </mapper>

huimv-env-platform/huimv-env-manage/src/main/resources/com/huimv/env/manage/mapper/EnvDeviceRegisterMapper.xml

@@ -15,18 +15,22 @@
     </resultMap>
     <select id="registerList" resultType="com.huimv.env.manage.entity.dto.EnvDeviceRegisterDto">
 
-        SELECT edr.* ,et.temp ,ea.ammonia ,esc.run_mode ,esc.device_status ,bp.pigpen_name  FROM `env_device_register`  edr
+        SELECT edr.* ,et.temp ,ea.ammonia ,eh.humi,esc.run_mode ,esc.device_status ,esc.open_status,bp.pigpen_name  FROM `env_device_register`  edr
 
        LEFT JOIN (
-        SELECT en1.temp temp  ,en1.`device_code` device_code FROM env_temp  en1 RIGHT JOIN (
-        SELECT MAX( id ) id  FROM `env_temp` GROUP BY device_code
+        SELECT en1.temp temp  , en1.`device_code` device_code FROM env_temp  en1 RIGHT JOIN (
+        SELECT MAX( id ) id  FROM `env_temp`/* WHERE DATEDIFF(ask_time,NOW())=0 */GROUP BY device_code
         )en2 ON en1.id = en2.id
         )  et ON edr.device_code  = et.device_code
-
+    LEFT JOIN (
+            SELECT eh1.humi humi  ,eh1.`device_code` device_code FROM env_humi  eh1 RIGHT JOIN (
+            SELECT MAX( id ) id  FROM `env_humi` /* WHERE DATEDIFF(ask_time,NOW())=0*/ GROUP BY device_code
+            )eh2 ON eh1.id = eh2.id
+            )  eh ON edr.device_code  = eh.device_code
 
         LEFT JOIN (
         SELECT ea1.ammonia ammonia  ,ea1.`device_code` device_code FROM env_ammonia  ea1 RIGHT JOIN (
-        SELECT MAX( id ) id  FROM `env_ammonia` GROUP BY device_code
+        SELECT MAX( id ) id  FROM `env_ammonia` /* WHERE DATEDIFF(ask_time,NOW())=0*/ GROUP BY device_code
         )ea2 ON ea1.id = ea2.id
         )  ea ON edr.device_code  = ea.device_code
 

huimv-env-platform/huimv-env-manage/src/main/resources/com/huimv/env/manage/mapper/EnvHumiMapper.xml

@@ -7,7 +7,7 @@
         <id column="id" property="id" />
         <result column="device_code" property="deviceCode" />
         <result column="sensor_sn" property="sensorSn" />
-        <result column="temp" property="temp" />
+        <result column="humi" property="humi" />
         <result column="ask_time" property="askTime" />
         <result column="add_time" property="addTime" />
         <result column="add_date" property="addDate" />
@@ -15,5 +15,12 @@
         <result column="unit_id" property="unitId" />
         <result column="farm_code" property="farmCode" />
     </resultMap>
+    <select id="listByTime" resultType="com.huimv.env.manage.entity.dto.TimeData">
+           SELECT CAST(CONCAT(
+        SUBSTR(DATE_ADD(DATE_SUB(ask_time, INTERVAL MINUTE(ask_time) MINUTE), INTERVAL FLOOR(MINUTE(ask_time) / 30) * 30 MINUTE),
+               1, 17), '00') AS DATETIME) hourTime,humi  dataValue
+FROM `env_humi`
+  ${ew.customSqlSegment}   GROUP BY hourTime
+    </select>
 
 </mapper>

huimv-env-platform/huimv-env-manage/src/main/resources/com/huimv/env/manage/mapper/EnvSprayConfigMapper.xml

@@ -8,7 +8,7 @@
         <result column="device_code" property="deviceCode" />
         <result column="run_mode" property="runMode" />
         <result column="device_status" property="deviceStatus" />
-        <result column="interval" property="interval" />
+        <result column="time_interval" property="timeInterval" />
         <result column="set_time" property="setTime" />
         <result column="farm_code" property="farmCode" />
     </resultMap>

huimv-env-platform/huimv-env-manage/src/main/resources/com/huimv/env/manage/mapper/EnvTempMapper.xml

@@ -15,5 +15,13 @@
         <result column="unit_id" property="unitId" />
         <result column="farm_code" property="farmCode" />
     </resultMap>
+    <select id="listByTime" resultType="com.huimv.env.manage.entity.dto.TimeData">
+
+           SELECT CAST(CONCAT(
+        SUBSTR(DATE_ADD(DATE_SUB(ask_time, INTERVAL MINUTE(ask_time) MINUTE), INTERVAL FLOOR(MINUTE(ask_time) / 30) * 30 MINUTE),
+               1, 17), '00') AS DATETIME) hourTime,temp  dataValue
+    FROM `env_temp`
+  ${ew.customSqlSegment}   GROUP BY hourTime
+    </select>
 
 </mapper>