Merge remote-tracking branch 'origin/master'

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/LampTempService.java

@@ -1,19 +0,0 @@
-package com.huimv.env.common.service;
-
-import com.huimv.env.common.entity.LampTemp;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.math.BigDecimal;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author zn
- * @since 2022-10-27
- */
-public interface LampTempService extends IService<LampTemp> {
-    //保温灯温度
-    BigDecimal getLastLampTemp(String farmCode);
-}

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/EnvWaterDayServiceImpl.java

@@ -173,7 +173,7 @@ public class EnvWaterDayServiceImpl extends ServiceImpl<EnvWaterDayMapper, EnvWa
         if(lastEnvWaterDay == null){
             return new BigDecimal(0);
         }else{
-            return (newWaterBd.subtract(lastEnvWaterDay.getDayWater())).divide(lastEnvWaterDay.getDayWater()).multiply(new BigDecimal(100));
+            return (newWaterBd.subtract(lastEnvWaterDay.getDayWater())).divide(lastEnvWaterDay.getDayWater(),BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
         }
     }
 }

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

@@ -51,7 +51,7 @@ public class LampInputHandleServiceImpl implements LampInputHandleService {
         System.out.println("上传温度");
         String[] dataArray = askText.split("\\+");
         String tempText = dataArray[4];
-        Double temp = MathUtil.ln(Integer.parseInt(tempText));
+        Double temp = Double.parseDouble(tempText)/10.0;
         System.out.println(temp);
         String eartemp = new BigDecimal(temp).setScale(1, BigDecimal.ROUND_HALF_UP).toString();
         DateUtil dateUtil = new DateUtil();

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

@@ -13,14 +13,14 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  */
 @Configuration
 public class InterceptorConfig implements WebMvcConfigurer {
-//    @Bean
-//    public JWTInterceptor jwtInterceptor(){
-//        return new JWTInterceptor();
-//    }
+    @Bean
+    public JWTInterceptor jwtInterceptor(){
+        return new JWTInterceptor();
+    }
 
-//    @Override
-//    public void addInterceptors(InterceptorRegistry registry) {
-//        registry.addInterceptor(jwtInterceptor()).
-//                excludePathPatterns("/my/*");
-//    }
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(jwtInterceptor()).
+                excludePathPatterns("/my/*");
+    }
 }

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

@@ -2,6 +2,7 @@ package com.huimv.env.manage.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.env.manage.entity.EnvDeviceRegister;
 import com.huimv.env.manage.saas.dao.entity.EnvDeviceEquipment;
 import com.huimv.env.manage.saas.service.IEnvDeviceEquipmentService;
 import com.huimv.env.manage.service.IEnvDeviceRegisterService;

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

@@ -3,11 +3,7 @@ package com.huimv.env.manage.controller;
 
 import com.huimv.common.utils.Result;
 import com.huimv.env.manage.service.EnvPhService;
-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 org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.Map;
@@ -22,6 +18,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/envPh")
+@CrossOrigin
 public class EnvPhController {
     @Resource
     public EnvPhService envPhService;
@@ -40,4 +37,9 @@ public class EnvPhController {
     public Result getPh(@RequestBody Map<String,String> paramsMap){
         return envPhService.getPh(paramsMap);
     }
+    @PostMapping("/getPhList")
+    public Result getPhList(@RequestBody Map<String,String> paramsMap){
+        return envPhService.getPhList(paramsMap);
+    }
+
 }

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

@@ -51,6 +51,20 @@ public class EnvDeviceEquipmentController {
 
     }
 
+
+    @PostMapping("/remove")
+    public Result remove(@RequestBody Map<String, String> map){
+        try {
+            String id = map.get("id");
+            envDeviceEquipmentService.removeById(id);
+            return new Result(10000,"删除成功",true);
+        }catch (Exception e){
+            return new Result(10001,"删除失败",false);
+        }
+
+
+    }
+
     /**
      * @Method      : getEquipment
      * @Description :

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

@@ -4,11 +4,8 @@ package com.huimv.env.manage.saas.controller;
 import com.huimv.env.manage.saas.service.ILampConfigAllService;
 import com.huimv.env.manage.utils.Result;
 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 org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
@@ -23,6 +20,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/lampConfigAll")
+@CrossOrigin
 public class LampConfigAllController {
     @Autowired
     private ILampConfigAllService lampConfigAllService;

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

@@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huimv.env.common.service.LampTempService;
+import com.huimv.env.common.service.ILampTempService;
 import com.huimv.env.manage.mapper.LampConfigAllMapper;
 import com.huimv.env.manage.mapper.LampConfigMapper;
 import com.huimv.env.manage.saas.dao.entity.LampConfig;
@@ -38,7 +38,7 @@ public class LampConfigAllServiceImpl extends ServiceImpl<LampConfigAllMapper, L
     @Autowired
     private LampConfigMapper lampConfigMapper;
     @Autowired
-    private LampTempService lampTempService;
+    private ILampTempService lampTempService;
 
     @Override
     public Result listByFarmCode(Map<String, String> map, HttpServletRequest request) {

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

@@ -17,4 +17,6 @@ import java.util.Map;
 public interface EnvPhService extends IService<EnvPh> {
 
     Result getPh(Map<String, String> paramsMap);
+
+    Result getPhList(Map<String, String> paramsMap);
 }

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

@@ -1,5 +1,7 @@
 package com.huimv.env.manage.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
@@ -8,9 +10,13 @@ import com.huimv.env.manage.mapper.EnvPhMapper;
 import com.huimv.env.manage.saas.dao.entity.EnvPh;
 import com.huimv.env.manage.service.EnvPhService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.env.manage.utils.ResultUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -29,7 +35,9 @@ public class EnvPhServiceImpl extends ServiceImpl<EnvPhMapper, EnvPh> implements
     @Override
     public Result getPh(Map<String, String> paramsMap) {
         String farmCode = paramsMap.get("farmCode");
+        String unitId = paramsMap.get("unitId");
         QueryWrapper<EnvPh> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
         queryWrapper.eq("farm_code",farmCode);
         queryWrapper.orderByDesc("add_time");
         queryWrapper.last("LIMIT 1");
@@ -40,4 +48,19 @@ public class EnvPhServiceImpl extends ServiceImpl<EnvPhMapper, EnvPh> implements
             return new Result(ResultCode.SUCCESS, envPh);
         }
     }
+
+    @Override
+    public Result getPhList(Map<String, String> paramsMap) {
+        String unitId = paramsMap.get("unitId");
+        QueryWrapper<EnvPh> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
+        queryWrapper.ge("add_time", DateUtil.beginOfDay(new Date()));
+        queryWrapper.orderByDesc("add_time");
+        List<EnvPh> list = this.list(queryWrapper);
+        if (ObjectUtil.isNotEmpty(list)){
+            return new Result(ResultCode.SUCCESS,list);
+        }else {
+            return new Result(10013,"没有数据",false);
+        }
+    }
 }

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

@@ -39,24 +39,25 @@ public class EnvTempServiceImpl extends ServiceImpl<EnvTempMapper, EnvTemp> impl
     public Result getDayTempAndHumi(Map<String, String> paramMap) throws ParseException {
         String farmCode = paramMap.get("farmCode");
         String hours = paramMap.get("hours");
+        String unitId = paramMap.get("unitId");
         //获取当前最新温度
-        EnvTemp lastEnvTemp = _getLastTemp2(farmCode);
+        EnvTemp lastEnvTemp = _getLastTemp2(farmCode,unitId);
         BigDecimal lastTempBd = new BigDecimal(0);
         if(lastEnvTemp != null){
             lastTempBd = lastEnvTemp.getTemp();
         }
 
         //获取最后24小时的温度数据曲线
-        List<Map<String,Object>> envTempList = _getLast24HourTemp(farmCode,Integer.parseInt(hours),lastEnvTemp);
+        List<Map<String,Object>> envTempList = _getLast24HourTemp(farmCode,Integer.parseInt(hours),lastEnvTemp,unitId);
 
         //获取当前最新湿度
-        EnvHumi lastEnvHumi = _getLastHumi2(farmCode);
+        EnvHumi lastEnvHumi = _getLastHumi2(farmCode,unitId);
         BigDecimal lastHumiBd =  new BigDecimal(0);
         if(lastEnvHumi != null){
             lastHumiBd = lastEnvHumi.getHumi();
         }
         //获取最后24小时的湿度数据曲线
-        List<Map<String,Object>> envHumiList = _getLast24HourHumi(farmCode,Integer.parseInt(hours),lastEnvHumi);
+        List<Map<String,Object>> envHumiList = _getLast24HourHumi(farmCode,Integer.parseInt(hours),lastEnvHumi,unitId);
 
         JSONObject resultJo = new JSONObject();
         resultJo.put("lastTemp",lastTempBd.toString());
@@ -67,7 +68,7 @@ public class EnvTempServiceImpl extends ServiceImpl<EnvTempMapper, EnvTemp> impl
     }
 
     //获取最后24小时的湿度数据曲线
-    private List<Map<String,Object>> _getLast24HourHumi(String farmCode, Integer hours, EnvHumi lastEnvHumi) throws ParseException {
+    private List<Map<String,Object>> _getLast24HourHumi(String farmCode, Integer hours, EnvHumi lastEnvHumi,String unitId) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         //获取最后一条记录的小时
         //计算之前24小时时间，
@@ -76,6 +77,7 @@ public class EnvTempServiceImpl extends ServiceImpl<EnvTempMapper, EnvTemp> impl
         //读取24小时所有记录
         QueryWrapper<EnvHumi> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_code",farmCode);
+        queryWrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
         queryWrapper.ge("add_time",dateUtil.parseDateTime(startTimeText)).le("add_time",dateUtil.parseDateTime(endTimeText));
         queryWrapper.orderByAsc("add_time");
         List<EnvHumi> envHumiList = envHumiMapper.selectList(queryWrapper);
@@ -129,7 +131,7 @@ public class EnvTempServiceImpl extends ServiceImpl<EnvTempMapper, EnvTemp> impl
     }
 
     //获取最后24小时的温度数据曲线
-    private List<Map<String,Object>> _getLast24HourTemp(String farmCode, int hours, EnvTemp lastEnvTemp) throws ParseException {
+    private List<Map<String,Object>> _getLast24HourTemp(String farmCode, int hours, EnvTemp lastEnvTemp,String unitId) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         //获取最后一条记录的小时
         //计算之前24小时时间，
@@ -139,6 +141,7 @@ public class EnvTempServiceImpl extends ServiceImpl<EnvTempMapper, EnvTemp> impl
         Date endTime = dateUtil.parseDateTime(endTimeText);
         //读取24小时所有记录
         QueryWrapper<EnvTemp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
         queryWrapper.eq("farm_code",farmCode);
         queryWrapper.ge("add_time",startTime).le("add_time",endTime);
         queryWrapper.orderByAsc("add_time");
@@ -275,8 +278,9 @@ public class EnvTempServiceImpl extends ServiceImpl<EnvTempMapper, EnvTemp> impl
     }
 
     //获取当前最新湿度
-    private EnvHumi _getLastHumi2(String farmCode) {
+    private EnvHumi _getLastHumi2(String farmCode,String unitId) {
         QueryWrapper<EnvHumi> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
         queryWrapper.eq("farm_code",farmCode);
         queryWrapper.orderByDesc("add_time");
         queryWrapper.last("LIMIT 1");
@@ -298,8 +302,9 @@ public class EnvTempServiceImpl extends ServiceImpl<EnvTempMapper, EnvTemp> impl
         }
     }
 
-    private EnvTemp _getLastTemp2(String farmCode) {
+    private EnvTemp _getLastTemp2(String farmCode,String unitId) {
         QueryWrapper<EnvTemp> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(StringUtils.isNotBlank(unitId),"unit_id",unitId);
         queryWrapper.eq("farm_code",farmCode);
         queryWrapper.orderByDesc("add_time");
         queryWrapper.last("LIMIT 1");

huimv-env-platform/pom.xml

@@ -25,7 +25,7 @@
     <properties>
         <java.version>1.8</java.version>
         <maven.compile>1.8</maven.compile>
-        <druid.version>1.1.14</druid.version>
+        <druid.version>1.2.4</druid.version>
         <mysql.version>6.0.6</mysql.version>
         <junit.version>4.13.2</junit.version>
         <hutool.version>5.8.1</hutool.version>