优化牧场管理

huimv-cattle/src/main/java/com/huimv/cattle/controller/SysFarmController.java

@@ -1,10 +1,13 @@
 package com.huimv.cattle.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.cattle.pojo.DataSource;
+import com.huimv.cattle.pojo.SysFarm;
 import com.huimv.cattle.service.DataSourceService;
 import com.huimv.cattle.service.SysFarmService;
 import com.huimv.common.utils.Result;
+import com.huimv.common.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -95,5 +98,10 @@ public class SysFarmController {
     public Result listAllTownsCount(HttpServletRequest request){
         return sysFarmService.listAllTownsCount(request);
     }
+
+    @PostMapping("/listVillage")
+    public Result listVillage(){
+        return new Result(ResultCode.SUCCESS,sysFarmService.list(new QueryWrapper<SysFarm>().ne("parent_code","0")));
+    }
 }
 

huimv-cattle/src/main/java/com/huimv/cattle/pojo/vo/TreeFarm.java

@@ -36,6 +36,8 @@ public class TreeFarm implements Serializable {
 
     private String parentCode;
 
+    private Integer type;
+
     private List<TreeFarm> childNode;
 
 }

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SysFarmServiceImpl.java

@@ -113,7 +113,8 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
         if (ObjectUtil.isNotEmpty(farms)) {
             return new Result(10010, "牧场编号已存在", false);
         }
-
+        SysRegionCounTownVill sysRegionCounTownVill = new SysRegionCounTownVill();
+        sysRegionCounTownVill.setCityCode(farmCode);
         SysRegionCounTownVill city = sysRegionCounTownVillMapper.selectOne(new QueryWrapper<SysRegionCounTownVill>().eq("city_code", "0"));
         String cityCodeSub = city.getCityCodeSub();
         String newCityCodeSub = cityCodeSub +","+farmCode;
@@ -121,6 +122,7 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
         UpdateWrapper<SysRegionCounTownVill> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("city_code","0");
         sysRegionCounTownVillMapper.update(city,updateWrapper);
+        sysRegionCounTownVillMapper.insert(sysRegionCounTownVill);
 
         SysFarm sysFarm = new SysFarm();
         sysFarm.setFarmName(paramsMap.get("farmName"));
@@ -166,6 +168,8 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
         Integer integer = Math.toIntExact(sysFarmMapper.selectCount(new QueryWrapper<SysFarm>().eq("parent_code", farmCode)));
         if (integer > 0){
             return new Result(10001,"删除失败，存在下属乡镇",false);
+        }else {
+            sysRegionCounTownVillMapper.delete(new QueryWrapper<SysRegionCounTownVill>().eq("city_code",farmCode));
         }
 
         if (type.equals("1")){
@@ -295,6 +299,9 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
         if (farmCode == null) {
             farmCode = TokenSign.getFarmCode(request);
         }
+        if (StringUtils.isEmpty(farmName)) {
+            farmName = "";
+        }
         if (farmCode == null || farmCode.equals("0")){
             List<SysFarm> farms = sysFarmMapper.selectList(new QueryWrapper<SysFarm>().like("farm_name",farmName));
             List<TreeFarm> treeFarms = parseBizBaseArea(farms);
@@ -399,6 +406,7 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
             treeFarm.setChildNode(new ArrayList<>());
             treeFarm.setPhone(farm.getPhone());
             treeFarm.setRemark(farm.getRemark());
+            treeFarm.setType(farm.getType());
             return treeFarm;
         }).collect(Collectors.toMap(TreeFarm::getFarmCode, b -> b,(k1, k2)->k1));
         //创建数组存父亲节点

huimv-cattle/src/main/java/com/huimv/cattle/service/impl/SysUserAccountServiceImpl.java

@@ -162,8 +162,12 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         }else {
              farmCode = TokenSign.getFarmCode(request);
         }
-        String accountClass = paramsMap.get("accountClass");
-        if ("1".equals(accountClass)){
+
+//        if ("1".equals(accountClass)){
+//            farmCode = "0";
+//        }
+
+        if (farmCode == "" ||StringUtils.isBlank(farmCode)){
             farmCode = "0";
         }
         System.out.println(farmCode);
@@ -207,7 +211,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         }
         //
         String farmCode = paramsMap.get("farmCode");
-        if (StringUtils.isBlank(farmCode)) {
+        if (StringUtils.isBlank(farmCode)||farmCode == "") {
             farmCode = "0";
         }
         String id = paramsMap.get("id");