新增创建基地接口

src/main/java/com/yunfeiyun/agmp/fms/controller/FmsLandController.java

@@ -89,6 +89,52 @@ public class FmsLandController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 获取基地统计信息
+     */
+    @PreAuthorize("@ss.hasPermi('fms:land:top:stat')")
+    @GetMapping(value = "/top/stat")
+    public AjaxResult selectFmsLandTotal(FmsLand fmsLand) {
+        boolean b = SecurityUtils.isValidate();
+        if (b) {
+            //true需要进行权限校验。下拉框基地列表查询需要包含分配的基地以及分配地块所属基地
+            List<String> strings = dataAuthUtil.landListOfBlock();
+            if (strings.isEmpty()) {
+                FmsLandTotalResVo resVo = new FmsLandTotalResVo();
+                resVo.setCount("0");
+                resVo.setLandAreaSum("0");
+                resVo.setLandBlockcountSum("0");
+                resVo.setLandDevcountSum("0");
+                return success(resVo);
+            }
+            fmsLand.setDataFilter(true);
+            fmsLand.setLandIds(strings);
+        }
+        FmsLandTotalResVo resVo = fmsLandService.selectFmsLandTotal(fmsLand);
+        return success(resVo);
+    }
+
+    /**
+     * 新增基地
+     */
+    @PreAuthorize("@ss.hasPermi('fms:land:add')")
+    @Log(title = "基地", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public AjaxResult add(@RequestBody @Valid FmsLand fmsLand) {
+        /* 判断基地名称不能重复 */
+        FmsLand reqVo = new FmsLand();
+        reqVo.setLandNameEq(fmsLand.getLandName());
+        List<FmsLand> list = fmsLandService.selectFmsLandList(reqVo);
+        if (!list.isEmpty()) {
+            return AjaxResult.error(ErrorCode.FMS_LAND_EXIST.getCode(), ErrorCode.FMS_LAND_EXIST.getMessage());
+        }
+        fmsLand.setLandId(fmsLand.getId());
+        fmsLand.setLandDevcount(0L);
+        fmsLand.setLandBlockcount(0L);
+        return toAjax(fmsLandService.insertFmsLand(fmsLand));
+    }
+
+
     @PreAuthorize("@ss.hasPermi('fms:land:select:list')")
     @GetMapping("/select/list")
     public TableDataInfo selectList(FmsLand fmsLand) {
@@ -135,51 +181,7 @@ public class FmsLandController extends BaseController
         return success(fmsLandService.selectFmsLandByLandId(landId, SecurityUtils.getTid()));
     }
 
-    /**
-     * 获取基地统计信息
-     */
-    @PreAuthorize("@ss.hasPermi('fms:land:top:stat')")
-    @GetMapping(value = "/top/stat")
-    public AjaxResult selectFmsLandTotal(FmsLand fmsLand) {
-        boolean b = SecurityUtils.isValidate();
-        if (b) {
-            //true需要进行权限校验。下拉框基地列表查询需要包含分配的基地以及分配地块所属基地
-            List<String> strings = dataAuthUtil.landListOfBlock();
-            if (strings.isEmpty()) {
-                FmsLandTotalResVo resVo = new FmsLandTotalResVo();
-                resVo.setCount("0");
-                resVo.setLandAreaSum("0");
-                resVo.setLandBlockcountSum("0");
-                resVo.setLandDevcountSum("0");
-                return success(resVo);
-            }
-            fmsLand.setDataFilter(true);
-            fmsLand.setLandIds(strings);
-        }
-        FmsLandTotalResVo resVo = fmsLandService.selectFmsLandTotal(fmsLand);
-        return success(resVo);
-    }
 
-    /**
-     * 新增基地
-     */
-    @PreAuthorize("@ss.hasPermi('fms:land:add')")
-    @Log(title = "基地", businessType = BusinessType.INSERT)
-    @PostMapping(value = "/add")
-    public AjaxResult add(@RequestBody @Valid FmsLand fmsLand) {
-        /* 判断基地名称不能重复 */
-        FmsLand reqVo = new FmsLand();
-        reqVo.setLandNameEq(fmsLand.getLandName());
-        List<FmsLand> list = fmsLandService.selectFmsLandList(reqVo);
-        if (!list.isEmpty()) {
-            return AjaxResult.error(ErrorCode.FMS_LAND_EXIST.getCode(), ErrorCode.FMS_LAND_EXIST.getMessage());
-        }
-        fmsLand.setLandId(fmsLand.getId());
-        fmsLand.setTid(fmsLand.getLandId());
-        fmsLand.setLandDevcount(0L);
-        fmsLand.setLandBlockcount(0L);
-        return toAjax(fmsLandService.insertFmsLand(fmsLand));
-    }
 
     /**
      * 修改基地

src/main/java/com/yunfeiyun/agmp/fms/service/impl/FmsLandServiceImpl.java

@@ -86,8 +86,7 @@ public class FmsLandServiceImpl implements IFmsLandService
     @Override
     public int insertFmsLand(FmsLand fmsLand) {
         fmsLand.setLandId(fmsLand.getId());
-        // TODO: 昌黎定制版的基地的租户标识来源于基地标识
-        fmsLand.setTid(fmsLand.getLandId());
+        fmsLand.setTid(SecurityUtils.getTid());
         int i = fmsLandMapper.insertFmsLand(fmsLand);
         String resIdsStr = fmsLand.getResIds();
         if (!StringUtils.isEmpty(resIdsStr)) {
@@ -98,7 +97,7 @@ public class FmsLandServiceImpl implements IFmsLandService
                 sysResMapper.updateSysRes(sysRes);
             }
         }
-        generateSysDept(fmsLand);
+//        generateSysDept(fmsLand);
         return i;
     }