【feat】添加牧场新增区域代码和区域名称

registration-center/src/main/java/com/huimv/center/controller/BizFarmController.java

@@ -30,8 +30,9 @@ public class BizFarmController {
         String linkman = paramsMap.get("linkman")+"";
         String phone = paramsMap.get("phone")+"";
         String remark = paramsMap.get("remark")+"";
+        String areaName = paramsMap.get("areaName")+"";
         System.out.println("remark="+remark);
-        return bizFarmService.save(farmName,farmCode,linkman,phone,remark);
+        return bizFarmService.save(farmName,farmCode,linkman,phone,remark,areaName);
     }
 
     @PostMapping("/editFarm")

registration-center/src/main/java/com/huimv/center/mapper/xml/BizFarmMapper.xml

@@ -11,11 +11,13 @@
         <result column="phone" property="phone" />
         <result column="remark" property="remark" />
         <result column="add_time" property="addTime" />
+        <result column="area_name" property="areaName" />
+        <result column="area_code" property="areaCode" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, farm_name, farm_code, linkman, phone, remark
+        id, farm_name, farm_code, linkman, phone, remark，area_name，area_code
     </sql>
 
 </mapper>

registration-center/src/main/java/com/huimv/center/pojo/BizFarm.java

@@ -42,5 +42,8 @@ public class BizFarm implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date addTime;
 
+    private String areaName;
+
+    private String areaCode;
 
 }

registration-center/src/main/java/com/huimv/center/service/BizBaseAreaService.java

@@ -1,5 +1,6 @@
 package com.huimv.center.service;
 
+import com.huimv.center.pojo.BizBaseArea;
 import com.huimv.eartag2.common.utils.Result;
 
 public interface BizBaseAreaService {
@@ -11,4 +12,6 @@ public interface BizBaseAreaService {
      Result update( Integer id,String name,String code,String parentCode);
 
      Result treeList();
+
+     BizBaseArea queryAreaCodeByAreaName(String areaName);
 }

registration-center/src/main/java/com/huimv/center/service/BizFarmService.java

@@ -16,7 +16,7 @@ import java.text.ParseException;
  */
 public interface BizFarmService extends IService<BizFarm> {
 
-    Result save(String farmName, String farmCode, String linkman, String phone, String remark) throws ParseException;
+    Result save(String farmName, String farmCode, String linkman, String phone, String remark,String areaName) throws ParseException;
 
     Result edit(Integer id, String farmName, String farmCode, String linkman, String phone, String remark) throws ParseException;
 

registration-center/src/main/java/com/huimv/center/service/impl/BizBaseAreaServiceImpl.java

@@ -61,6 +61,11 @@ public class BizBaseAreaServiceImpl implements BizBaseAreaService {
         return new Result(ResultCode.SUCCESS,parseBizBaseArea(bizBaseAreas));
     }
 
+    @Override
+    public BizBaseArea queryAreaCodeByAreaName(String areaName) {
+        return null;
+    }
+
     /**
      * 查询结果 转换成树形结构
      * @param bizBaseAreas

registration-center/src/main/java/com/huimv/center/service/impl/BizFarmServiceImpl.java

@@ -2,9 +2,11 @@ package com.huimv.center.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.center.pojo.BizBaseArea;
 import com.huimv.center.pojo.BizFarm;
 import com.huimv.center.mapper.BizFarmMapper;
 import com.huimv.center.pojo.BizRawData;
+import com.huimv.center.service.BizBaseAreaService;
 import com.huimv.center.service.BizFarmService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.eartag2.common.utils.DateUtil;
@@ -14,7 +16,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.text.ParseException;
+import java.util.Objects;
 
 /**
  * <p>
@@ -36,6 +40,8 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
     @Autowired
     private com.huimv.center.utils.ResultUtil ResultUtil;
 
+    @Resource
+    private BizBaseAreaService bizBaseAreaService;
     /**
      * @Method      : save
      * @Description : 
@@ -47,7 +53,7 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
      * @Time        : 14:46
      */
     @Override
-    public Result save(String farmName, String farmCode, String linkman, String phone, String remark) throws ParseException {
+    public Result save(String farmName, String farmCode, String linkman, String phone, String remark,String areaName) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         BizFarm farm = new BizFarm();
         farm.setFarmName(farmName);
@@ -56,6 +62,12 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
         farm.setPhone(phone);
         farm.setRemark(remark);
         farm.setAddTime(dateUtil.getTodayDatetime());
+        //根据区域名称查询区域编码
+        BizBaseArea bizBaseArea = bizBaseAreaService.queryAreaCodeByAreaName(areaName);
+        if (Objects.nonNull(bizBaseArea)){
+            farm.setFarmCode(bizBaseArea.getCode());
+        }
+        farm.setFarmName(farmName);
         return ResultUtil.result(BizFarmMapper.insert(farm));
     }