Merge branch 'f-xiaogu' into dev

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/fzss/FzxzController.java

@@ -44,17 +44,17 @@ public class FzxzController extends BaseController {
         return list;
     }
 
-    /**
-     * 获取辅助选址因子列表
-     *
-     * @return
-     */
-    // TODO 后面不用了
-    @GetMapping("/GetFxyzList")
-    public RequestResult GetFxyzList() {
-        RequestResult list = fzxzService.GetFxyzList();
-        return list;
-    }
+    // /**
+    //  * 获取辅助选址因子列表
+    //  *
+    //  * @return
+    //  */
+    // // TODO 后面不用了
+    // @GetMapping("/GetFxyzList")
+    // public RequestResult GetFxyzList() {
+    //     RequestResult list = fzxzService.GetFxyzList();
+    //     return list;
+    // }
 
     /**
      * 获取辅助选址因子列表
@@ -67,11 +67,11 @@ public class FzxzController extends BaseController {
     }
 
     /**
-     * 获取模板因子列表
+     * 获取模板列表
      */
     @GetMapping("/GetTemplateFactorList")
-    public RequestResult GetTemplateFactorList(String userId, @NotNull String landTypeCode, boolean system) {
-        RequestResult list = fzxzService.GetTemplateFactorList(userId, landTypeCode, system);
+    public RequestResult GetTemplateFactorList(@NotNull String landTypeCode) {
+        RequestResult list = fzxzService.GetTemplateFactorList(landTypeCode);
         return list;
     }
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/fzss/IFzxzService.java

@@ -13,11 +13,11 @@ public interface IFzxzService {
 
     RequestResult GetDldmTree(String fzbs);
 
-    RequestResult GetFxyzList();
+    // RequestResult GetFxyzList();
 
     RequestResult GetGetFactorList();
 
-    RequestResult GetTemplateFactorList(String userId, String landTypeCode, boolean system);
+    RequestResult GetTemplateFactorList(String landTypeCode);
 
     // List<FzxzTemplateDTO> GetTemplateList(String search);
 

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/fzss/FzxzServiceImpl.java

@@ -90,17 +90,17 @@ public class FzxzServiceImpl implements IFzxzService {
         return RequestResult.success("查询成功！", treeNode);
     }
 
-    @Override
-    public RequestResult GetFxyzList() {
-        try {
-            QueryWrapper<FzxzYzDTO> wrapper = new QueryWrapper<>();
-            List<FzxzYzDTO> res = fzxzYzMapper.selectList(wrapper);
-            return RequestResult.success("查询成功", res);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return RequestResult.error("查询失败", null);
-        }
-    }
+    // @Override
+    // public RequestResult GetFxyzList() {
+    //     try {
+    //         QueryWrapper<FzxzYzDTO> wrapper = new QueryWrapper<>();
+    //         List<FzxzYzDTO> res = fzxzYzMapper.selectList(wrapper);
+    //         return RequestResult.success("查询成功", res);
+    //     } catch (Exception e) {
+    //         e.printStackTrace();
+    //         return RequestResult.error("查询失败", null);
+    //     }
+    // }
 
     @Override
     public RequestResult GetGetFactorList() {
@@ -117,17 +117,24 @@ public class FzxzServiceImpl implements IFzxzService {
     }
 
     @Override
-    public RequestResult GetTemplateFactorList(String userId, String landTypeCode, boolean system) {
-        QueryWrapper<FactorTemplateDTO> wrapper = new QueryWrapper<>();
-        if (userId != null) {
-            wrapper.eq("user_id", userId);
-        }
-        if (landTypeCode != null) {
-            wrapper.eq("land_type_code", landTypeCode);
+    public RequestResult GetTemplateFactorList(String landTypeCode) {
+        List<FactorTemplateDTO> list = new ArrayList<>();
+
+        // 1.先获取用户自定义的模板
+        QueryWrapper<FactorTemplateDTO> wrapperUser = new QueryWrapper<>();
+        Long userId = SecurityUtils.getUserId();
+        wrapperUser.eq("user_id", userId.toString());
+        wrapperUser.eq("land_type_code", landTypeCode);
+        wrapperUser.eq("system", false);
+        wrapperUser.orderByAsc("order_index");
+        list = factorTemplateMapper.selectList(wrapperUser);
+        if (list.size() == 0) {
+            QueryWrapper<FactorTemplateDTO> wrapperSystem = new QueryWrapper<>();
+            wrapperSystem.eq("land_type_code", landTypeCode);
+            wrapperSystem.eq("system", true);
+            wrapperSystem.orderByAsc("order_index");
+            list = factorTemplateMapper.selectList(wrapperSystem);
         }
-        wrapper.eq("system", system);
-        wrapper.orderByAsc("order_index");
-        List<FactorTemplateDTO> list = factorTemplateMapper.selectList(wrapper);
         return RequestResult.success("查询成功", list);
     }
 
@@ -138,18 +145,15 @@ public class FzxzServiceImpl implements IFzxzService {
         }
         Long userId = SecurityUtils.getUserId();
         Map map = new HashMap<>();
-        // map.put("user_id", userId.toString());
-        map.put("user_id", "0");
+        map.put("user_id", userId.toString());
         map.put("system", false);
         map.put("land_type_code", addFactorTemplateVo.getLandTypeCode());
         fzxzTemplateMapper.deleteByMap(map);
 
-
         for (int i = 0; i < addFactorTemplateVo.getFactors().size(); i++) {
             FactorTemplateDTO fzxzTemplateDTO = addFactorTemplateVo.getFactors().get(i);
             fzxzTemplateDTO.setId(StringUtils.getUUID());
-            // fzxzTemplateDTO.setUserId(userId.toString());
-            fzxzTemplateDTO.setUserId("0");
+            fzxzTemplateDTO.setUserId(userId.toString());
             fzxzTemplateDTO.setOrderIndex(i);
             fzxzTemplateDTO.setLandTypeCode(addFactorTemplateVo.getLandTypeCode());
             fzxzTemplateMapper.insert(fzxzTemplateDTO);