11

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/dao/entity/LampTempEntity.java

@@ -38,4 +38,7 @@ public class LampTempEntity implements Serializable {
     @Column(name = "add_time")
     private Timestamp addTime;
 
+    @Column(name = "farm_cdoe")
+    private String farmCode;
+
 }

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

@@ -1,14 +1,18 @@
 package com.huimv.env.common.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.huimv.env.common.dao.entity.LampConfigEntity;
 import com.huimv.env.common.dao.entity.LampTempEntity;
+import com.huimv.env.common.dao.repo.LampConfigEntityRepo;
 import com.huimv.env.common.dao.repo.LampTempEntityRepo;
 import com.huimv.env.common.service.ILampTempService;
+import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import javax.xml.ws.ServiceMode;
 import java.sql.Timestamp;
 import java.util.Date;
+import java.util.Optional;
 
 /**
  * @Project : huimv-env-platform
@@ -22,12 +26,23 @@ import java.util.Date;
 public class LampTempServiceImpl implements ILampTempService {
     @Resource
     private LampTempEntityRepo lampTempEntityRepo;
-
+    @Resource
+    private LampConfigEntityRepo lampConfigEntityRepo;
     @Override
     public int saveLampTemp(String deviceId, String temp, Date addTime) {
+        LampConfigEntity LampConfigEntity = new LampConfigEntity();
+        LampConfigEntity.setDeviceId(deviceId);
+      Example<LampConfigEntity> example = Example.of(LampConfigEntity);
+        LampConfigEntity one = lampConfigEntityRepo.findOne(example).get();
+        if (ObjectUtil.isEmpty(one)){
+            System.out.println("保温灯不存在");
+            return -1;
+        }
+
         LampTempEntity lampTempEntity = new LampTempEntity();
         lampTempEntity.setDeviceId(deviceId);
         lampTempEntity.setTemp(temp);
+        lampTempEntity.setFarmCode(one.getFarmCode());
         lampTempEntity.setAddTime(new Timestamp(addTime.getTime()));
         lampTempEntityRepo.saveAndFlush(lampTempEntity);
         return 0;

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

@@ -27,7 +27,6 @@ com\huimv\env\common\dao\repo\BasePigpenEntityRepo.class
 com\huimv\env\common\dao\repo\EnvWaterGegeEntityRepo.class
 com\huimv\env\common\dao\repo\EnvPushMessageEntityRepo.class
 com\huimv\env\common\utils\MathUtil.class
-com\huimv\env\common\service\impl\LampConfigServiceImpl.class
 com\huimv\env\common\dao\entity\EnvTempEntity.class
 com\huimv\env\common\dao\entity\BasePigpenEntity.class
 com\huimv\env\common\dao\repo\EnvAmmoniaEntityRepo.class

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

@@ -47,10 +47,12 @@ public class LampInputHandleServiceImpl implements LampInputHandleService {
 
     @Override
     public void getLampTemp(String askText, String idCode, ChannelHandlerContext ctx) throws ParseException {
+
         System.out.println("上传温度");
         String[] dataArray = askText.split("\\+");
         String tempText = dataArray[4];
         Double temp = MathUtil.ln(Integer.parseInt(tempText));
+        System.out.println(temp);
         String eartemp = new BigDecimal(temp).setScale(1, BigDecimal.ROUND_HALF_UP).toString();
         DateUtil dateUtil = new DateUtil();
         lampTempService.saveLampTemp(idCode,eartemp,dateUtil.getTodayDatetime());

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

@@ -48,7 +48,8 @@ public class EnvDeviceRegisterController {
         String ids = paramMap.get("ids");
         String[] split = ids.split(",");
         for (String id : split) {
-            deviceEquipmentService.remove(new QueryWrapper<EnvDeviceEquipment>().eq("device_code", id));
+            EnvDeviceRegister byId = deviceRegisterService.getById(id);
+            deviceEquipmentService.remove(new QueryWrapper<EnvDeviceEquipment>().eq("device_code", byId.getDeviceCode()));
             deviceRegisterService.removeById(id);
         }
         return new Result(10000,"删除成功",true) ;

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

@@ -1,7 +1,7 @@
 package com.huimv.env.manage.mapper;
 
-import com.huimv.env.manage.entity.EnvPh;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.env.manage.saas.dao.entity.EnvPh;
 
 /**
  * <p>

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

@@ -15,6 +15,6 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/env-ph")
-public class EnvPhController {
+public class EnvPhControllY {
 
 }

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/dao/entity/EnvElectricityMeter.java

@@ -3,10 +3,10 @@ package com.huimv.env.manage.saas.dao.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -38,9 +38,9 @@ public class EnvElectricityMeter implements Serializable {
 
     private String askTime;
 
-    private LocalDateTime addTime;
+    private Date addTime;
 
-    private LocalDate addDate;
+    private Date addDate;
 
     private String pigpenId;
 

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/dao/entity/EnvPh.java

@@ -3,10 +3,10 @@ package com.huimv.env.manage.saas.dao.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -38,9 +38,9 @@ public class EnvPh implements Serializable {
 
     private String askTime;
 
-    private LocalDateTime addTime;
+    private Date addTime;
 
-    private LocalDate addDate;
+    private Date addDate;
 
     private String pigpenId;
 

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/dao/entity/EnvWaterMeter.java

@@ -3,10 +3,10 @@ package com.huimv.env.manage.saas.dao.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -38,9 +38,9 @@ public class EnvWaterMeter implements Serializable {
 
     private String askTime;
 
-    private LocalDateTime addTime;
+    private Date addTime;
 
-    private LocalDate addDate;
+    private Date addDate;
 
     private String pigpenId;
 

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

@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author author
  * @since 2022-10-26
  */
-public interface IEnvPhService extends IService<EnvPh> {
+public interface IEnvPhServiceY extends IService<EnvPh> {
 
 }

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

@@ -69,9 +69,9 @@ public class BaseDeviceCofigServiceImpl extends ServiceImpl<BaseDeviceCofigMappe
         endMap.put("envElectricityMeter",0);
         endMap.put("envWaterMeter",0);
 
-        EnvTemp temp = tempMapper.selectOne(new QueryWrapper<EnvTemp>().eq("device_code",deviceCode ));
-        EnvHumi envHumi = envHumiMapper.selectOne(new QueryWrapper<EnvHumi>().eq("device_code", deviceCode));
-        EnvPh envPh = envPhMapper.selectOne(new QueryWrapper<EnvPh>().eq("device_code", deviceCode));
+        EnvTemp temp = tempMapper.selectOne(new QueryWrapper<EnvTemp>().eq("device_code",deviceCode ).orderByDesc("id").last("limit 1"));
+        EnvHumi envHumi = envHumiMapper.selectOne(new QueryWrapper<EnvHumi>().eq("device_code", deviceCode).orderByDesc("id").last("limit 1"));
+        EnvPh envPh = envPhMapper.selectOne(new QueryWrapper<EnvPh>().eq("device_code", deviceCode).orderByDesc("id").last("limit 1"));
         Double  envWaterMeter =  waterMeterMapper.countDay(new QueryWrapper<EnvWaterMeter>().eq("device_code", deviceCode).ge("ask_time", DateUtil.beginOfDay(new Date())));
         Double  envElectricityMeter =  envElectricityMeterMapper.countDay(new QueryWrapper<EnvElectricityMeter>().eq("device_code", deviceCode).ge("ask_time", DateUtil.beginOfDay(new Date())));
 

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

@@ -2,7 +2,7 @@ package com.huimv.env.manage.saas.service.impl;
 
 import com.huimv.env.manage.saas.dao.entity.EnvPh;
 import com.huimv.env.manage.mapper.EnvPhMapper;
-import com.huimv.env.manage.saas.service.IEnvPhService;
+import com.huimv.env.manage.saas.service.IEnvPhServiceY;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2022-10-26
  */
 @Service
-public class EnvPhServiceImpl extends ServiceImpl<EnvPhMapper, EnvPh> implements IEnvPhService {
+public class EnvPhServiceImplY extends ServiceImpl<EnvPhMapper, EnvPh> implements IEnvPhServiceY {
 
 }

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

@@ -169,6 +169,7 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
             lampConfig.setTempSet(temp);
 
             lampConfig.setAgeList(dayAgeListStr.toString());
+            lampConfig.setDayAge(initDayAge);
             UpdateWrapper<LampConfig> wrapper = new UpdateWrapper<>();
             if (StringUtils.isBlank(id)){
                 LampConfigAll lampConfigAll = new LampConfigAll();
@@ -226,20 +227,25 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
 
     @Override
     public Result updateLamp(Map<String, Object> map, HttpServletRequest request) {
-        Integer uploadStart = (Integer) map.get("uploadStart");
+        Boolean uploadStart = (Boolean) map.get("uploadStart");
         String id = (String) map.get("id");
         String unitId = (String)map.get("unitId");
         LampConfig lampConfig = new LampConfig();
-        lampConfig.setUploadStart(uploadStart);
+        if (uploadStart){
+            lampConfig.setUploadStart(1);
+        }else {
+            lampConfig.setUploadStart(0);
+        }
+
 
         if (ObjectUtil.isNotEmpty(unitId)){
-            if (uploadStart ==1 && lampConfigMapper.exists(new QueryWrapper<LampConfig>().isNull("temp_set").eq("unit_id",unitId))) {
+            if (uploadStart  && lampConfigMapper.exists(new QueryWrapper<LampConfig>().isNull("temp_set").eq("unit_id",unitId))) {
                 return new Result(10001,"有设备未配置，请先进行配置",false);
 
             }
             lampConfigMapper.update(lampConfig,new QueryWrapper<LampConfig>().eq("unit_id",unitId));
         }else {
-            if (uploadStart ==1  && lampConfigMapper.exists(new QueryWrapper<LampConfig>().isNull("temp_set").eq("id",id))) {
+            if (uploadStart  && lampConfigMapper.exists(new QueryWrapper<LampConfig>().isNull("temp_set").eq("id",id))) {
                 return new Result(10001,"设备未配置，请先进行配置",false);
 
             }

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

@@ -1,8 +1,8 @@
 package com.huimv.env.manage.service;
 
 import com.huimv.common.utils.Result;
-import com.huimv.env.manage.entity.EnvPh;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.env.manage.saas.dao.entity.EnvPh;
 
 import java.util.Map;
 

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

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.utils.Const;
-import com.huimv.env.manage.entity.EnvPh;
 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 org.springframework.stereotype.Service;