添加环控基础

huimv-admin/pom.xml

@@ -87,8 +87,8 @@
         </dependency>
 
 
-        <!--nacos-->
-        <dependency>
+        <!--暂时不用nacos-->
+     <!--   <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
             <version>2021.1</version>
@@ -98,14 +98,14 @@
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
             <version>2021.1</version>
         </dependency>
-        <!--alibaba-->
+        &lt;!&ndash;alibaba&ndash;&gt;
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-alibaba-dependencies</artifactId>
             <version>2021.1</version>
             <type>pom</type>
             <scope>import</scope>
-        </dependency>
+        </dependency>-->
 
 </dependencies>
     <build>

huimv-admin/src/main/java/com/huimv/admin/HuimvAdminApplication.java

@@ -3,7 +3,6 @@ package com.huimv.admin;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 /**
  * @Package : com.huimv.biosafety.uface.controller
@@ -14,7 +13,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
  **/
 @SpringBootApplication
 @MapperScan("com.huimv.admin.mapper")
-@EnableDiscoveryClient
+//@EnableDiscoveryClient
 public class HuimvAdminApplication {
     public static void main(String[] args) {
         SpringApplication.run(HuimvAdminApplication.class, args);

huimv-admin/src/main/java/com/huimv/admin/common/utils/ResultCode.java

@@ -7,7 +7,7 @@ public enum ResultCode {
     UNAUTHENTICATED(false,10002,"您还未登录"),
     UNAUTHORISE(false,10003,"权限不足"),
     SERVER_ERROR(false,99999,"抱歉，系统繁忙，请稍后重试！"),
-
+    DATA_NULL(false,10004,"数据为空"),
     //---用户操作返回码  2xxxx----
     MOBILEORPASSWORDERROR(false,20001,"用户名或密码错误");
     //---企业操作返回码  3xxxx----

huimv-admin/src/main/java/com/huimv/admin/common/utils/ResultUtil.java

@@ -13,6 +13,13 @@ import org.springframework.stereotype.Component;
 @Component
 public class ResultUtil {
 
+    public static Result result(int rows){
+        if(rows == 0){
+            return new Result(ResultCode.FAIL,"处理失败.");
+        }else{
+            return new Result(ResultCode.SUCCESS,"处理成功.");
+        }
+    }
     public static Result getResult(Integer rows){
         if(rows > 0){
             return new Result(ResultCode.SUCCESS);
@@ -20,4 +27,7 @@ public class ResultUtil {
             return new Result(ResultCode.FAIL);
         }
     }
+    public static Result isNull(){
+        return new Result(ResultCode.DATA_NULL);
+    }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/AuthorizeController.java

@@ -66,12 +66,16 @@ public class AuthorizeController {
         return iAuthorizeService.getMenuByGroupAndFarm(map);
     }
 
-    @RequestMapping("/getMyMenu")
-    public Result getMyMenuAndButton(@RequestParam(name = "userId", required = true) String userId){
+    @PostMapping("/getMyMenu")
+    public Result getMyMenuAndButton(@RequestBody  Map<String,String> map){
         /*
          * 获取用户的菜单数据
          */
-        List<Menu> myMenu = iAuthorizeService.getMyMenuAll(userId);
+        String userId = map.get("userId");
+        String farmId = map.get("farmId");
+
+        List<Menu> myMenu = iAuthorizeService.getMyMenuAll(userId,farmId);
+
         List<Map> list = iMenuService.optimizeListUtil(0,myMenu);
         return new Result(ResultCode.SUCCESS,list);
     }
@@ -82,12 +86,14 @@ public class AuthorizeController {
 //    }
 
 
-    @GetMapping("/getMyButton")
-    public Result getMyButton(@RequestParam(name = "userId", required = true) Integer userId){
+    @PostMapping("/getMyButton")
+    public Result getMyButton(@RequestBody Map<String,Integer> map){
         /*
          * 获取用户的菜单数据
          */
-      List list = iAuthorizeService.getMyButton(userId);
+        Integer userId = map.get("userId");
+        Integer farmId = map.get("farmId");
+        List list = iAuthorizeService.getMyButton(userId,farmId);
         return new Result(ResultCode.SUCCESS,list);
     }
 

huimv-admin/src/main/java/com/huimv/admin/controller/BasePigpenController.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@RestController
+@RequestMapping("/basePigpen")
+public class BasePigpenController {
+
+}

huimv-admin/src/main/java/com/huimv/admin/controller/EnvDeviceController.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@RestController
+@RequestMapping("/envDevice")
+public class EnvDeviceController {
+
+}

huimv-admin/src/main/java/com/huimv/admin/controller/EnvDeviceMaintainController.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 设备维修记录 前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@RestController
+@RequestMapping("/envDeviceMaintain")
+public class EnvDeviceMaintainController {
+
+}

huimv-admin/src/main/java/com/huimv/admin/controller/EnvWarningInfoController.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@RestController
+@RequestMapping("/envWarningInfo")
+public class EnvWarningInfoController {
+
+}

huimv-admin/src/main/java/com/huimv/admin/controller/EnvWarningThresholdController.java

@@ -0,0 +1,48 @@
+package com.huimv.admin.controller;
+
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.service.IBasePigpenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@RestController
+@RequestMapping("/envWarningThreshold")
+public class EnvWarningThresholdController {
+    @Autowired
+    private IBasePigpenService basePigpenService;
+
+    @RequestMapping(value = "/list",method = RequestMethod.POST)
+    public Result list(@RequestBody Map<String, Object> paramsMap) {
+        System.out.println("paramsMap>>"+paramsMap.toString());
+        String farmCode = "";
+        if (paramsMap.get("farmId") != null) {
+            farmCode = paramsMap.get("farmId")+"";
+        }
+        String stageCode = "";
+        if (paramsMap.get("stageCode") != null) {
+            stageCode = paramsMap.get("stageCode")+"";
+        }
+        String pigpenName = "";
+        if (paramsMap.get("pigpenName") != null) {
+            pigpenName = paramsMap.get("pigpenName")+"";
+        }
+        return basePigpenService.list(farmCode,pigpenName,stageCode);
+    }
+
+}

huimv-admin/src/main/java/com/huimv/admin/controller/LoginController.java

@@ -1,5 +1,6 @@
 package com.huimv.admin.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.huimv.admin.entity.SysAccountMultilevel;
 import com.huimv.admin.service.ILoginService;
 import com.huimv.admin.session.AccessToken;
@@ -93,8 +94,6 @@ public class LoginController {
             AccessToken accessToken = new AccessToken();
             accessToken.setCreated(new Date());
             accessToken.setAccountName(accountName);
-            accessToken.setCode(result.getCode());
-            accessToken.setMessage(result.getMessage());
             accessToken.setFarmId(accountEntity.getFarmIds());
             String token = TokenSign.sign(accountName,id,accountEntity.getFarmIds());
             accessToken.setToken(token);
@@ -102,6 +101,13 @@ public class LoginController {
             accessToken.setId(id);
             accessToken.setLoginIp(remoteHost);
             accessToken.setType(accountEntity.getType());
+            Integer lastFarmId = accountEntity.getLastFarmId();
+            if (ObjectUtil.isEmpty(lastFarmId)){
+                lastFarmId = Integer.parseInt(accountEntity.getFarmIds().split(",")[0]);
+            }
+            accessToken.setLastFarmId(lastFarmId);
+            accessToken.setUserName(accountEntity.getUserName());
+
             return new Result(ResultCode.SUCCESS,accessToken);
         }
         return  result;

huimv-admin/src/main/java/com/huimv/admin/entity/BasePigpen.java

@@ -0,0 +1,56 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("base_pigpen")
+public class BasePigpen implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 栋舍名字
+     */
+    private String buildName;
+
+    /**
+     * 父级
+     */
+    private Integer parentId;
+
+    /**
+     * 1栋 2单元 3房间
+     */
+    private Integer fType;
+
+    private Integer farmId;
+
+    private Integer sort;
+
+    private String other1;
+
+    private String other2;
+
+    private String other3;
+
+
+}

huimv-admin/src/main/java/com/huimv/admin/entity/EnvDevice.java

@@ -0,0 +1,74 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_device")
+public class EnvDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 位置
+     */
+    private String buildLocation;
+
+    /**
+     * 房屋id
+     */
+    private Integer buildId;
+
+    /**
+     * 单元id
+     */
+    private Integer unitId;
+
+    /**
+     * 品牌
+     */
+    private String deviceBrand;
+
+    /**
+     * 0不在线  1在线
+     */
+    private Integer deviceStatus;
+
+    private Integer farmId;
+
+    private String ohter1;
+
+    private String ohter2;
+
+    private String ohter3;
+
+
+}

huimv-admin/src/main/java/com/huimv/admin/entity/EnvDeviceMaintain.java

@@ -0,0 +1,55 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 设备维修记录
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_device_maintain")
+public class EnvDeviceMaintain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 维修内容
+     */
+    private String maintainContent;
+
+    /**
+     * 维修时间
+     */
+    private LocalDate maintainTime;
+
+    /**
+     * 备注
+     */
+    private Integer remark;
+
+    private Integer farmId;
+
+    private String other1;
+
+    private String other2;
+
+    private byte[] other3;
+
+
+}

huimv-admin/src/main/java/com/huimv/admin/entity/EnvWarningInfo.java

@@ -0,0 +1,85 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_warning_info")
+public class EnvWarningInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 1.温度 2.湿度 3.NH3 4.co
+     */
+    private Integer warningType;
+
+    /**
+     * 报警内容
+     */
+    private String warningContent;
+
+    /**
+     * 位置
+     */
+    private String buildLocation;
+
+    /**
+     * 房屋id
+     */
+    private Integer buildId;
+
+    /**
+     * 单元id
+     */
+    private Integer unitId;
+
+    /**
+     * 设备id
+     */
+    private Integer deviceId;
+
+    /**
+     * 日期
+     */
+    private LocalTime date;
+
+    /**
+     * 人员id
+     */
+    private String userIds;
+
+    /**
+     * 人员名字
+     */
+    private String userNames;
+
+    private Integer farmId;
+
+    private String other1;
+
+    private String other2;
+
+    private String other3;
+
+
+}

huimv-admin/src/main/java/com/huimv/admin/entity/EnvWarningThreshold.java

@@ -0,0 +1,72 @@
+package com.huimv.admin.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_warning_threshold")
+public class EnvWarningThreshold implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 高温
+     */
+    private String maxTem;
+
+    /**
+     * 低温
+     */
+    private String minTem;
+
+    /**
+     * 高湿度
+     */
+    private String maxHum;
+
+    /**
+     * 低湿度
+     */
+    private String minHum;
+
+    private String maxNh3;
+
+    private String minNh3;
+
+    private String maxCo;
+
+    private String minCo;
+
+    /**
+     * 通知人员id
+     */
+    private String userIds;
+
+    private Integer farmId;
+
+    private String othre1;
+
+    private String othre2;
+
+    private String othre3;
+
+
+}

huimv-admin/src/main/java/com/huimv/admin/entity/SysAccountMultilevel.java

@@ -45,5 +45,7 @@ public class SysAccountMultilevel extends Model {
 
     private String userName;
     private Integer type;
+    private String farmNames;
+
 
 }

huimv-admin/src/main/java/com/huimv/admin/entity/vo/TreeBasePigpen.java

@@ -0,0 +1,37 @@
+package com.huimv.admin.entity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: TODO
+ * @Author: 静静
+ * @CreateTime: 2022-07-25  09:33
+ * @Version: 1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TreeBasePigpen implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    private String id;
+
+
+    private String pigpenName;
+
+    private Integer parentId;
+
+    private Integer type;
+
+    private Integer farmCode;
+
+    private  int sort;
+
+    private List<TreeBasePigpen> childNode;
+}

huimv-admin/src/main/java/com/huimv/admin/mapper/BasePigpenMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.BasePigpen;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+public interface BasePigpenMapper extends BaseMapper<BasePigpen> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/mapper/EnvDeviceMaintainMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.EnvDeviceMaintain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 设备维修记录 Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+public interface EnvDeviceMaintainMapper extends BaseMapper<EnvDeviceMaintain> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/mapper/EnvDeviceMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.EnvDevice;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+public interface EnvDeviceMapper extends BaseMapper<EnvDevice> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/mapper/EnvWarningInfoMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.EnvWarningInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+public interface EnvWarningInfoMapper extends BaseMapper<EnvWarningInfo> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/mapper/EnvWarningThresholdMapper.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.mapper;
+
+import com.huimv.admin.entity.EnvWarningThreshold;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+public interface EnvWarningThresholdMapper extends BaseMapper<EnvWarningThreshold> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/mapper/MenuMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
 @Repository
 public interface MenuMapper extends BaseMapper<Menu> {
 
-    List<Menu> getMyMenu(@Param("accountName") String accountName);
+    List<Menu> getMyMenu(@Param("accountName") String accountName, String[] array);
 
-    List<String> getMyButton(@Param("userId") Integer userId);
+    List<String> getMyButton(@Param("userId") Integer userId, String[] array);
 }

huimv-admin/src/main/java/com/huimv/admin/service/IAuthorizeService.java

@@ -20,9 +20,9 @@ public interface IAuthorizeService {
     Result getAccountByGroup(String groupId);
 
 
-    List getMyMenuAll(String accountName);
+    List getMyMenuAll(String accountName,String farmId);
 
-    List getMyButton(Integer userId);
+    List getMyButton(Integer userId, Integer farmId);
 
     List getMyMenuMultilevel(String userId);
 

huimv-admin/src/main/java/com/huimv/admin/service/IBasePigpenService.java

@@ -0,0 +1,19 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.BasePigpen;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+public interface IBasePigpenService extends IService<BasePigpen> {
+
+    Result list(String farmCode, String pigpenName, String stageCode);
+
+}

huimv-admin/src/main/java/com/huimv/admin/service/IEnvDeviceMaintainService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.EnvDeviceMaintain;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 设备维修记录 服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+public interface IEnvDeviceMaintainService extends IService<EnvDeviceMaintain> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/service/IEnvDeviceService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.EnvDevice;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+public interface IEnvDeviceService extends IService<EnvDevice> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/service/IEnvWarningInfoService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.EnvWarningInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+public interface IEnvWarningInfoService extends IService<EnvWarningInfo> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/service/IEnvWarningThresholdService.java

@@ -0,0 +1,16 @@
+package com.huimv.admin.service;
+
+import com.huimv.admin.entity.EnvWarningThreshold;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+public interface IEnvWarningThresholdService extends IService<EnvWarningThreshold> {
+
+}

huimv-admin/src/main/java/com/huimv/admin/service/impl/AuthorizeServiceImpl.java

@@ -15,6 +15,7 @@ import com.huimv.admin.mapper.MenuMapper;
 import com.huimv.admin.service.IAuthorizeService;
 import com.huimv.admin.common.utils.Result;
 import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.service.IGroupMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -32,6 +33,8 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
     @Autowired
     GroupMenuMapper groupMenuMapper;
     @Autowired
+    IGroupMenuService groupMenuService;
+    @Autowired
     private MenuMapper menuMapper;
     @Autowired
     private FarmMapper farmMapper;
@@ -73,65 +76,55 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
          * Step1:先删除原先的权限组关联菜单数据；
          * Step2:再添加新的账号权限组关联菜单数据；
          */
-        QueryWrapper<GroupMenu> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(groupId),"group_id",groupId);
-        groupMenuMapper.delete(queryWrapper);
-        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(menuIds)) {
+        groupMenuMapper.removeGroupMenu(groupId);
+        if (StringUtils.isNotBlank(menuIds)){
             String[] menuIdsArray = menuIds.split(",");
             String[] split = isAll.split(",");
-            boolean isAlla = StringUtils.isNotBlank(isAll);
+
+            List<GroupMenu> list = new ArrayList();
             for (int a = 0; a < menuIdsArray.length; a++) {
                 GroupMenu groupMenu = new GroupMenu();
                 groupMenu.setGroupId(Integer.parseInt(groupId));
                 groupMenu.setMenuId(Integer.parseInt(menuIdsArray[a]));
-                if (isAlla){
+                list.add(groupMenu);
+            }
+            if (StringUtils.isNotBlank(isAll)){
+                for (GroupMenu groupMenu : list) {
                     for (String s : split) {
-                        if (groupMenu.getMenuId() == Integer.parseInt(s)) {
+                        if (groupMenu.getMenuId()== Integer.parseInt(s)){
                             groupMenu.setIsAll(1);
                         }
                     }
                 }
-                groupMenuMapper.insert(groupMenu);
             }
+            groupMenuService.saveBatch(list);
         }
-        return ResultUtil.getResult(1);
+
+
+        return new Result(10000, "保存权限组关联菜单成功", true);
     }
 
 
     @Override
     public Result getMenuByGroup(Map paramsMap) {
-        String groupId = (String) paramsMap.get("groupId");
-        String isAll =  (String)paramsMap.get("isAll");
-        String[] isAllArray = isAll.split(",");
-        String menuIds =  (String)paramsMap.get("menuIds");
-        String[] menuArray = menuIds.split(",");
-        // 过滤上级菜单id
-        List<String> menuList = new ArrayList();
-        for(int a=0;a<menuArray.length;a++){
-            boolean isExist = false;
-            for(int b=0;b<isAllArray.length;b++){
-                if(menuArray[a].trim().equalsIgnoreCase(isAllArray[b])){
-                    isExist = true;
-                    break;
-                }
-            }
-            if(!isExist){
-                menuList.add(menuArray[a]);
-            }
+        String groupId  =  (String)paramsMap.get("groupId");
+        QueryWrapper<GroupMenu> groupMenuQueryWrapper = new QueryWrapper<>();
+        groupMenuQueryWrapper.eq("group_id",groupId);
+        groupMenuQueryWrapper.eq("is_all",0);
+        List<GroupMenu> groupMenuEntityList = groupMenuMapper.selectList(groupMenuQueryWrapper);
+        if (groupMenuEntityList.size() == 0) {
+            return new Result(10005, "当前权限组暂未关联任何菜单.", false);
         }
-        //-- 删除权限组绑定才菜单 --//
-        QueryWrapper<GroupMenu> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(StringUtils.isNotBlank(groupId),"group_id",groupId);
-        groupMenuMapper.delete(queryWrapper);
-        //-- 新增权限组绑定菜单 --//
-        int rows = 0;
-        for(int a=0;a<menuList.size();a++){
-            GroupMenu newGroupMenu = new GroupMenu();
-            newGroupMenu.setGroupId(Integer.parseInt(groupId));
-            newGroupMenu.setMenuId(Integer.parseInt(menuList.get(a)));
-            rows += groupMenuMapper.insert(newGroupMenu);
+        StringBuilder stringBuffer = new StringBuilder();
+
+        for (GroupMenu groupMenu : groupMenuEntityList) {
+
+            stringBuffer.append(groupMenu.getMenuId());
+            stringBuffer.append(",");
+
         }
-        return ResultUtil.getResult(rows);
+        stringBuffer.deleteCharAt(stringBuffer.length()-1);
+        return new Result(ResultCode.SUCCESS, stringBuffer.toString());
     }
 
     @Override
@@ -146,19 +139,22 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
         List<String> list = Arrays.asList(farmMenu);
         QueryWrapper<GroupMenu> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotBlank(groupId),"group_id",groupId);
-        queryWrapper.in("group_id",list);
-        List<GroupMenu> sysGroupMenuList = groupMenuMapper.selectList(queryWrapper);
-        if(sysGroupMenuList.size() == 0){
-            return new Result(ConstUtil.ERR_MYMENU_EMPTY_CODE,ConstUtil.ERR_MYMENU_EMPTY_INFO,false);
+        queryWrapper.in("menu_id",list);
+//        queryWrapper.eq("is_all",0);
+        List<GroupMenu> groupMenuEntityList = groupMenuMapper.selectList(queryWrapper);
+        if (groupMenuEntityList.size() == 0) {
+            return new Result(10005, "当前权限组暂未关联任何菜单.", false);
         }
-        StringBuilder menuIdSb = new StringBuilder();
-        for(GroupMenu groupMenu:sysGroupMenuList){
-            menuIdSb.append(groupMenu.getMenuId());
-            if(menuIdSb.length()>0){
-                menuIdSb.append(",");
-            }
+        StringBuilder stringBuffer = new StringBuilder();
+
+        for (GroupMenu groupMenu : groupMenuEntityList) {
+
+            stringBuffer.append(groupMenu.getMenuId());
+            stringBuffer.append(",");
+
         }
-        return new Result(ResultCode.SUCCESS,menuIdSb.toString());
+        stringBuffer.deleteCharAt(stringBuffer.length()-1);
+        return new Result(ResultCode.SUCCESS, stringBuffer.toString());
     }
 
     /**
@@ -205,16 +201,22 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
     }
 
     @Override
-    public List getMyMenuAll(String accountName) {
+    public List getMyMenuAll(String accountName,String farmId) {
         if ("1".equals(accountName)){
             List<Menu> menus = menuMapper.selectList(new QueryWrapper<Menu>().orderByAsc("sort"));
             return menus;
         }
-        return menuMapper.getMyMenu(accountName);
+        Farm farm = farmMapper.selectById(farmId);
+        String farmMenu = farm.getFarmMenu();
+        String[] farmMenus = farmMenu.split(",");
+//        List<String> farmMenus = Arrays.asList(farmMenu);
+        return menuMapper.getMyMenu(accountName,farmMenus);
     }
 
     @Override
-    public List<String> getMyButton(Integer userId) {
+    public List<String> getMyButton(Integer userId, Integer farmId) {
+        Farm farm = farmMapper.selectById(farmId);
+        String farmMenu = farm.getFarmMenu();
         if (userId == 1){
             List<Menu> menus = menuMapper.selectList(null);
             List<String> list = new ArrayList<>();
@@ -223,7 +225,8 @@ public class AuthorizeServiceImpl implements IAuthorizeService {
             }
             return list;
         }
-        return menuMapper.getMyButton(userId);
+        String[] menus = farmMenu.split(",");
+        return menuMapper.getMyButton(userId,menus);
     }
 
     @Override

huimv-admin/src/main/java/com/huimv/admin/service/impl/BasePigpenServiceImpl.java

@@ -0,0 +1,81 @@
+package com.huimv.admin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.common.utils.ResultCode;
+import com.huimv.admin.common.utils.ResultUtil;
+import com.huimv.admin.entity.BasePigpen;
+import com.huimv.admin.entity.vo.TreeBasePigpen;
+import com.huimv.admin.mapper.BasePigpenMapper;
+import com.huimv.admin.service.IBasePigpenService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@Service
+public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePigpen> implements IBasePigpenService {
+    @Autowired
+    private BasePigpenMapper basePigpenMapper;
+
+    @Override
+    public Result list(String farmCode, String pigpenName, String stageCode) {
+        QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtils.isNotBlank(pigpenName),"pigpen_name", pigpenName);
+        queryWrapper.like(StringUtils.isNotBlank(stageCode),"stage_code", stageCode);
+        queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
+        //创建排序
+        List<BasePigpen> basePigpens = basePigpenMapper.selectList(queryWrapper);
+
+        //将结果List改为树
+        List<TreeBasePigpen> treeBasePigpens = parseBizBaseArea(basePigpens);
+        return new Result(ResultCode.SUCCESS,treeBasePigpens);
+    }
+
+    /**
+     * 查询结果 转换成树形结构
+     * @param bizBaseAreas 原始数据
+     * @return 树
+     */
+    private List<TreeBasePigpen> parseBizBaseArea(List<BasePigpen> bizBaseAreas){
+        //构建需要展示的树形节点结构
+        Map<String, TreeBasePigpen> nodeMap = bizBaseAreas.stream().map(basePigpen -> {
+            TreeBasePigpen  baseVo = new TreeBasePigpen();
+            baseVo.setId(basePigpen.getId()+"");
+            baseVo.setFarmCode(basePigpen.getFarmId());
+            baseVo.setParentId(basePigpen.getParentId());
+            baseVo.setSort(basePigpen.getSort());
+            baseVo.setPigpenName(basePigpen.getBuildName());
+            baseVo.setType(basePigpen.getFType());
+            baseVo.setChildNode(new ArrayList<>());
+            return baseVo;
+        }).collect(Collectors.toMap(TreeBasePigpen::getId, b -> b,(k1, k2)->k1));
+        //创建数组存父亲节点
+        ArrayList<TreeBasePigpen> roots = new ArrayList<>();
+        //构建树形
+        nodeMap.values().forEach(item->{
+            String parentCode = item.getParentId()+"";
+            if (nodeMap.get(parentCode) == null){
+                //父节点为空，说明当前节点就已经是父节点了 将该节点存起来
+                roots.add(item);
+            }else {
+                //父节点 不为空，说明有父节点，拿到该节点的父节点的孩子节点（就是我自己),将该节点存起来
+                nodeMap.get(parentCode).getChildNode().add(item);
+            }
+        });
+        return roots;
+    }
+}

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvDeviceMaintainServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.EnvDeviceMaintain;
+import com.huimv.admin.mapper.EnvDeviceMaintainMapper;
+import com.huimv.admin.service.IEnvDeviceMaintainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 设备维修记录 服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@Service
+public class EnvDeviceMaintainServiceImpl extends ServiceImpl<EnvDeviceMaintainMapper, EnvDeviceMaintain> implements IEnvDeviceMaintainService {
+
+}

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvDeviceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.EnvDevice;
+import com.huimv.admin.mapper.EnvDeviceMapper;
+import com.huimv.admin.service.IEnvDeviceService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@Service
+public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice> implements IEnvDeviceService {
+
+}

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvWarningInfoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.EnvWarningInfo;
+import com.huimv.admin.mapper.EnvWarningInfoMapper;
+import com.huimv.admin.service.IEnvWarningInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@Service
+public class EnvWarningInfoServiceImpl extends ServiceImpl<EnvWarningInfoMapper, EnvWarningInfo> implements IEnvWarningInfoService {
+
+}

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvWarningThresholdServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.admin.service.impl;
+
+import com.huimv.admin.entity.EnvWarningThreshold;
+import com.huimv.admin.mapper.EnvWarningThresholdMapper;
+import com.huimv.admin.service.IEnvWarningThresholdService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2023-02-13
+ */
+@Service
+public class EnvWarningThresholdServiceImpl extends ServiceImpl<EnvWarningThresholdMapper, EnvWarningThreshold> implements IEnvWarningThresholdService {
+
+}

huimv-admin/src/main/java/com/huimv/admin/session/AccessToken.java

@@ -16,6 +16,24 @@ public class AccessToken {
     private Integer type;
     private String farmId;
     private String message;
+    private Integer lastFarmId;
+    private String userName;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Integer getLastFarmId() {
+        return lastFarmId;
+    }
+
+    public void setLastFarmId(Integer lastFarmId) {
+        this.lastFarmId = lastFarmId;
+    }
 
     public AccessToken() {
     }

huimv-admin/src/main/resources/application-dev.yml

@@ -10,13 +10,6 @@ spring:
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
-  jpa:
-    show-sql: true
-    database: mysql
-    hibernate:
-      ddl-auto: update
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-    open-in-view: true
 
   #配置rabbitMq 服务器
 #  rabbitmq:
@@ -32,7 +25,7 @@ spring:
     host: 122.112.224.199
     port: 6379
     password: hm123456
-  #Nacos 配置
+#  Nacos 配置
   cloud:
     nacos:
       discovery:
@@ -41,4 +34,7 @@ spring:
 
 
 
-
+mybatis-plus:
+  configuration:
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

huimv-admin/src/main/resources/com/huimv/admin/mapper/BasePigpenMapper.xml

@@ -0,0 +1,18 @@
+<?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.admin.mapper.BasePigpenMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.BasePigpen">
+        <id column="id" property="id" />
+        <result column="build_name" property="buildName" />
+        <result column="parent_id" property="parentId" />
+        <result column="f_type" property="fType" />
+        <result column="farm_id" property="farmId" />
+        <result column="sort" property="sort" />
+        <result column="other1" property="other1" />
+        <result column="other2" property="other2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+</mapper>

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnvDeviceMaintainMapper.xml

@@ -0,0 +1,17 @@
+<?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.admin.mapper.EnvDeviceMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.EnvDeviceMaintain">
+        <id column="id" property="id" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="maintain_time" property="maintainTime" />
+        <result column="remark" property="remark" />
+        <result column="farm_id" property="farmId" />
+        <result column="other1" property="other1" />
+        <result column="other2" property="other2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+</mapper>

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnvDeviceMapper.xml

@@ -0,0 +1,21 @@
+<?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.admin.mapper.EnvDeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.EnvDevice">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_name" property="deviceName" />
+        <result column="build_location" property="buildLocation" />
+        <result column="build_id" property="buildId" />
+        <result column="unit_id" property="unitId" />
+        <result column="device_brand" property="deviceBrand" />
+        <result column="device_status" property="deviceStatus" />
+        <result column="farm_id" property="farmId" />
+        <result column="ohter1" property="ohter1" />
+        <result column="ohter2" property="ohter2" />
+        <result column="ohter3" property="ohter3" />
+    </resultMap>
+
+</mapper>

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnvWarningInfoMapper.xml

@@ -0,0 +1,23 @@
+<?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.admin.mapper.EnvWarningInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.EnvWarningInfo">
+        <id column="id" property="id" />
+        <result column="warning_type" property="warningType" />
+        <result column="warning_content" property="warningContent" />
+        <result column="build_location" property="buildLocation" />
+        <result column="build_id" property="buildId" />
+        <result column="unit_id" property="unitId" />
+        <result column="device_id" property="deviceId" />
+        <result column="date" property="date" />
+        <result column="user_ids" property="userIds" />
+        <result column="user_names" property="userNames" />
+        <result column="farm_id" property="farmId" />
+        <result column="other1" property="other1" />
+        <result column="other2" property="other2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+</mapper>

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnvWarningThresholdMapper.xml

@@ -0,0 +1,23 @@
+<?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.admin.mapper.EnvWarningThresholdMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.EnvWarningThreshold">
+        <id column="id" property="id" />
+        <result column="max_tem" property="maxTem" />
+        <result column="min_tem" property="minTem" />
+        <result column="max_hum" property="maxHum" />
+        <result column="min_hum" property="minHum" />
+        <result column="max_NH3" property="maxNh3" />
+        <result column="min_NH3" property="minNh3" />
+        <result column="max_co" property="maxCo" />
+        <result column="min_co" property="minCo" />
+        <result column="user_ids" property="userIds" />
+        <result column="farm_id" property="farmId" />
+        <result column="othre1" property="othre1" />
+        <result column="othre2" property="othre2" />
+        <result column="othre3" property="othre3" />
+    </resultMap>
+
+</mapper>

huimv-admin/src/main/resources/com/huimv/admin/mapper/MenuMapper.xml

@@ -7,8 +7,11 @@
         SELECT * FROM sys_menu
         WHERE id IN
         (SELECT DISTINCT(menu_id) FROM sys_group_menu WHERE group_id IN
-        (SELECT group_id FROM sys_account_group WHERE
-        account_id=#{accountName} ))
+        (SELECT group_id FROM sys_account_group WHERE account_id=#{accountName} ))
+         AND id IN
+         <foreach collection="array"   item="farmMenu"  open="(" separator=","   close=")">
+            #{farmMenu}
+        </foreach>
         ORDER BY sort ASC
     </select>
 
@@ -18,7 +21,12 @@
         WHERE id IN
         (SELECT DISTINCT(menu_id) FROM sys_group_menu WHERE group_id IN
         (SELECT group_id FROM sys_account_group WHERE
-        account_id=#{userId})) and weight =1
+        account_id=#{userId}))
+        AND id IN
+        <foreach collection="array"   item="farmMenu"  open="(" separator=","   close=")">
+            #{farmMenu}
+        </foreach>
+        and weight =2
         ORDER BY sort ASC
     </select>
 </mapper>

huimv-admin/src/main/resources/mapper/BasePigpenMapper.xml

@@ -0,0 +1,18 @@
+<?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.admin.mapper.BasePigpenMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.BasePigpen">
+        <id column="id" property="id" />
+        <result column="build_name" property="buildName" />
+        <result column="parent_id" property="parentId" />
+        <result column="f_type" property="fType" />
+        <result column="farm_id" property="farmId" />
+        <result column="sort" property="sort" />
+        <result column="other1" property="other1" />
+        <result column="other2" property="other2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+</mapper>

huimv-admin/src/main/resources/mapper/EnvDeviceMaintainMapper.xml

@@ -0,0 +1,17 @@
+<?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.admin.mapper.EnvDeviceMaintainMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.EnvDeviceMaintain">
+        <id column="id" property="id" />
+        <result column="maintain_content" property="maintainContent" />
+        <result column="maintain_time" property="maintainTime" />
+        <result column="remark" property="remark" />
+        <result column="farm_id" property="farmId" />
+        <result column="other1" property="other1" />
+        <result column="other2" property="other2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+</mapper>

huimv-admin/src/main/resources/mapper/EnvDeviceMapper.xml

@@ -0,0 +1,21 @@
+<?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.admin.mapper.EnvDeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.EnvDevice">
+        <id column="id" property="id" />
+        <result column="device_code" property="deviceCode" />
+        <result column="device_name" property="deviceName" />
+        <result column="build_location" property="buildLocation" />
+        <result column="build_id" property="buildId" />
+        <result column="unit_id" property="unitId" />
+        <result column="device_brand" property="deviceBrand" />
+        <result column="device_status" property="deviceStatus" />
+        <result column="farm_id" property="farmId" />
+        <result column="ohter1" property="ohter1" />
+        <result column="ohter2" property="ohter2" />
+        <result column="ohter3" property="ohter3" />
+    </resultMap>
+
+</mapper>

huimv-admin/src/main/resources/mapper/EnvWarningInfoMapper.xml

@@ -0,0 +1,23 @@
+<?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.admin.mapper.EnvWarningInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.EnvWarningInfo">
+        <id column="id" property="id" />
+        <result column="warning_type" property="warningType" />
+        <result column="warning_content" property="warningContent" />
+        <result column="build_location" property="buildLocation" />
+        <result column="build_id" property="buildId" />
+        <result column="unit_id" property="unitId" />
+        <result column="device_id" property="deviceId" />
+        <result column="date" property="date" />
+        <result column="user_ids" property="userIds" />
+        <result column="user_names" property="userNames" />
+        <result column="farm_id" property="farmId" />
+        <result column="other1" property="other1" />
+        <result column="other2" property="other2" />
+        <result column="other3" property="other3" />
+    </resultMap>
+
+</mapper>

huimv-admin/src/main/resources/mapper/EnvWarningThresholdMapper.xml

@@ -0,0 +1,23 @@
+<?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.admin.mapper.EnvWarningThresholdMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.admin.entity.EnvWarningThreshold">
+        <id column="id" property="id" />
+        <result column="max_tem" property="maxTem" />
+        <result column="min_tem" property="minTem" />
+        <result column="max_hum" property="maxHum" />
+        <result column="min_hum" property="minHum" />
+        <result column="max_NH3" property="maxNh3" />
+        <result column="min_NH3" property="minNh3" />
+        <result column="max_co" property="maxCo" />
+        <result column="min_co" property="minCo" />
+        <result column="user_ids" property="userIds" />
+        <result column="farm_id" property="farmId" />
+        <result column="othre1" property="othre1" />
+        <result column="othre2" property="othre2" />
+        <result column="othre3" property="othre3" />
+    </resultMap>
+
+</mapper>