【fix】更新牧场表接口增加区域名称字段

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

@@ -105,16 +105,15 @@ public class BizDeviceRegisterController {
     }
 
     @GetMapping("/getDeviceCode")
-    public Result getDeviceCode(@RequestBody String farmCode){
+    public Result getDeviceCode(String farmCode){
         //查询牧场表  获取行政编码 牧场编码
-        BizFarm bizFarmByFarmCode = bizFarmService.getBizFarmByFarmCode(farmCode);
-        String areaCode = bizFarmByFarmCode.getAreaCode();
+        String areaCode = bizFarmService.getBizFarmByFarmCode(farmCode);
         //查询基站顺序码
         String subFarmCode = bizDeviceRegisterService.getBizDeviceRegisterByFarmCode(farmCode);
 
         System.out.println(subFarmCode);
-        //拼接返回
-        String resultDeviceCode = areaCode.concat(farmCode).concat(subFarmCode);
+        //拼接返回e
+        String resultDeviceCode = areaCode + farmCode+ subFarmCode;
         return new Result(ResultCode.SUCCESS,resultDeviceCode);
     }
 }

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

@@ -43,7 +43,8 @@ public class BizFarmController {
         String linkman = paramsMap.get("linkman")+"";
         String phone = paramsMap.get("phone")+"";
         String remark = paramsMap.get("remark")+"";
-        return bizFarmService.edit(Integer.parseInt(id),farmName,farmCode,linkman,phone,remark);
+        String areaName = paramsMap.get("areaName")+"";
+        return bizFarmService.edit(Integer.parseInt(id),farmName,farmCode,linkman,phone,remark,areaName);
     }
 
     @PostMapping("/removeFarm")

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

@@ -7,8 +7,10 @@ import java.io.Serializable;
 import java.util.Date;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 /**
@@ -22,6 +24,8 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
+@AllArgsConstructor
+@NoArgsConstructor
 public class BizFarm implements Serializable {
 
     private static final long serialVersionUID=1L;

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

@@ -18,7 +18,7 @@ public interface BizFarmService extends IService<BizFarm> {
 
     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;
+    Result edit(Integer id, String farmName, String farmCode, String linkman, String phone, String remark,String areaName) throws ParseException;
 
     Result remove(String ids);
 
@@ -27,5 +27,5 @@ public interface BizFarmService extends IService<BizFarm> {
     /**
      *【查询】 通过农场编码
      */
-    BizFarm getBizFarmByFarmCode(String farmCode);
+    String getBizFarmByFarmCode(String farmCode);
 }

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

@@ -99,7 +99,6 @@ public class BizBaseAreaServiceImpl implements BizBaseAreaService {
                 cityNodeMap.get(parentCode).getChildBaseAreaVo().add(city);
             }
         });
-        System.out.println(roots);
         return roots;
     }
 }

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

@@ -84,7 +84,7 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
      * @Time        : 14:44
      */
     @Override
-    public Result edit(Integer id, String farmName, String farmCode, String linkman, String phone, String remark) throws ParseException {
+    public Result edit(Integer id, String farmName, String farmCode, String linkman, String phone, String remark,String areaName) throws ParseException {
         DateUtil dateUtil = new DateUtil();
         BizFarm farm = BizFarmMapper.selectById(id);
         farm.setFarmName(farmName);
@@ -93,6 +93,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.setAreaCode(bizBaseArea.getAreaCode());
+        }
+        farm.setAreaName(areaName);
         return ResultUtil.result(BizFarmMapper.updateById(farm));
     }
 
@@ -141,15 +147,15 @@ public class BizFarmServiceImpl extends ServiceImpl<BizFarmMapper, BizFarm> impl
     }
 
     @Override
-    public BizFarm getBizFarmByFarmCode(String farmCode) {
+    public String getBizFarmByFarmCode(String farmCode) {
         QueryWrapper<BizFarm> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("farm_code", farmCode);
         List<BizFarm> bizFarms = BizFarmMapper.selectList(queryWrapper);
         if (bizFarms == null || bizFarms.size()==0){
             System.out.println("----------------牧场表里面查不到这条数据");
         }else{
-            return bizFarms.get(0);
+            return bizFarms.get(0).getFarmCode();
         }
-        return new BizFarm();
+        return "";
     }
 }