优化牧场管理

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

@@ -56,6 +56,16 @@ public class SysFarmController {
         }
     }
 
+    @PostMapping("/clientList")
+    public Result clientList(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
+        return sysFarmService.listVillageFarm(request,paramsMap);
+    }
+
+    @PostMapping("newSub")
+    public Result newSub(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
+        return sysFarmService.newSub(request,paramsMap);
+    }
+
     @PostMapping("/getAllFarmId")
     public Result getAllFarms(HttpServletRequest request, @RequestBody Map<String, String> paramsMap){
         return sysFarmService.getAllFarmId(request,paramsMap);

huimv-cattle/src/main/java/com/huimv/cattle/pojo/SysFarm.java

@@ -42,5 +42,7 @@ public class SysFarm implements Serializable {
 
     private String parentCode;
 
+    private Integer type;
+
 
 }

huimv-cattle/src/main/java/com/huimv/cattle/service/SysFarmService.java

@@ -36,4 +36,6 @@ public interface SysFarmService extends IService<SysFarm> {
     Result listTownFarm(HttpServletRequest request, Map<String, String> paramsMap);
 
     Result listVillageFarm(HttpServletRequest request, Map<String, String> paramsMap);
+
+    Result newSub(HttpServletRequest request, Map<String, String> paramsMap);
 }

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

@@ -5,13 +5,16 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 //import com.huimv.breed.common.utils.ResultUtil;
 import com.huimv.cattle.mapper.SysFarmMapper;
+import com.huimv.cattle.mapper.SysRegionCounTownVillMapper;
 import com.huimv.cattle.mapper.SysUserAccountMapper;
 import com.huimv.cattle.pojo.DataSource;
 import com.huimv.cattle.pojo.SysFarm;
+import com.huimv.cattle.pojo.SysRegionCounTownVill;
 import com.huimv.cattle.pojo.SysUserAccount;
 import com.huimv.cattle.pojo.vo.TreeFarm;
 import com.huimv.cattle.service.DataSourceService;
@@ -27,6 +30,7 @@ import com.huimv.common.utils.ResultCode;
 //import com.huimv.saas.admin.pojo.SysUserAccount;
 //import com.huimv.saas.admin.service.SysFarmService;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -65,6 +69,8 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
     private StockService stockService;
     @Resource
     private RestTemplate restTemplate;
+    @Autowired
+    private SysRegionCounTownVillMapper sysRegionCounTownVillMapper;
 
     @Override
     public Result initFarmFlow(HttpServletRequest request, Map<String, String> paramsMap) {
@@ -94,6 +100,7 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result newFarm(HttpServletRequest request, Map<String, String> paramsMap) {
         //
         String farmStatus = paramsMap.get("farmStatus");
@@ -107,6 +114,13 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
             return new Result(10010, "牧场编号已存在", false);
         }
 
+        SysRegionCounTownVill city = sysRegionCounTownVillMapper.selectOne(new QueryWrapper<SysRegionCounTownVill>().eq("city_code", "0"));
+        String cityCodeSub = city.getCityCodeSub();
+        String newCityCodeSub = cityCodeSub +","+farmCode;
+        city.setCityCodeSub(newCityCodeSub);
+        UpdateWrapper<SysRegionCounTownVill> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("city_code","0");
+        sysRegionCounTownVillMapper.update(city,updateWrapper);
 
         SysFarm sysFarm = new SysFarm();
         sysFarm.setFarmName(paramsMap.get("farmName"));
@@ -116,6 +130,8 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
         sysFarm.setAddress(paramsMap.get("address"));
         sysFarm.setFarmStatus(Integer.parseInt(farmStatus));
         sysFarm.setRemark(paramsMap.get("remark"));
+        sysFarm.setParentCode("0");
+        sysFarm.setType(1);
         sysFarm.setAdcode(paramsMap.get("adCode"));
         return resultUtil.getResult(sysFarmMapper.insert(sysFarm));
     }
@@ -141,11 +157,61 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result removeFarm(HttpServletRequest request, Map<String, String> paramsMap) {
-        String ids = paramsMap.get("ids");
-        String[] idArray = ids.split(",");
-        List<String> idList = Arrays.asList(idArray);
-        return resultUtil.getResult(sysFarmMapper.deleteBatchIds(idList));
+        String farmCode = paramsMap.get("farmCode");
+        String parentCode = paramsMap.get("parentCode");
+        String type = paramsMap.get("type");
+
+        Integer integer = Math.toIntExact(sysFarmMapper.selectCount(new QueryWrapper<SysFarm>().eq("parent_code", farmCode)));
+        if (integer > 0){
+            return new Result(10001,"删除失败，存在下属乡镇",false);
+        }
+
+        if (type.equals("1")){
+            SysRegionCounTownVill sysRegionCounTownVill = sysRegionCounTownVillMapper.selectOne(new QueryWrapper<SysRegionCounTownVill>().eq("city_code", "0"));
+            String subCity = sysRegionCounTownVill.getCityCodeSub();
+            String newSubCity ="";
+
+            String[] array = subCity.split(",");
+            List<String> arrList = Arrays.asList(array);
+            List<String> arrList1 = new ArrayList<>(arrList);
+            arrList1.remove(farmCode);
+
+            String[] strings = new String[arrList1.size()];
+            String[] newArray = arrList1.toArray(strings);
+
+            for (int j = 0; j < newArray.length;j++){
+                newSubCity+=newArray[j]+",";
+            }
+            if (!"".equals(newSubCity)){
+                newSubCity=newSubCity.substring(0, newSubCity.length()-1);
+            }
+            sysRegionCounTownVill.setCityCodeSub(newSubCity);
+            sysRegionCounTownVillMapper.update(sysRegionCounTownVill,new UpdateWrapper<SysRegionCounTownVill>().eq("city_code","0"));
+        }else {
+            SysRegionCounTownVill sysRegionCounTownVill = sysRegionCounTownVillMapper.selectOne(new QueryWrapper<SysRegionCounTownVill>().eq("city_code", parentCode));
+            String subCity = sysRegionCounTownVill.getCityCodeSub();
+            String newSubCity ="";
+
+            String[] array = subCity.split(",");
+            List<String> arrList = Arrays.asList(array);
+            List<String> arrList1 = new ArrayList<>(arrList);
+            arrList1.remove(farmCode);
+
+            String[] strings = new String[arrList1.size()];
+            String[] newArray = arrList1.toArray(strings);
+
+            for (int j = 0; j < newArray.length;j++){
+                newSubCity+=newArray[j]+",";
+            }
+            if (!"".equals(newSubCity)){
+                newSubCity=newSubCity.substring(0, newSubCity.length()-1);
+            }
+            sysRegionCounTownVill.setCityCodeSub(newSubCity);
+            sysRegionCounTownVillMapper.update(sysRegionCounTownVill,new UpdateWrapper<SysRegionCounTownVill>().eq("city_code",parentCode));
+        }
+        return resultUtil.getResult(sysFarmMapper.delete(new QueryWrapper<SysFarm>().eq("farm_code",farmCode)));
     }
 
     @Override
@@ -239,6 +305,44 @@ public class SysFarmServiceImpl extends ServiceImpl<SysFarmMapper, SysFarm> impl
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result newSub(HttpServletRequest request, Map<String, String> paramsMap) {
+        //
+        String farmStatus = paramsMap.get("farmStatus");
+        if (StringUtils.isBlank(farmStatus)) {
+            farmStatus = "1";
+        }
+        String farmCode = paramsMap.get("farmCode");
+        List<SysFarm> farms = sysFarmMapper.selectList(new QueryWrapper<SysFarm>().eq("farm_code", farmCode));
+        System.out.println(farms.toString());
+        if (ObjectUtil.isNotEmpty(farms)) {
+            return new Result(10010, "牧场编号已存在", false);
+        }
+        String parentCode = paramsMap.get("parentCode");
+
+        SysRegionCounTownVill city = sysRegionCounTownVillMapper.selectOne(new QueryWrapper<SysRegionCounTownVill>().eq("city_code",parentCode));
+        String cityCodeSub = city.getCityCodeSub();
+        String newCityCodeSub = cityCodeSub +","+farmCode;
+        city.setCityCodeSub(newCityCodeSub);
+        UpdateWrapper<SysRegionCounTownVill> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("city_code",parentCode);
+        sysRegionCounTownVillMapper.update(city,updateWrapper);
+
+        SysFarm sysFarm = new SysFarm();
+        sysFarm.setFarmName(paramsMap.get("farmName"));
+        sysFarm.setFarmCode(paramsMap.get("farmCode"));
+        sysFarm.setLinkman(paramsMap.get("linkman"));
+        sysFarm.setPhone(paramsMap.get("phone"));
+        sysFarm.setAddress(paramsMap.get("address"));
+        sysFarm.setFarmStatus(Integer.parseInt(farmStatus));
+        sysFarm.setRemark(paramsMap.get("remark"));
+        sysFarm.setParentCode(parentCode);
+        sysFarm.setType(2);
+        sysFarm.setAdcode(paramsMap.get("adCode"));
+        return resultUtil.getResult(sysFarmMapper.insert(sysFarm));
+    }
+
     //获取所有乡镇信息
     private JSONArray getAllTowns() {
         QueryWrapper<SysFarm> queryWrapper = new QueryWrapper<>();