12

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

@@ -1,6 +1,7 @@
 package com.huimv.env.lamp.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.huimv.env.common.dao.entity.LampConfigEntity;
 import com.huimv.env.common.service.ILampTempService;
 import com.huimv.env.common.utils.DateUtil;
@@ -62,13 +63,14 @@ public class LampInputHandleServiceImpl implements LampInputHandleService {
     public void getLampConfig(String askText, String idCode, ChannelHandlerContext ctx) {
         System.out.println("获取温度配置");
         List<LampConfigEntity> lampConfigEntityList = lampConfigService.getLampConfigByDeviceId(idCode);
-        String answerText ="hm+"+idCode+"+3+0+0+0+7+end";
+        String answerText ="hm+"+idCode+"+3+0+0+0+6+end";
         if (ObjectUtil.isNotEmpty(lampConfigEntityList)){
             LampConfigEntity lampConfigEntity = lampConfigEntityList.get(0);
             String tempSet = lampConfigEntity.getTempSet();
             Integer uploadStart = lampConfigEntity.getUploadStart();
             Integer boardGear = lampConfigEntity.getBoardGear();
-            answerText ="hm+"+idCode+"+3+"+uploadStart+"+"+tempSet+"+"+boardGear+"+7+end";
+
+            answerText ="hm+"+idCode+"+3+"+uploadStart+"+"+tempSet+"+"+boardGear+"+6+end";
         }
 
         log.info(">>获取保温箱温度配置请求-应答数据>>" + answerText);

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

@@ -0,0 +1,21 @@
+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.saas.dao.entity.EnvElectricityMeter;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+public interface EnvElectricityMeterMapper extends BaseMapper<EnvElectricityMeter> {
+
+    Double countDay(@Param(Constants.WRAPPER) QueryWrapper<EnvElectricityMeter> wrapper);
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.env.manage.mapper;
+
+import com.huimv.env.manage.saas.dao.entity.EnvPh;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+public interface EnvPhMapper extends BaseMapper<EnvPh> {
+
+}

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

@@ -0,0 +1,20 @@
+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.saas.dao.entity.EnvWaterMeter;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+public interface EnvWaterMeterMapper extends BaseMapper<EnvWaterMeter> {
+
+    Double countDay(@Param(Constants.WRAPPER) QueryWrapper<EnvWaterMeter> wrapper);
+}

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

@@ -43,6 +43,14 @@ public class BaseDeviceCofigController {
 
     }
 
+    @PostMapping("/listAllDataByUnitId")
+    public Result listAllDataByUnitId(@RequestBody Map<String, String> map, HttpServletRequest request){
+
+      return baseDeviceCofigService.listAllDataByUnitId(map,request);
+
+
+    }
+
 
 
 }

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

@@ -1,7 +1,10 @@
 package com.huimv.env.manage.saas.controller;
 
 
+import com.huimv.env.manage.entity.EnvDeviceRegister;
+import com.huimv.env.manage.saas.dao.entity.EnvDeviceEquipment;
 import com.huimv.env.manage.saas.service.IBasePigpenService;
+import com.huimv.env.manage.saas.service.IEnvDeviceEquipmentService;
 import com.huimv.env.manage.service.IEnvDeviceRegisterService;
 import com.huimv.env.manage.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,10 +32,25 @@ public class EnvDeviceEquipmentController {
     @Autowired
     IEnvDeviceRegisterService deviceRegisterService;
 
+    @Autowired
+    IEnvDeviceEquipmentService envDeviceEquipmentService;
+
     @PostMapping("/listByUnit")
     public Result listByUnit(@RequestBody Map<String, String> map, HttpServletRequest request){
 
         return deviceRegisterService.listByUnit(map,request);
     }
 
+    @PostMapping("/update")
+    public Result update(@RequestBody EnvDeviceEquipment envDeviceEquipment){
+        try {
+            envDeviceEquipmentService.updateById(envDeviceEquipment);
+            return new Result(10000,"修改成功",true);
+        }catch (Exception e){
+            return new Result(10001,"修改失败",false);
+        }
+
+
+    }
+
 }

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

@@ -0,0 +1,20 @@
+package com.huimv.env.manage.saas.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+@RestController
+@RequestMapping("/env-electricity-meter")
+public class EnvElectricityMeterController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.env.manage.saas.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+@RestController
+@RequestMapping("/env-ph")
+public class EnvPhController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.env.manage.saas.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+@RestController
+@RequestMapping("/env-water-meter")
+public class EnvWaterMeterController {
+
+}

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

@@ -67,7 +67,7 @@ public class LampConfigController {
 
     // 保温灯统一配置 -配置
     @PostMapping("/allToConfig")
-    public Result allToConfig(@RequestBody Map<String, String> map, HttpServletRequest request){
+    public Result allToConfig(@RequestBody Map<String, Object> map, HttpServletRequest request){
         return lampConfigService.allToConfig(map,request);
 
     }
@@ -87,9 +87,9 @@ public class LampConfigController {
     }
 
 
-    // TODO 保温灯开关
+    // 保温灯开关
     @PostMapping("/updateLamp")
-    public Result updateLamp(@RequestBody Map<String, Integer> map, HttpServletRequest request){
+    public Result updateLamp(@RequestBody Map<String, Object> map, HttpServletRequest request){
         return lampConfigService.updateLamp(map,request);
 
     }

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

@@ -0,0 +1,56 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_electricity_meter")
+public class EnvElectricityMeter implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String deviceCode;
+
+    private Integer sensorSn;
+
+    private BigDecimal electricityMeter;
+
+    private String askTime;
+
+    private LocalDateTime addTime;
+
+    private LocalDate addDate;
+
+    private String pigpenId;
+
+    private String unitId;
+
+    private String farmCode;
+
+    private String dataUnit;
+
+    private Integer electricityMeterData;
+
+
+}

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

@@ -0,0 +1,54 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_ph")
+public class EnvPh implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String deviceCode;
+
+    private Integer sensorSn;
+
+    private BigDecimal ph;
+
+    private String askTime;
+
+    private LocalDateTime addTime;
+
+    private LocalDate addDate;
+
+    private String pigpenId;
+
+    private String unitId;
+
+    private String farmCode;
+
+    private String dataUnit;
+
+
+}

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

@@ -0,0 +1,56 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_water_meter")
+public class EnvWaterMeter implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String deviceCode;
+
+    private Integer sensorSn;
+
+    private BigDecimal waterMeter;
+
+    private String askTime;
+
+    private LocalDateTime addTime;
+
+    private LocalDate addDate;
+
+    private String pigpenId;
+
+    private String unitId;
+
+    private String farmCode;
+
+    private String dataUnit;
+
+    private Integer waterMeterData;
+
+
+}

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

@@ -18,4 +18,5 @@ import java.util.Map;
 public interface IBaseDeviceCofigService extends IService<BaseDeviceCofig> {
 
 
+    Result listAllDataByUnitId(Map<String, String> map, HttpServletRequest request);
 }

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

@@ -0,0 +1,16 @@
+package com.huimv.env.manage.saas.service;
+
+import com.huimv.env.manage.saas.dao.entity.EnvElectricityMeter;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+public interface IEnvElectricityMeterService extends IService<EnvElectricityMeter> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.env.manage.saas.service;
+
+import com.huimv.env.manage.saas.dao.entity.EnvPh;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+public interface IEnvPhService extends IService<EnvPh> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.env.manage.saas.service;
+
+import com.huimv.env.manage.saas.dao.entity.EnvWaterMeter;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+public interface IEnvWaterMeterService extends IService<EnvWaterMeter> {
+
+}

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

@@ -27,13 +27,13 @@ public interface ILampConfigService extends IService<LampConfig> {
 
     String updateTemp(String ageList, Integer dayAge);
 
-    Result allToConfig(Map<String, String> map, HttpServletRequest request);
+    Result allToConfig(Map<String, Object> map, HttpServletRequest request);
 
     Result listByUnit(Map<String, String> map, HttpServletRequest request);
 
     Result countByUnit(Map<String, String> map, HttpServletRequest request);
 
-    Result updateLamp(Map<String, Integer> map, HttpServletRequest request);
+    Result updateLamp(Map<String, Object> map, HttpServletRequest request);
 
     Result listByLampId(Map<String, String> map, HttpServletRequest request);
 }

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

@@ -1,13 +1,26 @@
 package com.huimv.env.manage.saas.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.env.manage.entity.EnvDeviceRegister;
+import com.huimv.env.manage.entity.EnvHumi;
+import com.huimv.env.manage.entity.EnvTemp;
+import com.huimv.env.manage.mapper.*;
 import com.huimv.env.manage.saas.dao.entity.BaseDeviceCofig;
-import com.huimv.env.manage.mapper.BaseDeviceCofigMapper;
+import com.huimv.env.manage.saas.dao.entity.EnvElectricityMeter;
+import com.huimv.env.manage.saas.dao.entity.EnvPh;
+import com.huimv.env.manage.saas.dao.entity.EnvWaterMeter;
 import com.huimv.env.manage.saas.service.IBaseDeviceCofigService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.env.manage.utils.Result;
+import com.huimv.env.manage.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -21,5 +34,62 @@ import java.util.Map;
 @Service
 public class BaseDeviceCofigServiceImpl extends ServiceImpl<BaseDeviceCofigMapper, BaseDeviceCofig> implements IBaseDeviceCofigService {
 
+    @Autowired
+    private EnvTempMapper tempMapper;
 
+    @Autowired
+    private EnvHumiMapper envHumiMapper;
+
+    @Autowired
+    private EnvPhMapper envPhMapper;
+
+    @Autowired
+    private EnvElectricityMeterMapper envElectricityMeterMapper;
+
+    @Autowired
+    private EnvWaterMeterMapper waterMeterMapper;
+
+    @Autowired
+    private EnvDeviceRegisterMapper envDeviceRegisterMapper;
+
+
+
+    @Override
+    public Result listAllDataByUnitId(Map<String, String> map, HttpServletRequest request) {
+        String unitId = map.get("unitId");
+        EnvDeviceRegister deviceRegister = envDeviceRegisterMapper.selectOne(new QueryWrapper<EnvDeviceRegister>().eq("unit_id", unitId));
+        if (ObjectUtil.isEmpty(deviceRegister)){
+            return new Result(10001,"未绑定设备",true);
+        }
+        String deviceCode = deviceRegister.getDeviceCode();
+        Map endMap = new HashMap();
+        endMap.put("temp",0);
+        endMap.put("envHumi",0);
+        endMap.put("envPh",0);
+        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));
+        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())));
+
+        if (ObjectUtil.isNotEmpty(temp)){
+            endMap.put("temp",temp.getTemp());
+        }
+        if (ObjectUtil.isNotEmpty(envHumi)){
+            endMap.put("envHumi",envHumi.getHumi());
+        }
+        if (ObjectUtil.isNotEmpty(envPh)){
+            endMap.put("envPh",envPh.getPh());
+        }
+        if (ObjectUtil.isNotEmpty(envWaterMeter)){
+            endMap.put("envWaterMeter",envWaterMeter);
+        }
+        if (ObjectUtil.isNotEmpty(envElectricityMeter)){
+            endMap.put("envElectricityMeter",envElectricityMeter);
+        }
+        return new Result(ResultCode.SUCCESS,endMap);
+    }
 }

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

@@ -0,0 +1,20 @@
+package com.huimv.env.manage.saas.service.impl;
+
+import com.huimv.env.manage.saas.dao.entity.EnvElectricityMeter;
+import com.huimv.env.manage.mapper.EnvElectricityMeterMapper;
+import com.huimv.env.manage.saas.service.IEnvElectricityMeterService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+@Service
+public class EnvElectricityMeterServiceImpl extends ServiceImpl<EnvElectricityMeterMapper, EnvElectricityMeter> implements IEnvElectricityMeterService {
+
+}

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

@@ -0,0 +1,20 @@
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+@Service
+public class EnvPhServiceImpl extends ServiceImpl<EnvPhMapper, EnvPh> implements IEnvPhService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.huimv.env.manage.saas.service.impl;
+
+import com.huimv.env.manage.saas.dao.entity.EnvWaterMeter;
+import com.huimv.env.manage.mapper.EnvWaterMeterMapper;
+import com.huimv.env.manage.saas.service.IEnvWaterMeterService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-26
+ */
+@Service
+public class EnvWaterMeterServiceImpl extends ServiceImpl<EnvWaterMeterMapper, EnvWaterMeter> implements IEnvWaterMeterService {
+
+}

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

@@ -40,6 +40,7 @@ public class LampConfigAllServiceImpl extends ServiceImpl<LampConfigAllMapper, L
         if (ObjectUtil.isEmpty(lampConfigAll)){
             lampConfigAll = new LampConfigAll();
             lampConfigAll.setFarmCode(farmCode);
+            lampConfigAll.setUnitId(Integer.parseInt(unitId));
             lampConfigAll.setInitDayage(0);
             lampConfigAll.setListDayage("0,33;");
             lampConfigAll.setBoardGear(0);

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

@@ -22,6 +22,7 @@ import com.huimv.env.manage.utils.ResultCode;
 import com.huimv.env.manage.utils.ResultUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
@@ -52,6 +53,8 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
     public Result savelampConfig( LampConfig lampConfig, HttpServletRequest request) {
         String deviceId = lampConfig.getDeviceId();
         Integer unitId = lampConfig.getUnitId();
+        deviceId = deviceId.substring(2);
+        lampConfig.setDeviceId(deviceId);
         String location  = lampConfig.getLocation();
         if (lampConfigMapper.exists(new QueryWrapper<LampConfig>().eq("device_id",deviceId))){
             return new Result(10001,"保温灯已存在",false);
@@ -145,42 +148,46 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
     }
 
     @Override
-    public Result allToConfig(Map<String, String> map, HttpServletRequest request) {
+    @Transactional
+    public Result allToConfig(Map<String, Object> map, HttpServletRequest request) {
         try {
-            String initDayAge =  map.get("initDayAge");
-            String dayAgeList =  map.get("dayAgeList");
+            Integer initDayAge =  (Integer) map.get("initDayAge");
+            List<String> dayAgeList =  (List<String> )map.get("dayAgeList");
             //
-            String boardGear = map.get("boardGear");
-            String unitId = map.get("unitId");
-            String id = map.get("id");
-
-            JSONArray jsonArray = JSONUtil.parseArray(dayAgeList);
+            Integer boardGear =(Integer) map.get("boardGear");
+            String unitId =(String) map.get("unitId");
+            String id = (String)map.get("id");
 
             LampConfig lampConfig = new LampConfig();
-            lampConfig.setInitAge(Integer.parseInt(initDayAge));
-            lampConfig.setBoardGear(Integer.parseInt(boardGear));
+            lampConfig.setInitAge(initDayAge);
+            lampConfig.setBoardGear(boardGear);
             StringBuilder dayAgeListStr = new StringBuilder();
-            for (Object o : jsonArray) {
-                dayAgeListStr.append(o.toString()).append(";");
+            for (String s : dayAgeList) {
+                dayAgeListStr.append(s).append(";");
             }
+            String temp = updateTemp(dayAgeListStr.toString(), initDayAge);
+            lampConfig.setTempSet(temp);
+
             lampConfig.setAgeList(dayAgeListStr.toString());
             UpdateWrapper<LampConfig> wrapper = new UpdateWrapper<>();
             if (StringUtils.isBlank(id)){
                 LampConfigAll lampConfigAll = new LampConfigAll();
-                lampConfigAll.setBoardGear(Integer.parseInt(boardGear));
-//                lampConfigAll.setListDayage();
-                lampConfigAll.setInitDayage(Integer.parseInt(initDayAge));
-//                lampConfigAll.setFarmCode();
-//                lampConfigAll.setUnitId();
+                lampConfigAll.setBoardGear(boardGear);
+                lampConfigAll.setInitDayage((initDayAge));
+                lampConfigAll.setListDayage((dayAgeListStr.toString()));
+
+                lampConfigAllMapper.update(lampConfigAll,new UpdateWrapper<LampConfigAll>().eq("unit_id",unitId));
                 wrapper.eq("unit_id",unitId);
+                lampConfigMapper.update(lampConfig,wrapper);
+                return new Result(10000,"全局配置成功",true);
             }else {
                 wrapper.eq("id",id);
+                lampConfigMapper.update(lampConfig,wrapper);
+                return new Result(10000,"配置成功",true);
             }
-            lampConfigMapper.update(lampConfig,wrapper);
 
-            return new Result(10000,"全局配置成功",true);
         }catch (Exception e){
-            System.out.println(e);
+            System.out.println("----------->"+e);
             return new Result(10001,"配置失败",true);
         }
 
@@ -201,7 +208,7 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
         QueryWrapper<LampConfig> wrapper = new QueryWrapper<>();
         wrapper.eq("unit_id",unitId);
         Long countAll = lampConfigMapper.selectCount(wrapper);
-        wrapper.eq("open_start",1);
+        wrapper.eq("upload_start",1);
         Long countStart = lampConfigMapper.selectCount(wrapper);
         Long countClose =countAll -countStart;
         Map endMap = new HashMap();
@@ -218,16 +225,26 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
     }
 
     @Override
-    public Result updateLamp(Map<String, Integer> map, HttpServletRequest request) {
-        Integer uploadStart = map.get("uploadStart");
-        Integer id = map.get("id");
-        Integer unitId = map.get("unitId");
+    public Result updateLamp(Map<String, Object> map, HttpServletRequest request) {
+        Integer uploadStart = (Integer) map.get("uploadStart");
+        String id = (String) map.get("id");
+        String unitId = (String)map.get("unitId");
         LampConfig lampConfig = new LampConfig();
         lampConfig.setUploadStart(uploadStart);
+
         if (ObjectUtil.isNotEmpty(unitId)){
+            if (uploadStart ==1 && 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 {
-            lampConfig.setId(id);
+            if (uploadStart ==1  && lampConfigMapper.exists(new QueryWrapper<LampConfig>().isNull("temp_set").eq("id",id))) {
+                return new Result(10001,"设备未配置，请先进行配置",false);
+
+            }
+            lampConfig.setId(Integer.parseInt(id));
+
             lampConfigMapper.updateById(lampConfig);
         }
 
@@ -239,16 +256,24 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
         String lampId = map.get("lampId");
         LampConfig lampConfig = lampConfigMapper.selectById(lampId);
         if (ObjectUtil.isEmpty(lampConfig)){
-            lampConfig = new LampConfig();
-            lampConfig.setInitAge(0);
-            lampConfig.setAgeList("0,33;");
+            return new Result(10001,"设备不存在",false);
         }
+
         Map endMap =new HashMap();
         endMap.put("initDayage",lampConfig.getInitAge());
         endMap.put("listDayage",lampConfig.getAgeList().split(";"));
         endMap.put("id",lampConfig.getId());
         endMap.put("lampName",lampConfig.getLampName());
         endMap.put("deviceId",lampConfig.getDeviceId());
+        endMap.put("openStrart",lampConfig.getOpenStart());
+        endMap.put("uploadStart",lampConfig.getUploadStart());
+        endMap.put("boardGear",lampConfig.getBoardGear());
+        endMap.put("tempSet",lampConfig.getTempSet());
+        endMap.put("location",lampConfig.getLocation());
+        endMap.put("dayage",lampConfig.getDayAge());
+        endMap.put("unitId",lampConfig.getUnitId());
+        endMap.put("farmCode",lampConfig.getFarmCode());
+        endMap.put("binding",lampConfig.getBinding());
         return new Result(ResultCode.SUCCESS,endMap);
     }
-}
+}

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

@@ -76,6 +76,7 @@ public class EnvDeviceRegisterServiceImpl extends ServiceImpl<EnvDeviceRegisterM
     @Transactional
     public Result saveRegister(Map<String, String> paramMap) {
         String deviceCode = paramMap.get("deviceCode");
+        deviceCode = deviceCode.substring(2);
         String unitId = paramMap.get("unitId");
         String farmCode = paramMap.get("farmCode");
         String deviceList = paramMap.get("deviceList");

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.env.manage.mapper.EnvElectricityMeterMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.env.manage.saas.dao.entity.EnvElectricityMeter">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="sensor_sn" property="sensorSn" />
+        <result column="electricity_meter" property="electricityMeter" />
+        <result column="ask_time" property="askTime" />
+        <result column="add_time" property="addTime" />
+        <result column="add_date" property="addDate" />
+        <result column="pigpen_id" property="pigpenId" />
+        <result column="unit_id" property="unitId" />
+        <result column="farm_code" property="farmCode" />
+        <result column="data_unit" property="dataUnit" />
+        <result column="electricity_meter_data" property="electricityMeterData" />
+    </resultMap>
+    <select id="countDay" resultType="java.lang.Double">
+
+        SELECT NULLIF(SUM(electricity_meter),0 )FROM `env_electricity_meter`
+
+        ${ew.customSqlSegment}
+
+    </select>
+
+</mapper>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.env.manage.mapper.EnvPhMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.env.manage.saas.dao.entity.EnvPh">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="sensor_sn" property="sensorSn" />
+        <result column="ph" property="ph" />
+        <result column="ask_time" property="askTime" />
+        <result column="add_time" property="addTime" />
+        <result column="add_date" property="addDate" />
+        <result column="pigpen_id" property="pigpenId" />
+        <result column="unit_id" property="unitId" />
+        <result column="farm_code" property="farmCode" />
+        <result column="data_unit" property="dataUnit" />
+    </resultMap>
+
+</mapper>

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

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.env.manage.mapper.EnvWaterMeterMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.env.manage.saas.dao.entity.EnvWaterMeter">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="sensor_sn" property="sensorSn" />
+        <result column="water_meter" property="waterMeter" />
+        <result column="ask_time" property="askTime" />
+        <result column="add_time" property="addTime" />
+        <result column="add_date" property="addDate" />
+        <result column="pigpen_id" property="pigpenId" />
+        <result column="unit_id" property="unitId" />
+        <result column="farm_code" property="farmCode" />
+        <result column="data_unit" property="dataUnit" />
+        <result column="water_meter_data" property="waterMeterData" />
+    </resultMap>
+    <select id="countDay" resultType="java.lang.Double">
+
+             SELECT NULLIF(SUM(water_meter),0 )FROM `env_water_meter`
+
+        ${ew.customSqlSegment}
+    </select>
+
+</mapper>