新增接口：

1、读取样板间所有绑定设备；
2、设定样板间设备状态；

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/controller/LampTempController.java

@@ -1,21 +0,0 @@
-package com.huimv.env.common.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/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/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/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/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/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/LampConfigAllServiceImpl.java

@@ -4,14 +4,13 @@ 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.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.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;
@@ -70,7 +69,6 @@ public class LampConfigAllServiceImpl extends ServiceImpl<LampConfigAllMapper, L
         String farmCode = map.get("farmCode");
         //保温灯温度
         BigDecimal lampTempBd = lampTempService.getLastLampTemp(farmCode);
-
         //开启数量、关闭数量
         int openCount = 0;
         int closeCount = 0;
@@ -80,8 +78,6 @@ public class LampConfigAllServiceImpl extends ServiceImpl<LampConfigAllMapper, L
         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);
@@ -90,8 +86,6 @@ public class LampConfigAllServiceImpl extends ServiceImpl<LampConfigAllMapper, L
         return new Result(ResultCode.SUCCESS,resultMap);
     }
 
-
-
     //获取任意统一配置
     private JSONArray _getConfigTempList(String farmCode) {
         QueryWrapper<LampConfigAll> queryWrapper = new QueryWrapper<>();

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;