Merge remote-tracking branch 'origin/master'

# Conflicts:
#	huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/LampTempServiceImpl.java
#	huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/LampTempController.java
#	huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/controller/EnvPhControllY.java
#	huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/controller/EnvPhController.java
#	huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/dao/entity/EnvPh.java
#	huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/service/IEnvPhServiceY.java
#	huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/saas/service/impl/EnvPhServiceImplY.java

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

@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -31,7 +33,7 @@ public class EnvWaterDay implements Serializable {
     private Integer sensorSn;
 
     private BigDecimal dayWater;
-
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date addDate;
 
     private String pigpenId;
@@ -45,9 +47,9 @@ public class EnvWaterDay implements Serializable {
     private BigDecimal startWater;
 
     private BigDecimal endWater;
-
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date startTime;
-
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date endTime;
 
     private BigDecimal linkRelativeRatio;

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

@@ -6,6 +6,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -44,8 +46,10 @@ public class EnvWaterMonth implements Serializable {
 
     private Integer year;
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date startTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private Date endTime;
 
     private BigDecimal startWater;

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

@@ -0,0 +1,48 @@
+package com.huimv.env.common.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author zn
+ * @since 2022-10-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class LampTemp implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备id
+     */
+    private String deviceId;
+
+    /**
+     * 温度数据
+     */
+    private String temp;
+
+    /**
+     * 添加时间
+     */
+    private Date addTime;
+
+    private String farmCode;
+
+    private String farmCdoe;
+
+
+}

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/mapper/EnvWaterMonthMapper.java

@@ -2,6 +2,9 @@ package com.huimv.env.common.mapper;
 
 import com.huimv.env.common.entity.EnvWaterMonth;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface EnvWaterMonthMapper extends BaseMapper<EnvWaterMonth> {
 
+    List<EnvWaterMonth> getWaterList(@Param("year") int year);
+
+//    List<Map<String,Object>> getWaterList(@Param(Constants.WRAPPER) QueryWrapper<EnvWaterMonth> ew);
+//    List<Map<String,Object>> getWaterList(@Param("ew") Wrapper<EnvWaterMonth> ew);
+//        List<Map<String,Object>> getWaterList();
+
 }

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/mapper/LampTempMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.env.common.mapper;
+
+import com.huimv.env.common.entity.LampTemp;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author zn
+ * @since 2022-10-27
+ */
+public interface LampTempMapper extends BaseMapper<LampTemp> {
+
+}

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/mapper/xml/EnvWaterMonthMapper.xml

@@ -24,5 +24,17 @@
     <sql id="Base_Column_List">
         id, device_code, sensor_sn, month_water, pigpen_id, unit_id, farm_code, data_unit, month, year, start_time, end_time, start_water, end_water
     </sql>
+    <select id="getWaterList" resultType="com.huimv.env.common.entity.EnvWaterMonth" parameterType="int">
+         SELECT * from env_water_month where year=#{year}
+    </select>
+
+    <!--    <select id="getWaterList" resultType="com.huimv.env.common.entity.EnvWaterMonth">-->
+<!--        SELECT * from env_water_month where year=#{year}-->
+<!--    </select>-->
+
+    <!--    <select id="getWaterList" resultType="java.util.Map">-->
+<!--&#45;&#45;         SELECT year,month,month_water from env_water_month ${ew.customSqlSegment}-->
+<!--        SELECT year,month,month_water from env_water_month-->
+<!--    </select>-->
 
 </mapper>

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/mapper/xml/LampTempMapper.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.common.mapper.LampTempMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.env.common.entity.LampTemp">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="temp" property="temp" />
+        <result column="add_time" property="addTime" />
+        <result column="farm_code" property="farmCode" />
+        <result column="farm_cdoe" property="farmCdoe" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, device_id, temp, add_time, farm_code, farm_cdoe
+    </sql>
+
+</mapper>

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

@@ -28,4 +28,6 @@ public interface EnvElectricityDayService extends IService<EnvElectricityDay> {
     void updateDayElectricity(EnvElectricityDay envElectricityDay, JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode);
 
     Result getTodayElectricity(Map<String, String> paramsMap) throws ParseException;
+
+    Result getElectricityCount(Map<String, String> paramsMap) throws ParseException;
 }

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

@@ -7,6 +7,7 @@ import com.huimv.env.common.entity.EnvElectricityMonth;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.sql.Timestamp;
+import java.text.ParseException;
 import java.util.Map;
 
 /**
@@ -25,5 +26,5 @@ public interface EnvElectricityMonthService extends IService<EnvElectricityMonth
 
     void updateMonthElectricity(EnvElectricityMonth envElectricityMonth, JSONObject dataJo, Timestamp nowTimestamp);
 
-    Result getMonthElectricity(Map<String, String> paramsMap);
+    Result getDayAndMonthElectricityList(Map<String, String> paramsMap) throws ParseException;
 }

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

@@ -31,6 +31,8 @@ public interface EnvWaterDayService extends IService<EnvWaterDay> {
 
     Result getTodayWater(Map<String, String> paramsMap) throws ParseException;
 
+    Result getWaterCount(Map<String, String> paramsMap) throws ParseException;
+
 //    void saveDayElectricity(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode);
 
 //    void updateDayElectricity(EnvElectricityDay envElectricityDay, JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode);

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

@@ -7,6 +7,7 @@ import com.huimv.env.common.entity.EnvWaterMonth;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.sql.Timestamp;
+import java.text.ParseException;
 import java.util.Map;
 
 /**
@@ -27,5 +28,5 @@ public interface EnvWaterMonthService extends IService<EnvWaterMonth> {
 
     EnvWaterMonth getMonthWaterConsumption(String farmCode, String deviceCode, String sensorSn, String year, String month);
 
-    Result getMonthWater(Map<String, String> paramsMap);
+    Result getDayAndMonthWaterList(Map<String, String> paramsMap) throws ParseException;
 }

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

@@ -1,8 +1,10 @@
 package com.huimv.env.common.service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 public interface ILampTempService {
     int saveLampTemp(String deviceId, String temp, Date addTime);
+    BigDecimal getLastLampTemp(String farmCode);
 
 }

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

@@ -0,0 +1,19 @@
+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/EnvElectricityDayServiceImpl.java

@@ -6,8 +6,10 @@ import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvElectricityDay;
+import com.huimv.env.common.entity.EnvElectricityMonth;
 import com.huimv.env.common.entity.EnvWaterDay;
 import com.huimv.env.common.mapper.EnvElectricityDayMapper;
+import com.huimv.env.common.mapper.EnvElectricityMonthMapper;
 import com.huimv.env.common.service.EnvElectricityDayService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.env.common.utils.Const;
@@ -33,6 +35,8 @@ import java.util.Map;
 public class EnvElectricityDayServiceImpl extends ServiceImpl<EnvElectricityDayMapper, EnvElectricityDay> implements EnvElectricityDayService {
     @Resource
     private EnvElectricityDayMapper envElectricityDayMapper;
+    @Resource
+    private EnvElectricityMonthMapper envElectricityMonthMapper;
 
     @Override
     public EnvElectricityDay getDayElectricityConsumption(String farmCode, String deviceCode, String sensorSn, Date todayDate) {
@@ -59,7 +63,55 @@ public class EnvElectricityDayServiceImpl extends ServiceImpl<EnvElectricityDayM
         }else{
             return new Result(ResultCode.SUCCESS,envElectricityDay);
         }
+    }
+
+    @Override
+    public Result getElectricityCount(Map<String, String> paramsMap) throws ParseException {
+        //今日用电
+        EnvElectricityDay envElectricityDay = _getDayElectricityCount(paramsMap);
+        BigDecimal todayCountBd = new BigDecimal(0);
+        BigDecimal todayLinkrelativeRatioBd = new BigDecimal(0);
+        if(envElectricityDay != null){
+            todayCountBd = envElectricityDay.getDayElectricity();
+            todayLinkrelativeRatioBd = envElectricityDay.getLinkRelativeRatio();
+        }
+
+        //本月用电
+        EnvElectricityMonth envElectricityMonth = _getMonthElectricityCount(paramsMap);
+        BigDecimal monthCountBd = new BigDecimal(0);
+        BigDecimal monthLinkrelativeRatioBd = new BigDecimal(0);
+        if(envElectricityMonth != null){
+            monthCountBd = envElectricityMonth.getMonthElectricity();
+            monthLinkrelativeRatioBd = envElectricityMonth.getLinkRelativeRatio();
+        }
+
+        JSONObject resultJo = new JSONObject();
+        resultJo.put("todayCount",todayCountBd);
+        resultJo.put("todayLinkrelativeRatio",todayLinkrelativeRatioBd);
+        resultJo.put("monthCount",monthCountBd);
+        resultJo.put("monthLinkrelativeRatio",monthLinkrelativeRatioBd);
+        return new Result(ResultCode.SUCCESS,resultJo);
+    }
+
+    //本月用电
+    private EnvElectricityMonth _getMonthElectricityCount(Map<String, String> paramsMap) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        String farmCode = paramsMap.get("farmCode");
+        QueryWrapper<EnvElectricityMonth> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("year", dateUtil.getThisYear());
+        queryWrapper.eq("month", dateUtil.getThisMonth());
+        return envElectricityMonthMapper.selectOne(queryWrapper);
+    }
 
+    //今日用电
+    private EnvElectricityDay _getDayElectricityCount(Map<String, String> paramsMap) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        String farmCode = paramsMap.get("farmCode");
+        QueryWrapper<EnvElectricityDay> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("add_date", dateUtil.getTodayDate());
+        return envElectricityDayMapper.selectOne(queryWrapper);
     }
 
     @Override

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

@@ -5,17 +5,23 @@ 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.dao.entity.EnvDeviceRegisterEntity;
+import com.huimv.env.common.entity.EnvElectricityDay;
 import com.huimv.env.common.entity.EnvElectricityMonth;
 import com.huimv.env.common.entity.EnvWaterMonth;
+import com.huimv.env.common.mapper.EnvElectricityDayMapper;
 import com.huimv.env.common.mapper.EnvElectricityMonthMapper;
 import com.huimv.env.common.service.EnvElectricityMonthService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.env.common.utils.DateUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -31,6 +37,8 @@ import java.util.Map;
 public class EnvElectricityMonthServiceImpl extends ServiceImpl<EnvElectricityMonthMapper, EnvElectricityMonth> implements EnvElectricityMonthService {
     @Resource
     private EnvElectricityMonthMapper envElectricityMonthMapper;
+    @Resource
+    private EnvElectricityDayMapper envElectricityDayMapper;
 
     @Override
     public EnvElectricityMonth getMonthElectricityConsumption(String farmCode, String deviceCode, String sensorSn, String year, String month) {
@@ -80,7 +88,43 @@ public class EnvElectricityMonthServiceImpl extends ServiceImpl<EnvElectricityMo
     }
 
     @Override
-    public Result getMonthElectricity(Map<String, String> paramsMap) {
+    public Result getDayAndMonthElectricityList(Map<String, String> paramsMap) throws ParseException {
+        String months = paramsMap.get("months");
+        String days = paramsMap.get("days");
+        if(StringUtils.isNotBlank(months) && StringUtils.isBlank(days)){
+            //月份历史用电列表
+            return new Result(ResultCode.SUCCESS,_getMonthElectricityList(paramsMap));
+        }else if(StringUtils.isBlank(months) && StringUtils.isNotBlank(days)){
+            //天数历史用电列表
+            return new Result(ResultCode.SUCCESS,_getDayElectricityList(paramsMap));
+        }else{
+            return new Result(ResultCode.FAIL,"months和days参数异常，只能二选一。");
+        }
+    }
+
+    //天数历史用电列表
+    private Object _getDayElectricityList(Map<String, String> paramsMap) throws ParseException {
+        String farmCode = paramsMap.get("farmCode");
+        String days = paramsMap.get("days");
+        QueryWrapper<EnvElectricityDay> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.orderByDesc("add_date");
+        queryWrapper.last("LIMIT "+days);
+        List<EnvElectricityDay> envElectricityDayList = envElectricityDayMapper.selectList(queryWrapper);
+        List monthList = new ArrayList();
+        DateUtil dateUtil = new DateUtil();
+        for(int a=envElectricityDayList.size()-1;a>=0;a--){
+            EnvElectricityDay envElectricityDay = envElectricityDayList.get(a);
+            Map<String,Object> map = new HashMap<>();
+            map.put("datetime", dateUtil.formatDateText(envElectricityDay.getAddDate()));
+            map.put("electricity",envElectricityDay.getDayElectricity());
+            monthList.add(map);
+        }
+        return new Result(ResultCode.SUCCESS,monthList);
+    }
+
+    //月份历史用电列表
+    private Object _getMonthElectricityList(Map<String, String> paramsMap) {
         String farmCode = paramsMap.get("farmCode");
         String months = paramsMap.get("months");
         QueryWrapper<EnvElectricityMonth> queryWrapper = new QueryWrapper();
@@ -90,7 +134,11 @@ public class EnvElectricityMonthServiceImpl extends ServiceImpl<EnvElectricityMo
         List<EnvElectricityMonth> envElectricityMonthList = envElectricityMonthMapper.selectList(queryWrapper);
         List monthList = new ArrayList();
         for(int a=envElectricityMonthList.size()-1;a>=0;a--){
-            monthList.add(envElectricityMonthList.get(a));
+            EnvElectricityMonth envElectricityMonth = envElectricityMonthList.get(a);
+            Map<String,Object> map = new HashMap<>();
+            map.put("datetime",envElectricityMonth.getYear()+"-"+envElectricityMonth.getMonth());
+            map.put("electricity",envElectricityMonth.getMonthElectricity());
+            monthList.add(map);
         }
         return new Result(ResultCode.SUCCESS,monthList);
     }

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

@@ -6,7 +6,9 @@ import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
 import com.huimv.env.common.entity.EnvWaterDay;
+import com.huimv.env.common.entity.EnvWaterMonth;
 import com.huimv.env.common.mapper.EnvWaterDayMapper;
+import com.huimv.env.common.mapper.EnvWaterMonthMapper;
 import com.huimv.env.common.service.EnvWaterDayService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.env.common.utils.Const;
@@ -18,6 +20,8 @@ import java.math.BigDecimal;
 import java.sql.Date;
 import java.sql.Timestamp;
 import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,6 +36,8 @@ import java.util.Map;
 public class EnvWaterDayServiceImpl extends ServiceImpl<EnvWaterDayMapper, EnvWaterDay> implements EnvWaterDayService {
     @Resource
     private EnvWaterDayMapper envWaterDayMapper;
+    @Resource
+    private EnvWaterMonthMapper envWaterMonthMapper;
 
     @Override
     public EnvWaterDay getDayWaterConsumption(String farmCode, String deviceCode, String sensorSn, Date todayDate) {
@@ -62,6 +68,57 @@ public class EnvWaterDayServiceImpl extends ServiceImpl<EnvWaterDayMapper, EnvWa
     }
 
     @Override
+    public Result getWaterCount(Map<String, String> paramsMap) throws ParseException {
+        //-- 今日用水统计(今日用水消耗和环比) --//
+        EnvWaterDay envWaterDay = _getTodayWaterCount(paramsMap);
+        BigDecimal todayCount = new BigDecimal(0);
+        BigDecimal todayLinkRelativeRatio = new BigDecimal(0);
+        if(envWaterDay != null){
+            todayCount = envWaterDay.getDayWater();
+            todayLinkRelativeRatio = envWaterDay.getLinkRelativeRatio();
+        }
+        //-- 本月用水统计(本月用水消耗和环比) --//
+        EnvWaterMonth envWaterMonth = _getMonthWaterCount(paramsMap);
+        BigDecimal thisMonthCount = new BigDecimal(0);
+        BigDecimal thisMonthLinkRelativeRatio = new BigDecimal(0);
+        if(envWaterMonth != null){
+            thisMonthCount = envWaterMonth.getMonthWater();
+            thisMonthLinkRelativeRatio = envWaterMonth.getLinkRelativeRatio();
+        }
+        JSONObject resultJo = new JSONObject();
+        resultJo.put("todayCount",todayCount);
+        resultJo.put("todayLinkRelativeRatio",todayLinkRelativeRatio);
+        resultJo.put("thisMonthCount",thisMonthCount);
+        resultJo.put("thisMonthLinkRelativeRatio",thisMonthLinkRelativeRatio);
+        return new Result(ResultCode.SUCCESS,resultJo);
+    }
+
+    //获取本月用水统计
+    private EnvWaterMonth _getMonthWaterCount(Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        DateUtil dateUtil = new DateUtil();
+        QueryWrapper<EnvWaterMonth> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("year",dateUtil.getThisYear());
+        queryWrapper.eq("month",dateUtil.getThisMonth());
+//        queryWrapper.orderByDesc("year").orderByDesc("month");
+//        queryWrapper.last("LIMIT 1");
+        return envWaterMonthMapper.selectOne(queryWrapper);
+    }
+
+    //获取今天用水统计
+    private EnvWaterDay _getTodayWaterCount(Map<String, String> paramsMap) throws ParseException {
+        DateUtil dateUtil = new DateUtil();
+        String farmCode = paramsMap.get("farmCode");
+        QueryWrapper<EnvWaterDay> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("add_date", dateUtil.getTodayDate());
+        //读取当天的记录(每天本牧场所有用水统计)
+        EnvWaterDay envWaterDay = envWaterDayMapper.selectOne(queryWrapper);
+        return envWaterDay;
+    }
+
+    @Override
     public void saveDayWater(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode) {
         String newWaterValue = dataJo.getString("value");
         BigDecimal newWaterBd = new BigDecimal(newWaterValue).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);

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

@@ -5,16 +5,22 @@ 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.dao.entity.EnvDeviceRegisterEntity;
+import com.huimv.env.common.entity.EnvWaterDay;
 import com.huimv.env.common.entity.EnvWaterMonth;
+import com.huimv.env.common.mapper.EnvWaterDayMapper;
 import com.huimv.env.common.mapper.EnvWaterMonthMapper;
 import com.huimv.env.common.service.EnvWaterMonthService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.env.common.utils.DateUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.sql.Timestamp;
+import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -30,6 +36,8 @@ import java.util.Map;
 public class EnvWaterMonthServiceImpl extends ServiceImpl<EnvWaterMonthMapper, EnvWaterMonth> implements EnvWaterMonthService {
     @Resource
     private EnvWaterMonthMapper envWaterMonthMapper;
+    @Resource
+    private EnvWaterDayMapper envWaterDayMapper;
 
     @Override
     public EnvWaterMonth getMonthWaterConsumption(String farmCode, String deviceCode, String sensorSn, String year, String month) {
@@ -43,19 +51,59 @@ public class EnvWaterMonthServiceImpl extends ServiceImpl<EnvWaterMonthMapper, E
     }
 
     @Override
-    public Result getMonthWater(Map<String, String> paramsMap) {
+    public Result getDayAndMonthWaterList(Map<String, String> paramsMap) throws ParseException {
         String farmCode = paramsMap.get("farmCode");
         String months = paramsMap.get("months");
+        String days = paramsMap.get("days");
+        if(StringUtils.isNotBlank(months) && StringUtils.isBlank(days)){
+            //查看12个月用水记录
+            return new Result(ResultCode.SUCCESS,_getMonthWaterList(farmCode,months));
+        }else if(StringUtils.isBlank(months) && StringUtils.isNotBlank(days)){
+            //查看30天用水记录
+            return new Result(ResultCode.SUCCESS,_getDayWaterList(farmCode,days));
+        }else{
+            System.out.println("months="+months);
+            System.out.println("days="+days);
+            return new Result(ResultCode.FAIL,"months和days两个参数只能二选一。");
+        }
+    }
+
+    //查看30天用水记录
+    private Object _getDayWaterList(String farmCode, String days) throws ParseException {
+        QueryWrapper<EnvWaterDay> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.orderByDesc("add_date");
+        queryWrapper.last("LIMIT "+days);
+        List<EnvWaterDay> envWaterDayList = envWaterDayMapper.selectList(queryWrapper);
+        List dayList = new ArrayList();
+        DateUtil dateUtil = new DateUtil();
+        for(int a=envWaterDayList.size()-1;a>=0;a--){
+            EnvWaterDay envWaterDay = envWaterDayList.get(a);
+            Map<String,Object> waterMap = new HashMap();
+            waterMap.put("datetime",dateUtil.formatDateText(envWaterDay.getAddDate()));
+            waterMap.put("water",envWaterDay.getDayWater());
+            dayList.add(waterMap);
+        }
+        return dayList;
+    }
+
+    //查看12个月用水记录
+    private Object _getMonthWaterList(String farmCode, String months) {
         QueryWrapper<EnvWaterMonth> queryWrapper = new QueryWrapper();
         queryWrapper.eq("farm_code", farmCode);
         queryWrapper.orderByDesc("year").orderByDesc("month");
         queryWrapper.last("LIMIT "+months);
+//        List<Map<String,Object>> envWaterMonthList = envWaterMonthMapper.getWaterList();
         List<EnvWaterMonth> envWaterMonthList = envWaterMonthMapper.selectList(queryWrapper);
         List monthList = new ArrayList();
         for(int a=envWaterMonthList.size()-1;a>=0;a--){
-            monthList.add(envWaterMonthList.get(a));
+            EnvWaterMonth envWaterMonth = envWaterMonthList.get(a);
+            Map<String,Object> waterMonthMap = new HashMap<>();
+            waterMonthMap.put("datetime",envWaterMonth.getYear()+"-"+envWaterMonth.getMonth());
+            waterMonthMap.put("water",envWaterMonth.getMonthWater());
+            monthList.add(waterMonthMap);
         }
-        return new Result(ResultCode.SUCCESS,monthList);
+        return monthList;
     }
 
     @Override

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

@@ -1,18 +1,23 @@
 package com.huimv.env.common.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.entity.LampTemp;
+import com.huimv.env.common.mapper.LampTempMapper;
 import com.huimv.env.common.service.ILampTempService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import javax.xml.ws.ServiceMode;
+import java.math.BigDecimal;
 import java.sql.Timestamp;
 import java.util.Date;
-import java.util.Optional;
 
 /**
  * @Project : huimv-env-platform
@@ -24,6 +29,24 @@ import java.util.Optional;
  **/
 @Service
 public class LampTempServiceImpl implements ILampTempService {
+    @Autowired
+    private LampTempMapper lampTempMapper;
+
+    @Override
+    public BigDecimal getLastLampTemp(String farmCode) {
+        QueryWrapper<LampTemp> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("farm_code",farmCode);
+        queryWrapper.orderByDesc("add_time");
+        queryWrapper.last("LIMIT 1");
+        LampTemp lampTemp = lampTempMapper.selectOne(queryWrapper);
+        if(lampTemp == null){
+            return new BigDecimal(0);
+        }else{
+            return new BigDecimal(lampTemp.getTemp());
+        }
+    }
+
+
     @Resource
     private LampTempEntityRepo lampTempEntityRepo;
     @Resource
@@ -32,7 +55,7 @@ public class LampTempServiceImpl implements ILampTempService {
     public int saveLampTemp(String deviceId, String temp, Date addTime) {
         LampConfigEntity LampConfigEntity = new LampConfigEntity();
         LampConfigEntity.setDeviceId(deviceId);
-      Example<LampConfigEntity> example = Example.of(LampConfigEntity);
+        Example<LampConfigEntity> example = Example.of(LampConfigEntity);
         LampConfigEntity one = lampConfigEntityRepo.findOne(example).get();
         if (ObjectUtil.isEmpty(one)){
             System.out.println("保温灯不存在");
@@ -48,3 +71,4 @@ public class LampTempServiceImpl implements ILampTempService {
         return 0;
     }
 }
+

huimv-env-platform/huimv-env-manage/pom.xml

@@ -51,8 +51,6 @@
             <version>2.2.3</version>
             <classifier>jdk15</classifier>
         </dependency>
-
-
         <dependency>
             <groupId>com.belerweb</groupId>
             <artifactId>pinyin4j</artifactId>
@@ -139,9 +137,14 @@
 <!--            <artifactId>spring-boot-starter-freemarker</artifactId>-->
 <!--        </dependency>-->
         <!-- junit -->
+<!--        <dependency>-->
+<!--            <groupId>org.junit.platform</groupId>-->
+<!--            <artifactId>junit-platform-commons</artifactId>-->
+<!--        </dependency>-->
+        <!-- junit -->
         <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-commons</artifactId>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
         </dependency>
         <!--rabbitmq-->
         <dependency>
@@ -168,5 +171,16 @@
                 <version>2.6</version>
             </plugin>
         </plugins>
+
+<!--        <resources>-->
+<!--            <resource>-->
+<!--                <directory>src/main/java</directory>-->
+<!--                <includes>-->
+<!--                    <include>**/*.xml</include>-->
+<!--                </includes>-->
+<!--                <filtering>true</filtering>-->
+<!--            </resource>-->
+<!--        </resources>-->
     </build>
+
 </project>

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/HuimvEnvManageApplication.java

@@ -30,6 +30,7 @@ import org.springframework.web.client.RestTemplate;
 @EnableScheduling
 @ComponentScans({@ComponentScan("com.huimv.env.common.service"),@ComponentScan("com.huimv.env.common.utils")})
 @MapperScan("com.huimv.env.*.mapper")
+//@MapperScan("com.huimv.env.manage.mapper")
 @EntityScan(value = "com.huimv.env.common.dao.entity")
 @EnableJpaRepositories(basePackages = "com.huimv.env.common.dao.repo")
 public class HuimvEnvManageApplication {

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

@@ -2,7 +2,6 @@ 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/EnvElectricityDayController.java

@@ -37,10 +37,17 @@ public class EnvElectricityDayController {
         return envElectricityDayService.getTodayElectricity(paramsMap);
     }
 
-    @PostMapping("/getMonthElectricity")
-    public Result getMonthElectricity(@RequestBody Map<String, String> paramsMap) throws ParseException {
+    @PostMapping("/getDayAndMonthElectricityList")
+    public Result getDayAndMonthElectricityList(@RequestBody Map<String, String> paramsMap) throws ParseException {
         //
-        return envElectricityMonthService.getMonthElectricity(paramsMap);
+        return envElectricityMonthService.getDayAndMonthElectricityList(paramsMap);
     }
+
+    @PostMapping("/getElectricityCount")
+    public Result getElectricityCount(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return envElectricityDayService.getElectricityCount(paramsMap);
+    }
+
 }
 

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

@@ -17,7 +17,7 @@ import java.util.Map;
  *  前端控制器
  * </p>
  *
- * @author zn
+ * @author author
  * @since 2022-10-26
  */
 @RestController
@@ -31,9 +31,9 @@ public class EnvPhController {
      * @Description : 读取最新ph数值
      * @Params      : [paramsMap]
      * @Return      : com.huimv.common.utils.Result
-     * 
+     *
      * @Author      : ZhuoNing
-     * @Date        : 2022/10/26       
+     * @Date        : 2022/10/26
      * @Time        : 13:56
      */
     @PostMapping("/getPh")
@@ -41,4 +41,3 @@ public class EnvPhController {
         return envPhService.getPh(paramsMap);
     }
 }
-

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

@@ -37,10 +37,26 @@ public class EnvWaterDayController {
         return envWaterDayService.getTodayWater(paramsMap);
     }
 
-    @PostMapping("/getMonthWater")
-    public Result getMonthWater(@RequestBody Map<String, String> paramsMap) throws ParseException {
+    @PostMapping("/getDayAndMonthWaterList")
+    public Result getDayAndMonthWaterList(@RequestBody Map<String, String> paramsMap) throws ParseException {
         //
-        return envWaterMonthService.getMonthWater(paramsMap);
+        return envWaterMonthService.getDayAndMonthWaterList(paramsMap);
+    }
+
+    /**
+     * @Method      : getWaterCount
+     * @Description : 今天和本月用水量
+     * @Params      : [paramsMap]
+     * @Return      : com.huimv.common.utils.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/10/28
+     * @Time        : 9:26
+     */
+    @PostMapping("/getWaterCount")
+    public Result getWaterCount(@RequestBody Map<String, String> paramsMap) throws ParseException {
+        //
+        return envWaterDayService.getWaterCount(paramsMap);
     }
 }
 

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

@@ -1,4 +1,4 @@
-package com.huimv.env.manage.saas.controller;
+package com.huimv.env.manage.controller;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -10,11 +10,12 @@ import org.springframework.web.bind.annotation.RestController;
  *  前端控制器
  * </p>
  *
- * @author author
- * @since 2022-10-26
+ * @author zn
+ * @since 2022-10-27
  */
 @RestController
-@RequestMapping("/env-ph")
-public class EnvPhControllY {
+@RequestMapping("/lamp-temp")
+public class LampTempController {
 
 }
+

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

@@ -1,13 +1,10 @@
 package com.huimv.env.manage.entity;
 
-import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.util.Date;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,38 +14,35 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author zn
- * @since 2022-10-26
+ * @since 2022-10-27
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class EnvPh implements Serializable {
+public class LampTemp 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;
+    /**
+     * 设备id
+     */
+    private String deviceId;
 
-    private String askTime;
+    /**
+     * 温度数据
+     */
+    private String temp;
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    /**
+     * 添加时间
+     */
     private Date addTime;
 
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date addDate;
-
-    private String pigpenId;
-
-    private String unitId;
-
     private String farmCode;
 
-    private String dataUnit;
+    private String farmCdoe;
 
 
 }

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

@@ -1,15 +1,15 @@
 package com.huimv.env.manage.mapper;
 
-import com.huimv.env.manage.saas.dao.entity.EnvDeviceEquipment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huimv.env.manage.saas.dao.entity.EnvDeviceEquipment;
 
 /**
  * <p>
  * 环控绑定设备 Mapper 接口
  * </p>
  *
- * @author author
- * @since 2022-10-18
+ * @author zn
+ * @since 2022-10-27
  */
 public interface EnvDeviceEquipmentMapper extends BaseMapper<EnvDeviceEquipment> {
 

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

@@ -2,6 +2,9 @@ package com.huimv.env.manage.mapper;
 
 import com.huimv.env.manage.saas.dao.entity.LampConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface LampConfigMapper extends BaseMapper<LampConfig> {
 
+    List<Integer> getOpenCloseStatus(@Param("farmCode") String farmCode);
 }

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

@@ -0,0 +1,22 @@
+<?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.EnvDeviceEquipmentMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.env.manage.entity.EnvDeviceEquipment">
+        <id column="id" property="id" />
+        <result column="equipment_name" property="equipmentName" />
+        <result column="unit_id" property="unitId" />
+        <result column="open_start" property="openStart" />
+        <result column="equipment_port" property="equipmentPort" />
+        <result column="device_code" property="deviceCode" />
+        <result column="upload_start" property="uploadStart" />
+        <result column="binding" property="binding" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, equipment_name, unit_id, open_start, equipment_port, device_code, upload_start, binding
+    </sql>
+
+</mapper>

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

@@ -1,9 +1,7 @@
 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;
@@ -53,4 +51,63 @@ public class EnvDeviceEquipmentController {
 
     }
 
+    /**
+     * @Method      : getEquipment
+     * @Description :
+     * @Params      : [farmCode,binding]
+     * @Return      : com.huimv.common.utils.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/10/27
+     * @Time        : 17:54
+     */
+    @PostMapping("/getEquipment")
+    public com.huimv.common.utils.Result getEquipment(@RequestBody Map<String,String> paramsMap){
+        return envDeviceEquipmentService.getEquipment(paramsMap);
+    }
+
+    /**
+     * @Method      : getShowRoomEquipment
+     * @Description :
+     * @Params      : [unitId,binding]
+     * @Return      : com.huimv.common.utils.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/10/27
+     * @Time        : 18:09
+     */
+    @PostMapping("/getShowRoomEquipment")
+    public com.huimv.common.utils.Result getShowRoomEquipment(@RequestBody Map<String,String> paramsMap){
+        return envDeviceEquipmentService.getShowRoomEquipment(paramsMap);
+    }
+
+    /**
+     * @Method      : setEquipmentStatus
+     * @Description :
+     * @Params      : [farmCode,deviceCode,port,status]
+     * @Return      : com.huimv.common.utils.Result
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2022/10/27
+     * @Time        : 17:55
+     */
+    @PostMapping("/setEquipmentStatus")
+    public com.huimv.common.utils.Result setEquipmentStatus(@RequestBody Map<String,String> paramsMap){
+        return envDeviceEquipmentService.setEquipmentStatus(paramsMap);
+    }
+
+    /**
+     * @Method      : setShowRoomEquipmentStatus
+     * @Description : 
+     * @Params      : [id,status]
+     * @Return      : com.huimv.common.utils.Result
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2022/10/27       
+     * @Time        : 19:01
+     */
+    @PostMapping("/setShowRoomEquipmentStatus")
+    public com.huimv.common.utils.Result setShowRoomEquipmentStatus(@RequestBody Map<String,String> paramsMap){
+        return envDeviceEquipmentService.setShowRoomEquipmentStatus(paramsMap);
+    }
 }

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

@@ -32,4 +32,9 @@ public class LampConfigAllController {
         return lampConfigAllService.listByFarmCode(map,request);
     }
 
+    @PostMapping("/getPigletLampInfo")
+    public Result getPigletLampInfo(@RequestBody Map<String, String> map, HttpServletRequest request){
+        return lampConfigAllService.getPigletLampInfo(map,request);
+    }
+
 }

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

@@ -3,10 +3,12 @@ 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 com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -38,9 +40,11 @@ public class EnvPh implements Serializable {
 
     private String askTime;
 
-    private Date addTime;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private LocalDateTime addTime;
 
-    private Date addDate;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    private LocalDate addDate;
 
     private String pigpenId;
 

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

@@ -1,8 +1,11 @@
 package com.huimv.env.manage.saas.service;
 
+import com.huimv.common.utils.Result;
 import com.huimv.env.manage.saas.dao.entity.EnvDeviceEquipment;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  * 环控绑定设备 服务类
@@ -12,5 +15,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2022-10-18
  */
 public interface IEnvDeviceEquipmentService extends IService<EnvDeviceEquipment> {
+    Result getEquipment(Map<String, String> paramsMap);
+
+    Result setEquipmentStatus(Map<String, String> paramsMap);
+
+    Result getShowRoomEquipment(Map<String, String> paramsMap);
 
+    Result setShowRoomEquipmentStatus(Map<String, String> paramsMap);
 }

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

@@ -1,16 +0,0 @@
-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 IEnvPhServiceY extends IService<EnvPh> {
-
-}

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

@@ -18,4 +18,6 @@ import java.util.Map;
 public interface ILampConfigAllService extends IService<LampConfigAll> {
 
     Result listByFarmCode(Map<String, String> map, HttpServletRequest request);
+
+    Result getPigletLampInfo(Map<String, String> map, HttpServletRequest request);
 }

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

@@ -1,11 +1,19 @@
 package com.huimv.env.manage.saas.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import com.huimv.env.manage.saas.dao.entity.EnvDeviceEquipment;
 import com.huimv.env.manage.mapper.EnvDeviceEquipmentMapper;
 import com.huimv.env.manage.saas.service.IEnvDeviceEquipmentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 环控绑定设备 服务实现类
@@ -17,4 +25,63 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnvDeviceEquipmentServiceImpl extends ServiceImpl<EnvDeviceEquipmentMapper, EnvDeviceEquipment> implements IEnvDeviceEquipmentService {
 
+    @Resource
+    private EnvDeviceEquipmentMapper envDeviceEquipmentMapper;
+
+    @Override
+    public Result getEquipment(Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        String binding = paramsMap.get("binding");
+        QueryWrapper<EnvDeviceEquipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq(StringUtils.isNotBlank(binding), "binding", binding);
+        List<EnvDeviceEquipment> envDeviceEquipmentList = envDeviceEquipmentMapper.selectList(queryWrapper);
+        return new Result(ResultCode.SUCCESS, envDeviceEquipmentList);
+    }
+
+    @Override
+    public Result setEquipmentStatus(Map<String, String> paramsMap) {
+        String farmCode = paramsMap.get("farmCode");
+        String deviceCode = paramsMap.get("deviceCode");
+        String port = paramsMap.get("port");
+        String status = paramsMap.get("status");
+        QueryWrapper<EnvDeviceEquipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code", farmCode);
+        queryWrapper.eq("device_code", deviceCode);
+        queryWrapper.eq("port", port);
+        EnvDeviceEquipment envDeviceEquipment = envDeviceEquipmentMapper.selectOne(queryWrapper);
+        envDeviceEquipment.setUploadStart(Integer.parseInt(status));
+        int rows = envDeviceEquipmentMapper.updateById(envDeviceEquipment);
+        if (rows == 0) {
+            return new Result(ResultCode.FAIL);
+        } else {
+            return new Result(ResultCode.SUCCESS);
+        }
+    }
+
+    @Override
+    public Result getShowRoomEquipment(Map<String, String> paramsMap) {
+        String unitId = paramsMap.get("unitId");
+        String binding = paramsMap.get("binding");
+        QueryWrapper<EnvDeviceEquipment> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("unit_id", unitId);
+        queryWrapper.eq(StringUtils.isNotBlank(binding), "binding", binding);
+        List<EnvDeviceEquipment> envDeviceEquipmentList = envDeviceEquipmentMapper.selectList(queryWrapper);
+        return new Result(ResultCode.SUCCESS, envDeviceEquipmentList);
+    }
+
+    @Override
+    public Result setShowRoomEquipmentStatus(Map<String, String> paramsMap) {
+        String id = paramsMap.get("id");
+        String status = paramsMap.get("status");
+        EnvDeviceEquipment envDeviceEquipment = new EnvDeviceEquipment();
+        envDeviceEquipment.setId(Integer.parseInt(id));
+        envDeviceEquipment.setUploadStart(Integer.parseInt(status));
+        int rows = envDeviceEquipmentMapper.updateById(envDeviceEquipment);
+        if (rows == 0) {
+            return new Result(ResultCode.FAIL);
+        } else {
+            return new Result(ResultCode.SUCCESS);
+        }
+    }
 }

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

@@ -1,20 +0,0 @@
-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.IEnvPhServiceY;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author author
- * @since 2022-10-26
- */
-@Service
-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/LampConfigAllServiceImpl.java

@@ -1,18 +1,24 @@
 package com.huimv.env.manage.saas.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.huimv.env.manage.saas.dao.entity.LampConfigAll;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.env.common.service.LampTempService;
 import com.huimv.env.manage.mapper.LampConfigAllMapper;
+import com.huimv.env.manage.mapper.LampConfigMapper;
+import com.huimv.env.manage.saas.dao.entity.LampConfig;
+import com.huimv.env.manage.saas.dao.entity.LampConfigAll;
 import com.huimv.env.manage.saas.service.ILampConfigAllService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.env.manage.utils.Result;
 import com.huimv.env.manage.utils.ResultCode;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,9 +33,12 @@ import java.util.Map;
  */
 @Service
 public class LampConfigAllServiceImpl extends ServiceImpl<LampConfigAllMapper, LampConfigAll> implements ILampConfigAllService {
-
     @Autowired
     private LampConfigAllMapper lampConfigAllMapper;
+    @Autowired
+    private LampConfigMapper lampConfigMapper;
+    @Autowired
+    private LampTempService lampTempService;
 
     @Override
     public Result listByFarmCode(Map<String, String> map, HttpServletRequest request) {
@@ -54,4 +63,74 @@ public class LampConfigAllServiceImpl extends ServiceImpl<LampConfigAllMapper, L
 
         return new Result(ResultCode.SUCCESS, endMap);
     }
+
+    @Override
+    public Result getPigletLampInfo(Map<String, String> map, HttpServletRequest request) {
+        String farmCode = map.get("farmCode");
+        //保温灯温度
+        BigDecimal lampTempBd = lampTempService.getLastLampTemp(farmCode);
+        //开启数量、关闭数量
+        int openCount = 0;
+        int closeCount = 0;
+        //获取设备开关数量
+        Map<String,Integer> lampConfigMap = _getLampConfigOpenCloseStatus(farmCode);
+        openCount = lampConfigMap.get("openCount");
+        closeCount = lampConfigMap.get("closeCount");
+        //任意一个单元的统一配置温度列表
+        JSONArray configTempList = _getConfigTempList(farmCode);
+        Map<String,Object> resultMap = new HashMap<>();
+        resultMap.put("lampTemp",lampTempBd);
+        resultMap.put("openCount",openCount);
+        resultMap.put("closeCount",closeCount);
+        resultMap.put("configTempList",configTempList);
+        return new Result(ResultCode.SUCCESS,resultMap);
+    }
+
+    //获取任意统一配置
+    private JSONArray _getConfigTempList(String farmCode) {
+        QueryWrapper<LampConfigAll> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code",farmCode);
+        queryWrapper.last("LIMIT 1");
+        LampConfigAll lampConfigAll = lampConfigAllMapper.selectOne(queryWrapper);
+        if(lampConfigAll == null){
+            return null;
+        }
+        String listDayage = lampConfigAll.getListDayage();
+        if(StringUtils.isBlank(listDayage)){
+            return null;
+        }
+        String[] listDayageArray = listDayage.split(";");
+        JSONArray resultJa = new JSONArray();
+        for(int a=0;a<listDayageArray.length;a++){
+            JSONObject newJo = new JSONObject();
+            resultJa.add(newJo);
+            String config = listDayageArray[a];
+            String[] configArray = config.split(",");
+            newJo.put("dayage",configArray[0]);
+            newJo.put("value",configArray[1]);
+        }
+        return resultJa;
+    }
+
+    //获取设备开关数量
+    private Map<String, Integer> _getLampConfigOpenCloseStatus(String farmCode) {
+        QueryWrapper<LampConfig> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("farm_code",farmCode);
+        List<Integer> lampConfigList = lampConfigMapper.getOpenCloseStatus(farmCode);
+        System.out.println("lampConfigList.size="+lampConfigList.size());
+        int openCount = 0;
+        int closeCount = 0;
+        for(int a=0;a<lampConfigList.size();a++){
+            int openStatus = lampConfigList.get(a);
+            if(openStatus == 0){
+                closeCount++;
+            }else{
+                openCount++;
+            }
+        }
+        Map<String,Integer> resultMap = new HashMap();
+        resultMap.put("openCount",openCount);
+        resultMap.put("closeCount",closeCount);
+        return resultMap;
+    }
 }

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

@@ -11,8 +11,8 @@ import com.huimv.env.manage.entity.dto.EnvDeviceRegisterDto;
 import com.huimv.env.manage.mapper.BasePigpenMapper;
 import com.huimv.env.manage.mapper.EnvDeviceRegisterMapper;
 import com.huimv.env.manage.saas.dao.entity.BasePigpen;
-import com.huimv.env.manage.saas.dao.entity.EnvDeviceEquipment;
 import com.huimv.env.manage.mapper.EnvDeviceEquipmentMapper;
+import com.huimv.env.manage.saas.dao.entity.EnvDeviceEquipment;
 import com.huimv.env.manage.service.IEnvDeviceRegisterService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.env.manage.utils.Result;

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

@@ -17,5 +17,8 @@
         <result column="open_start" property="openStart" />
         <result column="upload_start" property="uploadStart" />
     </resultMap>
+    <select id="getOpenCloseStatus" resultType="java.lang.Integer" parameterType="java.lang.String">
+        SELECT open_start FROM `lamp_config` WHERE farm_code = #{farmCode}
+    </select>
 
 </mapper>