添加环控基础

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

@@ -27,6 +27,14 @@ public class ResultUtil {
             return new Result(ResultCode.FAIL);
         }
     }
+
+    public static Result addResult(Integer rows){
+        if(rows > 0){
+            return new Result(10000, "添加成功",true);
+        }else{
+            return new Result(10001, "添加失败",false);
+        }
+    }
     public static Result isNull(){
         return new Result(ResultCode.DATA_NULL);
     }

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

@@ -1,9 +1,14 @@
 package com.huimv.admin.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.huimv.admin.common.utils.Result;
+import com.huimv.admin.entity.BasePigpen;
+import com.huimv.admin.entity.dto.BasePigpenDto;
+import com.huimv.admin.service.IBasePigpenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
 
 /**
  * <p>
@@ -16,5 +21,30 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/basePigpen")
 public class BasePigpenController {
+    @Autowired
+    private IBasePigpenService basePigpenService;
 
+
+    @PostMapping( "/addPigpen")
+    public Result addPigpen(@RequestBody BasePigpenDto basePigpenDto) {
+        return basePigpenService.addPigpen(basePigpenDto);
+    }
+
+    @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/EnvWarningThresholdController.java

@@ -1,14 +1,8 @@
 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;
@@ -24,25 +18,6 @@ import java.util.Map;
 @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/entity/BasePigpen.java

@@ -41,6 +41,7 @@ public class BasePigpen implements Serializable {
      * 1栋 2单元 3房间
      */
     private Integer fType;
+    private Integer stageCode;
 
     private Integer farmId;
 

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

@@ -36,7 +36,7 @@ public class ProtData implements Serializable {
 
     private String cod;
 
-    private String NH3-N;
+    private String NH3;
 
     private String tp;
 

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

@@ -46,9 +46,9 @@ public class ProtThreshold implements Serializable {
      */
     private String ph2;
 
-    private String NH3-N1;
+    private String NH3N1;
 
-    private String NH3-N2;
+    private String NH3N2;
 
     private String tp1;
 

huimv-admin/src/main/java/com/huimv/admin/entity/dto/BasePigpenDto.java

@@ -0,0 +1,42 @@
+package com.huimv.admin.entity.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class BasePigpenDto implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 栋舍名字
+     */
+    private String buildName;
+
+    /**
+     * 父级
+     */
+    private Integer parentId;
+
+    /**
+     * 1栋 2单元 3房间
+     */
+    private Integer fType;
+    private Integer stageCode;
+    private Integer floorNum;
+
+    private Integer farmId;
+
+    private Integer sort;
+
+    private String other1;
+
+    private String other2;
+
+    private String other3;
+
+
+}

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

@@ -3,6 +3,7 @@ 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;
+import com.huimv.admin.entity.dto.BasePigpenDto;
 
 /**
  * <p>
@@ -16,4 +17,5 @@ public interface IBasePigpenService extends IService<BasePigpen> {
 
     Result list(String farmCode, String pigpenName, String stageCode);
 
+    Result addPigpen(BasePigpenDto basePigpenDto);
 }

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

@@ -1,17 +1,22 @@
 package com.huimv.admin.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.NumberUtil;
 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.dto.BasePigpenDto;
 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 org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,6 +37,27 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     private BasePigpenMapper basePigpenMapper;
 
     @Override
+    @Transactional
+    public Result addPigpen(BasePigpenDto basePigpenDto) {
+        BasePigpen basePigpen = new BasePigpen();
+        BeanUtil.copyProperties(basePigpen,basePigpenDto);
+        basePigpen.setParentId(0);
+        basePigpen.setFType(1);
+        int insert = basePigpenMapper.insert(basePigpen);
+        Integer floorNum = basePigpenDto.getFloorNum();
+        for (Integer integer = 1; integer <= floorNum; integer++) {
+            BasePigpen basePigpen1 = new BasePigpen();
+            basePigpen1.setFType(2);
+            basePigpen1.setParentId(insert);
+            basePigpen1.setBuildName(Convert.numberToChinese(integer,false));
+            basePigpen1.setFarmId(basePigpen.getFarmId());
+            basePigpen1.setStageCode(basePigpen.getStageCode());
+        }
+
+        return ResultUtil.addResult(insert);
+    }
+
+    @Override
     public Result list(String farmCode, String pigpenName, String stageCode) {
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtils.isNotBlank(pigpenName),"pigpen_name", pigpenName);
@@ -45,6 +71,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
         return new Result(ResultCode.SUCCESS,treeBasePigpens);
     }
 
+
     /**
      * 查询结果 转换成树形结构
      * @param bizBaseAreas 原始数据