保温灯，保温板单独配置

huimv-env-platform/huimv-env-lamp/src/main/java/com/huimv/env/lamp/service/impl/LampInputHandleServiceImpl.java

@@ -59,6 +59,7 @@ public class LampInputHandleServiceImpl implements LampInputHandleService {
         String eartemp = new BigDecimal(temp).setScale(1, BigDecimal.ROUND_HALF_UP).toString();
         DateUtil dateUtil = new DateUtil();
         lampTempService.saveLampTemp(idCode,eartemp,dateUtil.getTodayDatetime());
+        System.out.println("上传温度请求结束");
 
     }
 

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/config/InterceptorConfig.java

@@ -11,6 +11,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  * @Date 2021/4/19 20:41
  * @Version V1.0
  */
+
 @Configuration
 public class InterceptorConfig implements WebMvcConfigurer {
     @Bean

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/config/JWTInterceptor.java

@@ -17,8 +17,9 @@ import java.util.Map;
  * <p>
  *  jwt拦截器
  * </p>
- * @since 2021/4/19
- */
+ * @since 2021/4/19*/
+
+
 
 public class JWTInterceptor implements HandlerInterceptor {
 

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

@@ -80,5 +80,11 @@ public class EnvDeviceRegisterController {
 
     }
 
+    @PostMapping("/screenDeviceCofig")
+    public Result screenDeviceCofig(@RequestBody Map<String, String> map, HttpServletRequest request){
+        return deviceRegisterService.screenDeviceCofig(map,request);
+
+    }
+
 
 }

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

@@ -31,23 +31,17 @@ public class EnvSprayConfigController {
     @Autowired
     private IEnvSprayConfigService envSprayConfigService;
 
-
     @PostMapping("/dataList")
     public Result registerList(@RequestBody Map<String,String> paramMap){
         return  envSprayConfigService.dataList(paramMap);
-
     }
 
     @PostMapping("/update")
     public Result update(@RequestBody EnvSprayConfig envSprayConfig) {
-
         String deviceCode = envSprayConfig.getDeviceCode();
         EnvSprayConfig envSprayConfig1 = envSprayConfigService.getOne(new QueryWrapper<EnvSprayConfig>().eq("device_code", deviceCode));
-
         envSprayConfig.setId(envSprayConfig1.getId());
         envSprayConfigService.updateById(envSprayConfig);
         return new Result(10000,"修改成功",true);
-
-
     }
 }

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

@@ -37,4 +37,8 @@ public class EnvTempController {
     public Result getDayTempAndHumi(@RequestBody Map<String,String> paramMap) throws ParseException {
         return  envTempService.getDayTempAndHumi(paramMap);
     }
+    @PostMapping("/getDayTempAndHumiMinute")
+    public Result getDayTempAndHumiMinute(@RequestBody Map<String,String> paramMap) throws ParseException {
+        return  envTempService.getDayTempAndHumiMinute(paramMap);
+    }
 }

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

@@ -98,7 +98,8 @@ public class LoginController {
             accessToken.setFarmId(accountEntity.getLastFarmId()+"");
             String token = TokenSign.sign(accountName,id,accountEntity.getFarmIds());
             accessToken.setToken(token);
-            accessToken.setFarmName("慧牧测试牧场");
+
+            accessToken.setFarmName("青山牧场");
 //            accessToken.setOpenId(accountEntity.getOpenId());
 //            accessToken.setImgUrl(accountEntity.getImgUrl());
 //            accessToken.setWechatName(accountEntity.getWechatName());

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

@@ -37,7 +37,8 @@ public class EnvHumi implements Serializable {
 
     private BigDecimal humi;
 
-    private String askTime;
+    @JsonFormat(pattern = "MM-dd HH:mm",timezone = "GMT+8")
+    private Date askTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date addTime;

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

@@ -37,7 +37,8 @@ public class EnvTemp implements Serializable {
 
     private BigDecimal temp;
 
-    private String askTime;
+    @JsonFormat(pattern = "MM-dd HH:mm",timezone = "GMT+8")
+    private Date askTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date addTime;

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

@@ -64,7 +64,7 @@ public class BaseDeviceCofigServiceImpl extends ServiceImpl<BaseDeviceCofigMappe
             return new Result(10001,"未绑定设备",true);
         }
         String deviceCode = deviceRegister.getDeviceCode();
-        Date beginOfDay = DateUtil.endOfDay(new Date());
+        Date beginOfDay = DateUtil.beginOfDay(new Date());
         AllDataDto dataDto = envDeviceRegisterMapper.selectAllData(deviceCode,beginOfDay);
         return new Result(ResultCode.SUCCESS,dataDto);
 

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

@@ -30,4 +30,6 @@ public interface IEnvDeviceRegisterService extends IService<EnvDeviceRegister> {
     Result bindingBaseDeviceCofig(Map<String, String> map, HttpServletRequest request);
 
     Result updateAllByUnitId(Map<String, Integer> paramMap);
+
+    Result screenDeviceCofig(Map<String, String> map, HttpServletRequest request);
 }

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

@@ -20,4 +20,6 @@ public interface IEnvTempService extends IService<EnvTemp> {
     Result getTempAndHumi(Map<String, String> paramMap);
 
     Result getDayTempAndHumi(Map<String, String> paramMap) throws ParseException;
+
+    Result getDayTempAndHumiMinute(Map<String, String> paramMap);
 }

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

@@ -10,9 +10,11 @@ import com.huimv.env.manage.entity.EnvDeviceRegister;
 import com.huimv.env.manage.entity.dto.EnvDeviceRegisterDto;
 import com.huimv.env.manage.mapper.BasePigpenMapper;
 import com.huimv.env.manage.mapper.EnvDeviceRegisterMapper;
+import com.huimv.env.manage.mapper.LampConfigMapper;
 import com.huimv.env.manage.saas.dao.entity.BasePigpen;
 import com.huimv.env.manage.mapper.EnvDeviceEquipmentMapper;
 import com.huimv.env.manage.saas.dao.entity.EnvDeviceEquipment;
+import com.huimv.env.manage.saas.dao.entity.LampConfig;
 import com.huimv.env.manage.service.IEnvDeviceRegisterService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.env.manage.utils.Result;
@@ -44,6 +46,9 @@ public class EnvDeviceRegisterServiceImpl extends ServiceImpl<EnvDeviceRegisterM
     private EnvDeviceEquipmentMapper envDeviceEquipmentMapper;
 
     @Autowired
+    private LampConfigMapper lampConfigMapper;
+
+    @Autowired
     private BasePigpenMapper basePigpenMapper;
     @Override
     public Result registerList(Map<String, String> paramMap) {
@@ -205,4 +210,22 @@ public class EnvDeviceRegisterServiceImpl extends ServiceImpl<EnvDeviceRegisterM
         envDeviceEquipmentMapper.update(envDeviceEquipment,new QueryWrapper<EnvDeviceEquipment>().eq("unit_id",unitId));
         return new Result(10000,"修改成功",true);
     }
+
+
+    @Override
+    public Result screenDeviceCofig(Map<String, String> map, HttpServletRequest request) {
+        String unitId = map.get("unitId");
+        List list = new ArrayList();
+        boolean exists1 = lampConfigMapper.exists(new QueryWrapper<LampConfig>().eq("unig_id", unitId).eq("upload_start", 1));
+        boolean exists2 = lampConfigMapper.exists(new QueryWrapper<LampConfig>().eq("unig_id", unitId).eq("board_gear", 0));
+        boolean exists3 = envDeviceEquipmentMapper.exists(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id", unitId).eq("upload_start", 1).eq("equipment_name", "照明"));
+        boolean exists4 = envDeviceEquipmentMapper.exists(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id", unitId).eq("upload_start", 1).eq("equipment_name", "风机"));
+        boolean exists5 = envDeviceEquipmentMapper.exists(new QueryWrapper<EnvDeviceEquipment>().eq("unit_id", unitId).eq("upload_start", 1).eq("equipment_name", "刮粪板"));
+        list.add(exists1);
+        list.add(!exists2);
+        list.add(exists3);
+        list.add(exists4);
+        list.add(exists5);
+        return new Result(ResultCode.SUCCESS,list);
+    }
 }

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

@@ -61,7 +61,7 @@ public class EnvPhServiceImpl extends ServiceImpl<EnvPhMapper, EnvPh> implements
         if (ObjectUtil.isNotEmpty(list)){
             return new Result(ResultCode.SUCCESS,list);
         }else {
-            return new Result(10013,"没有数据",false);
+            return new Result(ResultCode.FAIL,null);
         }
     }
 }

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

@@ -1,5 +1,6 @@
 package com.huimv.env.manage.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -79,6 +80,31 @@ public class EnvTempServiceImpl extends ServiceImpl<EnvTempMapper, EnvTemp> impl
         return new Result(ResultCode.SUCCESS, resultJo);
     }
 
+    @Override
+    public Result getDayTempAndHumiMinute(Map<String, String> paramMap) {
+        String unitId = paramMap.get("unitId");
+        DateTime dateTime = cn.hutool.core.date.DateUtil.beginOfDay(new Date());
+
+        List<EnvTemp> envTemps = envTempMapper.selectList(new QueryWrapper<EnvTemp>().eq("unit_id", unitId).ge("ask_time", dateTime).orderByDesc("ask_time"));
+        List<EnvHumi> envHumis = envHumiMapper.selectList(new QueryWrapper<EnvHumi>().eq("unit_id", unitId).ge("ask_time", dateTime).orderByDesc("ask_time"));
+        if (ObjectUtil.isEmpty(envTemps)){
+            envTemps =   envTempMapper.selectList(new QueryWrapper<EnvTemp>().eq("unit_id", unitId).orderByDesc("ask_time").last("limit 50"));
+        }
+        if (ObjectUtil.isEmpty(envHumis)){
+            envHumis =  envHumiMapper.selectList(new QueryWrapper<EnvHumi>().eq("unit_id", unitId).orderByDesc("ask_time").last("limit 50"));
+        }
+        if (ObjectUtil.isEmpty(envTemps)){
+            envTemps =  new ArrayList<>();
+        }
+        if (ObjectUtil.isEmpty(envHumis)){
+            envHumis  =  new ArrayList<>();
+        }
+        HashMap<String, List> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("envTemps",envTemps);
+        objectObjectHashMap.put("envHumis",envHumis);
+        return new Result(ResultCode.SUCCESS,objectObjectHashMap);
+    }
+
     //合并温度和湿度
     private List<Map<String, Object>> _mergeTempAndHumi(List<Map<String, Object>> envTempList, List<Map<String, Object>> envHumiList) {
         for (int a = 0; a < envTempList.size(); a++) {

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

@@ -43,8 +43,8 @@ LEFT JOIN    base_pigpen bp ON bp.id = edr.pigpen_id
        SELECT  ifnull((SELECT temp.temp FROM `env_temp`  temp WHERE device_code = #{deviceCode} ORDER BY id DESC LIMIT 1), "0.0")temp,
 	ifnull( (SELECT humi.humi FROM  `env_humi` humi WHERE device_code = #{deviceCode}  ORDER BY id DESC LIMIT 1) , "0.0")  envHumi ,
 	 ifnull((SELECT ph.ph FROM  `env_ph` ph WHERE device_code = #{deviceCode}  ORDER BY id DESC LIMIT 1) , "0.0")  envPh ,
-	ifnull((SELECT SUM(ewm.water_meter) FROM  `env_water_meter` ewm  WHERE device_code = #{deviceCode}   AND add_time >=  #{beginOfDay} ) , "0.0")  envElectricityMeter ,
-	 ifnull((SELECT SUM(eem.electricity_meter) FROM   `env_electricity_meter`  eem  WHERE device_code = #{deviceCode}   AND add_time  >=  #{beginOfDay}  ), "0.0")  envWaterMeter
+	ifnull((SELECT SUM(ewm.water_meter) FROM  `env_water_meter` ewm  WHERE device_code = #{deviceCode}   AND add_time >=  #{beginOfDay} ) , "0.0") envWaterMeter  ,
+	 ifnull((SELECT SUM(eem.electricity_meter) FROM   `env_electricity_meter`  eem  WHERE device_code = #{deviceCode}   AND add_time  >=  #{beginOfDay}  ), "0.0")  envElectricityMeter
 
     </select>