完成猪仔保温（接口）功能。

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

@@ -1,4 +1,4 @@
-package com.huimv.env.manage.saas.controller;
+package com.huimv.env.common.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 EnvPhController {
+@RequestMapping("/lamp-temp")
+public class LampTempController {
 
 }
+

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/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/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/ILampTempService.java

@@ -1,5 +1,6 @@
 package com.huimv.env.common.service;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 public interface ILampTempService {

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/LampTempServiceImpl.java

@@ -1,35 +1,40 @@
 package com.huimv.env.common.service.impl;
 
-import com.huimv.env.common.dao.entity.LampTempEntity;
-import com.huimv.env.common.dao.repo.LampTempEntityRepo;
-import com.huimv.env.common.service.ILampTempService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.env.common.entity.LampTemp;
+import com.huimv.env.common.mapper.LampTempMapper;
+import com.huimv.env.common.service.LampTempService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import javax.xml.ws.ServiceMode;
-import java.sql.Timestamp;
-import java.util.Date;
+import javax.management.Query;
+import java.math.BigDecimal;
 
 /**
- * @Project : huimv-env-platform
- * @Package : ${}
- * @Description : TODO
- * @Version : 1.0
- * @Author : ZhuoNing
- * @Create : 2022/10/15
- **/
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author zn
+ * @since 2022-10-27
+ */
 @Service
-public class LampTempServiceImpl implements ILampTempService {
-    @Resource
-    private LampTempEntityRepo lampTempEntityRepo;
+public class LampTempServiceImpl extends ServiceImpl<LampTempMapper, LampTemp> implements LampTempService {
+    @Autowired
+    private LampTempMapper lampTempMapper;
 
     @Override
-    public int saveLampTemp(String deviceId, String temp, Date addTime) {
-        LampTempEntity lampTempEntity = new LampTempEntity();
-        lampTempEntity.setDeviceId(deviceId);
-        lampTempEntity.setTemp(temp);
-        lampTempEntity.setAddTime(new Timestamp(addTime.getTime()));
-        lampTempEntityRepo.saveAndFlush(lampTempEntity);
-        return 0;
+    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());
+        }
     }
 }

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>

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/LampTempController.java

@@ -0,0 +1,21 @@
+package com.huimv.env.manage.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author zn
+ * @since 2022-10-27
+ */
+@RestController
+@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/EnvPhMapper.java

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

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/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/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

@@ -7,6 +7,8 @@ import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -38,8 +40,10 @@ public class EnvPh implements Serializable {
 
     private String askTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     private LocalDateTime addTime;
 
+    @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/IEnvPhService.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 IEnvPhService 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/EnvPhServiceImpl.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.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/LampConfigAllServiceImpl.java

@@ -1,18 +1,25 @@
 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.common.mapper.LampTempMapper;
+import com.huimv.env.common.service.LampTempService;
+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.mapper.LampConfigAllMapper;
 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 +34,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 +64,79 @@ 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);
+        System.out.println("configTempList.size="+configTempList.size());
+
+        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/EnvPhService.java

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

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

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.env.common.utils.Const;
-import com.huimv.env.manage.entity.EnvPh;
 import com.huimv.env.manage.mapper.EnvPhMapper;
+import com.huimv.env.manage.saas.dao.entity.EnvPh;
 import com.huimv.env.manage.service.EnvPhService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;

huimv-env-platform/huimv-env-manage/src/main/resources/com/huimv/env/manage/mapper/LampConfigMapper.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>