2021-07-12 环控命令水量电量

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/dao/ConsumeElectricDao.java

@@ -0,0 +1,17 @@
+package com.huimv.datacollection.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.datacollection.entity.ConsumeElectricEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@Mapper
+public interface ConsumeElectricDao extends BaseMapper<ConsumeElectricEntity> {
+	
+}

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/dao/ConsumeWarterDao.java

@@ -0,0 +1,17 @@
+package com.huimv.datacollection.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.datacollection.entity.ConsumeWarterEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@Mapper
+public interface ConsumeWarterDao extends BaseMapper<ConsumeWarterEntity> {
+	
+}

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/entity/ConsumeElectricEntity.java

@@ -0,0 +1,40 @@
+package com.huimv.datacollection.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@Data
+@TableName("mgt_consume_electric")
+public class ConsumeElectricEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private Double consumeElectric;
+	/**
+	 * 
+	 */
+	private Date collectTime;
+	/**
+	 * 
+	 */
+	private Integer deviceId;
+
+}

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/entity/ConsumeWarterEntity.java

@@ -0,0 +1,40 @@
+package com.huimv.datacollection.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@Data
+@TableName("mgt_consume_warter")
+public class ConsumeWarterEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private Double consumeWarter;
+	/**
+	 * 
+	 */
+	private Date collectTime;
+	/**
+	 * 
+	 */
+	private Integer deviceId;
+
+}

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/service/ConsumeElectricService.java

@@ -0,0 +1,20 @@
+package com.huimv.datacollection.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.datacollection.entity.ConsumeElectricEntity;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+public interface ConsumeElectricService extends IService<ConsumeElectricEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/service/ConsumeWarterService.java

@@ -0,0 +1,20 @@
+package com.huimv.datacollection.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.datacollection.entity.ConsumeWarterEntity;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+public interface ConsumeWarterService extends IService<ConsumeWarterEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/service/impl/ClientDataPacketServiceImpl.java

@@ -3,10 +3,10 @@ package com.huimv.datacollection.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.huimv.common.exception.RRException;
 import com.huimv.datacollection.constant.XtAppConstant;
+import com.huimv.datacollection.dao.ConsumeElectricDao;
+import com.huimv.datacollection.dao.ConsumeWarterDao;
 import com.huimv.datacollection.dao.DeviceDataDao;
-import com.huimv.datacollection.entity.DeviceDataEntity;
-import com.huimv.datacollection.entity.DeviceEntity;
-import com.huimv.datacollection.entity.IndoorEnvironmentEntity;
+import com.huimv.datacollection.entity.*;
 import com.huimv.datacollection.enums.CmdEnum;
 import com.huimv.datacollection.feign.ManagementFeignService;
 import com.huimv.datacollection.service.HandleDataPackageService;
@@ -38,6 +38,12 @@ public class ClientDataPacketServiceImpl implements IClientDataPacketService {
     @Autowired
     private HandleDataPackageService handleDataPackageService;
 
+    @Autowired
+    private ConsumeWarterDao consumeWarterDao;
+
+    @Autowired
+    private ConsumeElectricDao consumeElectricDao;
+
     @Override
     public String handleClientSendPacket(String clientMessageTxt) {
 
@@ -51,7 +57,7 @@ public class ClientDataPacketServiceImpl implements IClientDataPacketService {
         String cmd = result[2];
         String jqid = result[1];
         log.info("本次执行命令>>" + cmd);
-        String rs = "";
+        String rs ="";
 
         if (jqid.equals("0")) {
 
@@ -282,60 +288,8 @@ public class ClientDataPacketServiceImpl implements IClientDataPacketService {
 
 
 
-        DeviceDataEntity deviceDataEntity = new DeviceDataEntity();
-        deviceDataEntity.setCmdHeader(result[0]);
-        String jqId = result[1];
-        deviceDataEntity.setJqId(jqId);
-        deviceDataEntity.setCmdType(Integer.parseInt(result[2]));
-        deviceDataEntity.setSequence(Integer.parseInt(result[3]));
-        Double value = null;
-        if (CmdEnum.TEMPERATURE.getTypeNum().equals(cmd) || CmdEnum.HUMIDITY.getTypeNum().equals(cmd)) {
-            value = new BigDecimal(result[4]).divide(new BigDecimal("10")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-        } else if (CmdEnum.GAS.getTypeNum().equals(cmd)) {
-            value = Double.parseDouble(result[4]);
-        }
-        if (value == null) {
-            throw new RRException("传入数据包的数据字段为空,请检查!");
-        }
-        deviceDataEntity.setValue(value);
-        deviceDataEntity.setTime(result[5]);
-        deviceDataEntity.setVerify(Integer.parseInt(result[6]));
-        deviceDataEntity.setCmdEnd(result[7]);
-        deviceDataDao.insert(deviceDataEntity);
-
-        //获取设备信息并校验
-        String deviceJson = JSONObject.toJSONString(managementFeignService.deviceInfo(jqId).get("device"));
-        DeviceEntity deviceEntity = JSONObject.parseObject(deviceJson, DeviceEntity.class);
-        if (deviceEntity == null) {
-            throw new RRException("没有获取到设备信息,请联系管理员!");
-        }
-        //保存室内环境数据
-        IndoorEnvironmentEntity indoorEnvironmentEntity = new IndoorEnvironmentEntity();
-        Integer farmId = deviceEntity.getFarmId();
-        indoorEnvironmentEntity.setFarmId(farmId);
-        Integer pigstyId = deviceEntity.getPigstyId();
-        indoorEnvironmentEntity.setPigstyId(pigstyId);
-        indoorEnvironmentEntity.setValue(value);
-        indoorEnvironmentEntity.setCollectTime(new Date());
+        return rs;
 
-        Map<String, Double> map = managementFeignService.selectByType((short) 1);
-        switch (deviceDataEntity.getCmdType()) {
-            case 7:
-                indoorEnvironmentEntity.setType(1);
-                handleDataPackageService.handleTemperature(indoorEnvironmentEntity, value, farmId, pigstyId, map);
-                return "hm+7+0+7+end";
-            case 8:
-                indoorEnvironmentEntity.setType(2);
-                handleDataPackageService.handleHumidity(indoorEnvironmentEntity, value, farmId, pigstyId, map);
-                return "hm+8+0+8+end";
-            case 9:
-                indoorEnvironmentEntity.setType(3);
-                handleDataPackageService.handleGas(indoorEnvironmentEntity, value, farmId, pigstyId, map);
-                return "hm+9+0+8+end";
-            default:
-                break;
-        }
-        return "";
     }
 
     /**
@@ -546,12 +500,131 @@ public class ClientDataPacketServiceImpl implements IClientDataPacketService {
             gz = XtAppConstant.SOCKET_SJSC_GZBZ_0;
             //温度
             if (cmd.equals(XtAppConstant.SOCKET_SJSC_CMD_7)) {
+                DeviceDataEntity deviceDataEntity = new DeviceDataEntity();
+                deviceDataEntity.setCmdHeader(result[0]);
+                String jqId = result[1];
+                deviceDataEntity.setJqId(jqId);
+                deviceDataEntity.setCmdType(Integer.parseInt(result[2]));
+                deviceDataEntity.setSequence(Integer.parseInt(result[3]));
+                Double value = null;
+                if (CmdEnum.TEMPERATURE.getTypeNum().equals(cmd) || CmdEnum.HUMIDITY.getTypeNum().equals(cmd)) {
+                    value = new BigDecimal(result[4]).divide(new BigDecimal("10")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                } else if (CmdEnum.GAS.getTypeNum().equals(cmd)) {
+                    value = Double.parseDouble(result[4]);
+                }
+                if (value == null) {
+                    throw new RRException("传入数据包的数据字段为空,请检查!");
+                }
+                deviceDataEntity.setValue(value);
+                deviceDataEntity.setTime(result[5]);
+                deviceDataEntity.setVerify(Integer.parseInt(result[6]));
+                deviceDataEntity.setCmdEnd(result[7]);
+                deviceDataDao.insert(deviceDataEntity);
+
+                //获取设备信息并校验
+                String deviceJson = JSONObject.toJSONString(managementFeignService.deviceInfo(jqId).get("device"));
+                DeviceEntity deviceEntity = JSONObject.parseObject(deviceJson, DeviceEntity.class);
+                if (deviceEntity == null) {
+                    throw new RRException("没有获取到设备信息,请联系管理员!");
+                }
+                //保存室内环境数据
+                IndoorEnvironmentEntity indoorEnvironmentEntity = new IndoorEnvironmentEntity();
+                Integer farmId = deviceEntity.getFarmId();
+                indoorEnvironmentEntity.setFarmId(farmId);
+                Integer pigstyId = deviceEntity.getPigstyId();
+                indoorEnvironmentEntity.setPigstyId(pigstyId);
+                indoorEnvironmentEntity.setValue(value);
+                indoorEnvironmentEntity.setCollectTime(new Date());
+
+                Map<String, Double> map = managementFeignService.selectByType((short) 1);
+                indoorEnvironmentEntity.setType(1);
+                handleDataPackageService.handleTemperature(indoorEnvironmentEntity, value, farmId, pigstyId, map);
             }
             //湿度
             if (cmd.equals(XtAppConstant.SOCKET_SJSC_CMD_8)) {
+
+                DeviceDataEntity deviceDataEntity = new DeviceDataEntity();
+                deviceDataEntity.setCmdHeader(result[0]);
+                String jqId = result[1];
+                deviceDataEntity.setJqId(jqId);
+                deviceDataEntity.setCmdType(Integer.parseInt(result[2]));
+                deviceDataEntity.setSequence(Integer.parseInt(result[3]));
+                Double value = null;
+                if (CmdEnum.TEMPERATURE.getTypeNum().equals(cmd) || CmdEnum.HUMIDITY.getTypeNum().equals(cmd)) {
+                    value = new BigDecimal(result[4]).divide(new BigDecimal("10")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                } else if (CmdEnum.GAS.getTypeNum().equals(cmd)) {
+                    value = Double.parseDouble(result[4]);
+                }
+                if (value == null) {
+                    throw new RRException("传入数据包的数据字段为空,请检查!");
+                }
+                deviceDataEntity.setValue(value);
+                deviceDataEntity.setTime(result[5]);
+                deviceDataEntity.setVerify(Integer.parseInt(result[6]));
+                deviceDataEntity.setCmdEnd(result[7]);
+                deviceDataDao.insert(deviceDataEntity);
+
+                //获取设备信息并校验
+                String deviceJson = JSONObject.toJSONString(managementFeignService.deviceInfo(jqId).get("device"));
+                DeviceEntity deviceEntity = JSONObject.parseObject(deviceJson, DeviceEntity.class);
+                if (deviceEntity == null) {
+                    throw new RRException("没有获取到设备信息,请联系管理员!");
+                }
+                //保存室内环境数据
+                IndoorEnvironmentEntity indoorEnvironmentEntity = new IndoorEnvironmentEntity();
+                Integer farmId = deviceEntity.getFarmId();
+                indoorEnvironmentEntity.setFarmId(farmId);
+                Integer pigstyId = deviceEntity.getPigstyId();
+                indoorEnvironmentEntity.setPigstyId(pigstyId);
+                indoorEnvironmentEntity.setValue(value);
+                indoorEnvironmentEntity.setCollectTime(new Date());
+
+                Map<String, Double> map = managementFeignService.selectByType((short) 1);
+
+                indoorEnvironmentEntity.setType(2);
+                handleDataPackageService.handleHumidity(indoorEnvironmentEntity, value, farmId, pigstyId, map);
             }
             //氨气
             if (cmd.equals(XtAppConstant.SOCKET_SJSC_CMD_9)) {
+                DeviceDataEntity deviceDataEntity = new DeviceDataEntity();
+                deviceDataEntity.setCmdHeader(result[0]);
+                String jqId = result[1];
+                deviceDataEntity.setJqId(jqId);
+                deviceDataEntity.setCmdType(Integer.parseInt(result[2]));
+                deviceDataEntity.setSequence(Integer.parseInt(result[3]));
+                Double value = null;
+                if (CmdEnum.TEMPERATURE.getTypeNum().equals(cmd) || CmdEnum.HUMIDITY.getTypeNum().equals(cmd)) {
+                    value = new BigDecimal(result[4]).divide(new BigDecimal("10")).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+                } else if (CmdEnum.GAS.getTypeNum().equals(cmd)) {
+                    value = Double.parseDouble(result[4]);
+                }
+                if (value == null) {
+                    throw new RRException("传入数据包的数据字段为空,请检查!");
+                }
+                deviceDataEntity.setValue(value);
+                deviceDataEntity.setTime(result[5]);
+                deviceDataEntity.setVerify(Integer.parseInt(result[6]));
+                deviceDataEntity.setCmdEnd(result[7]);
+                deviceDataDao.insert(deviceDataEntity);
+
+                //获取设备信息并校验
+                String deviceJson = JSONObject.toJSONString(managementFeignService.deviceInfo(jqId).get("device"));
+                DeviceEntity deviceEntity = JSONObject.parseObject(deviceJson, DeviceEntity.class);
+                if (deviceEntity == null) {
+                    throw new RRException("没有获取到设备信息,请联系管理员!");
+                }
+                //保存室内环境数据
+                IndoorEnvironmentEntity indoorEnvironmentEntity = new IndoorEnvironmentEntity();
+                Integer farmId = deviceEntity.getFarmId();
+                indoorEnvironmentEntity.setFarmId(farmId);
+                Integer pigstyId = deviceEntity.getPigstyId();
+                indoorEnvironmentEntity.setPigstyId(pigstyId);
+                indoorEnvironmentEntity.setValue(value);
+                indoorEnvironmentEntity.setCollectTime(new Date());
+
+                Map<String, Double> map = managementFeignService.selectByType((short) 1);
+                indoorEnvironmentEntity.setType(3);
+                handleDataPackageService.handleGas(indoorEnvironmentEntity, value, farmId, pigstyId, map);
 
             }
             //氨气
@@ -591,9 +664,22 @@ public class ClientDataPacketServiceImpl implements IClientDataPacketService {
             }
             //耗水
             if (cmd.equals(XtAppConstant.SOCKET_SJSC_CMD_61)) {
+                ConsumeWarterEntity consumeWarterEntity= new ConsumeWarterEntity();
+                consumeWarterEntity.setCollectTime(new Date());
+                consumeWarterEntity.setDeviceId(Integer.parseInt(jqid));
+                consumeWarterEntity.setConsumeWarter(Double.parseDouble(sj));
+                consumeWarterDao.insert(consumeWarterEntity);
+
             }
             //耗电
             if (cmd.equals(XtAppConstant.SOCKET_SJSC_CMD_62)) {
+
+                ConsumeElectricEntity consumeElectricEntity= new ConsumeElectricEntity();
+                consumeElectricEntity.setCollectTime(new Date());
+                consumeElectricEntity.setDeviceId(Integer.parseInt(jqid));
+                consumeElectricEntity.setConsumeElectric(Double.parseDouble(sj));
+                consumeElectricDao.insert(consumeElectricEntity);
+
             }
             //液位数据上传
             if (cmd.equals(XtAppConstant.SOCKET_SJSC_CMD_70)) {

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/service/impl/ConsumeElectricService.java

@@ -0,0 +1,20 @@
+package com.huimv.datacollection.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.datacollection.entity.ConsumeElectricEntity;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+public interface ConsumeElectricService extends IService<ConsumeElectricEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

huimv-smart-datacollection/src/main/java/com/huimv/datacollection/service/impl/ConsumeWarterService.java

@@ -0,0 +1,19 @@
+package com.huimv.datacollection.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.datacollection.entity.ConsumeWarterEntity;
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+public interface ConsumeWarterService extends IService<ConsumeWarterEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

huimv-smart-management/src/main/java/com/huimv/management/controller/ConsumeElectricController.java

@@ -0,0 +1,84 @@
+ package com.huimv.management.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.huimv.management.entity.ConsumeElectricEntity;
+import com.huimv.management.service.ConsumeElectricService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.R;
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@RestController
+@RequestMapping("management/consumeelectric")
+public class ConsumeElectricController {
+    @Autowired
+    private ConsumeElectricService consumeElectricService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = consumeElectricService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		ConsumeElectricEntity consumeElectric = consumeElectricService.getById(id);
+
+        return R.ok().put("consumeElectric", consumeElectric);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody ConsumeElectricEntity consumeElectric){
+		consumeElectricService.save(consumeElectric);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody ConsumeElectricEntity consumeElectric){
+		consumeElectricService.updateById(consumeElectric);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		consumeElectricService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

huimv-smart-management/src/main/java/com/huimv/management/controller/ConsumeWarterController.java

@@ -0,0 +1,84 @@
+ package com.huimv.management.controller;
+
+import java.util.Arrays;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.huimv.management.entity.ConsumeWarterEntity;
+import com.huimv.management.service.ConsumeWarterService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.R;
+
+
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@RestController
+@RequestMapping("management/consumewarter")
+public class ConsumeWarterController {
+    @Autowired
+    private ConsumeWarterService consumeWarterService;
+
+    /**
+     * 列表
+     */
+    @RequestMapping("/list")
+    public R list(@RequestParam Map<String, Object> params){
+        PageUtils page = consumeWarterService.queryPage(params);
+
+        return R.ok().put("page", page);
+    }
+
+
+    /**
+     * 信息
+     */
+    @RequestMapping("/info/{id}")
+    public R info(@PathVariable("id") Integer id){
+		ConsumeWarterEntity consumeWarter = consumeWarterService.getById(id);
+
+        return R.ok().put("consumeWarter", consumeWarter);
+    }
+
+    /**
+     * 保存
+     */
+    @RequestMapping("/save")
+    public R save(@RequestBody ConsumeWarterEntity consumeWarter){
+		consumeWarterService.save(consumeWarter);
+
+        return R.ok();
+    }
+
+    /**
+     * 修改
+     */
+    @RequestMapping("/update")
+    public R update(@RequestBody ConsumeWarterEntity consumeWarter){
+		consumeWarterService.updateById(consumeWarter);
+
+        return R.ok();
+    }
+
+    /**
+     * 删除
+     */
+    @RequestMapping("/delete")
+    public R delete(@RequestBody Integer[] ids){
+		consumeWarterService.removeByIds(Arrays.asList(ids));
+
+        return R.ok();
+    }
+
+}

huimv-smart-management/src/main/java/com/huimv/management/controller/EartagDateController.java

@@ -1,8 +1,6 @@
  package com.huimv.management.controller;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
+import java.util.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -91,4 +89,11 @@ public class EartagDateController {
         return R.ok();
     }
 
+
+     @RequestMapping("/getTemperatureCurve")
+     public R getTemperatureCurve(@RequestParam Map<String, Object> params){
+
+         return R.ok().put("data", eartagDateService.getTemperatureCurve(params));
+     }
+
 }

huimv-smart-management/src/main/java/com/huimv/management/dao/ConsumeElectricDao.java

@@ -0,0 +1,17 @@
+package com.huimv.management.dao;
+
+import com.huimv.management.entity.ConsumeElectricEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@Mapper
+public interface ConsumeElectricDao extends BaseMapper<ConsumeElectricEntity> {
+	
+}

huimv-smart-management/src/main/java/com/huimv/management/dao/ConsumeWarterDao.java

@@ -0,0 +1,17 @@
+package com.huimv.management.dao;
+
+import com.huimv.management.entity.ConsumeWarterEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@Mapper
+public interface ConsumeWarterDao extends BaseMapper<ConsumeWarterEntity> {
+	
+}

huimv-smart-management/src/main/java/com/huimv/management/entity/ConsumeElectricEntity.java

@@ -0,0 +1,40 @@
+package com.huimv.management.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@Data
+@TableName("mgt_consume_electric")
+public class ConsumeElectricEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private Double consumeElectric;
+	/**
+	 * 
+	 */
+	private Date collectTime;
+	/**
+	 * 
+	 */
+	private Integer deviceId;
+
+}

huimv-smart-management/src/main/java/com/huimv/management/entity/ConsumeWarterEntity.java

@@ -0,0 +1,40 @@
+package com.huimv.management.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 
+ * 
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@Data
+@TableName("mgt_consume_warter")
+public class ConsumeWarterEntity implements Serializable {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 
+	 */
+	@TableId
+	private Integer id;
+	/**
+	 * 
+	 */
+	private Double consumeWarter;
+	/**
+	 * 
+	 */
+	private Date collectTime;
+	/**
+	 * 
+	 */
+	private Integer deviceId;
+
+}

huimv-smart-management/src/main/java/com/huimv/management/service/ConsumeElectricService.java

@@ -0,0 +1,20 @@
+package com.huimv.management.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.management.entity.ConsumeElectricEntity;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+public interface ConsumeElectricService extends IService<ConsumeElectricEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

huimv-smart-management/src/main/java/com/huimv/management/service/ConsumeWarterService.java

@@ -0,0 +1,20 @@
+package com.huimv.management.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.management.entity.ConsumeWarterEntity;
+
+import java.util.Map;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+public interface ConsumeWarterService extends IService<ConsumeWarterEntity> {
+
+    PageUtils queryPage(Map<String, Object> params);
+}
+

huimv-smart-management/src/main/java/com/huimv/management/service/EartagDateService.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huimv.common.utils.PageUtils;
 import com.huimv.management.entity.EartagDateEntity;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,5 +22,7 @@ public interface EartagDateService extends IService<EartagDateEntity> {
 
 
       Map queryPageBytimeAndEartag(Map<String, Object> params);
+
+    Map getTemperatureCurve(Map<String, Object> params);
 }
 

huimv-smart-management/src/main/java/com/huimv/management/service/impl/ConsumeElectricServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huimv.management.service.impl;
+
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.Query;
+
+import com.huimv.management.dao.ConsumeElectricDao;
+import com.huimv.management.entity.ConsumeElectricEntity;
+import com.huimv.management.service.ConsumeElectricService;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@Service("consumeElectricService")
+public class ConsumeElectricServiceImpl extends ServiceImpl<ConsumeElectricDao, ConsumeElectricEntity> implements ConsumeElectricService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<ConsumeElectricEntity> page = this.page(
+                new Query<ConsumeElectricEntity>().getPage(params),
+                new QueryWrapper<ConsumeElectricEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

huimv-smart-management/src/main/java/com/huimv/management/service/impl/ConsumeWarterServiceImpl.java

@@ -0,0 +1,35 @@
+package com.huimv.management.service.impl;
+
+import org.springframework.stereotype.Service;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.utils.PageUtils;
+import com.huimv.common.utils.Query;
+
+import com.huimv.management.dao.ConsumeWarterDao;
+import com.huimv.management.entity.ConsumeWarterEntity;
+import com.huimv.management.service.ConsumeWarterService;
+
+/**
+ * 
+ *
+ * @author yinhao
+ * @version ${version}
+ * @date 2021-07-12 17:31:40
+ */
+@Service("consumeWarterService")
+public class ConsumeWarterServiceImpl extends ServiceImpl<ConsumeWarterDao, ConsumeWarterEntity> implements ConsumeWarterService {
+
+    @Override
+    public PageUtils queryPage(Map<String, Object> params) {
+        IPage<ConsumeWarterEntity> page = this.page(
+                new Query<ConsumeWarterEntity>().getPage(params),
+                new QueryWrapper<ConsumeWarterEntity>()
+        );
+
+        return new PageUtils(page);
+    }
+
+}

huimv-smart-management/src/main/java/com/huimv/management/service/impl/EartagDateServiceImpl.java

@@ -1,7 +1,10 @@
 package com.huimv.management.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.DateFormat;
@@ -23,7 +26,8 @@ import com.huimv.management.service.EartagDateService;
 @Service("eartagDateService")
 public class EartagDateServiceImpl extends ServiceImpl<EartagDateDao, EartagDateEntity> implements EartagDateService {
 
-
+    @Autowired
+    private EartagDateDao eartagDateDao;
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
@@ -103,26 +107,31 @@ public class EartagDateServiceImpl extends ServiceImpl<EartagDateDao, EartagDate
         return map1;
     }
 
-
-/*
-    public static void main(String[] args) {
-        Map<String, Object> params = new HashMap<>();
-        params.put("d","sa");
+    @Override
+    public Map getTemperatureCurve(Map<String, Object> params) {
+        String eartag = (String)params.get("eartag");
+        String startTime = (String)params.get("startTime");
+        String endTime = (String)params.get("endTime");
 
         LambdaQueryWrapper<EartagDateEntity> lambdaQuery = Wrappers.lambdaQuery();
 
-        lambdaQuery.eq(EartagDateEntity::getEartagId, "sdasda456");
-        lambdaQuery.between(EartagDateEntity::getCreateTime, new Date(),  new Date());
-
-
-        IPage<EartagDateEntity> page = page(<IPage<EartagDateEntity>>page(
-                new Query<EartagDateEntity>().getPage(params)
-        ), lambdaQuery);
+        lambdaQuery.eq(StringUtils.isNotBlank(eartag),EartagDateEntity::getEartagId,eartag);
+        lambdaQuery.le(StringUtils.isNotBlank(endTime),EartagDateEntity::getCreateTime,endTime);
+        lambdaQuery.ge(StringUtils.isNotBlank(startTime),EartagDateEntity::getCreateTime,startTime);
 
+        List<EartagDateEntity> eartagDateEntities = baseMapper.selectList(lambdaQuery);
 
-        System.out.println("结果为"+page);
-
+        List timeList = new ArrayList();
+        List dataList = new ArrayList();
+        for (EartagDateEntity eartagDateEntity : eartagDateEntities) {
+            timeList.add(eartagDateEntity.getCreateTime());
+            dataList.add(eartagDateEntity.getEartagTemp());
+        }
 
-    }*/
+        Map map = new HashMap();
+        map.put("timeList",timeList);
+        map.put("dataList",dataList);
+        return map;
+    }
 }
 

huimv-smart-management/src/main/resources/application-dev.yml

@@ -21,7 +21,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.1.44:8848
 
   # 数据源
   datasource:

huimv-smart-management/src/main/resources/mapper/management/ConsumeElectricDao.xml

@@ -0,0 +1,15 @@
+<?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.management.dao.ConsumeElectricDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.management.entity.ConsumeElectricEntity" id="consumeElectricMap">
+        <result property="id" column="id"/>
+        <result property="consumeElectric" column="consume_electric"/>
+        <result property="collectTime" column="collect_time"/>
+        <result property="deviceId" column="device_id"/>
+    </resultMap>
+
+
+</mapper>

huimv-smart-management/src/main/resources/mapper/management/ConsumeWarterDao.xml

@@ -0,0 +1,15 @@
+<?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.management.dao.ConsumeWarterDao">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="com.huimv.management.entity.ConsumeWarterEntity" id="consumeWarterMap">
+        <result property="id" column="id"/>
+        <result property="consumeWarter" column="consume_warter"/>
+        <result property="collectTime" column="collect_time"/>
+        <result property="deviceId" column="device_id"/>
+    </resultMap>
+
+
+</mapper>