添加模板

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

@@ -9,6 +9,7 @@ import com.onemap.common.core.web.page.RecordTableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @RestController
@@ -61,23 +62,31 @@ public class FzxzController extends BaseController {
      */
     @GetMapping("/GetFactorList")
     public RequestResult GetFactorList() {
-        RequestResult list = fzxzService.GetGetFactorList();
-        return list;
+        return fzxzService.GetGetFactorList();
     }
 
     /**
-     * 获取辅助选址模板列表
-     *
-     * @param search 预留 数据源
-     * @return
+     * 获取模板因子列表
      */
-    @GetMapping("/GetTemplateList")
-    public RecordTableDataInfo GetTemplateList(String search, Integer limit, Integer page) {
-        startRecordPage();
-        List<FzxzTemplateDTO> list = fzxzService.GetTemplateList(search);
-        return getRecordDataTable(list);
+    @GetMapping("/GetTemplateFactorList")
+    public RequestResult GetTemplateFactorList(String userId, @NotNull String landTypeCode, boolean system) {
+        RequestResult list = fzxzService.GetTemplateFactorList(userId, landTypeCode, system);
+        return list;
     }
 
+    // /**
+    //  * 获取辅助选址模板列表
+    //  *
+    //  * @param search 预留 数据源
+    //  * @return
+    //  */
+    // @GetMapping("/GetTemplateList")
+    // public RecordTableDataInfo GetTemplateList(String search, Integer limit, Integer page) {
+    //     startRecordPage();
+    //     List<FzxzTemplateDTO> list = fzxzService.GetTemplateList(search);
+    //     return getRecordDataTable(list);
+    // }
+
     /**
      * 添加辅助选址模板
      *

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/FactorTemplateDTO.java

@@ -0,0 +1,34 @@
+package com.onemap.apply.domain.config.fzss;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@TableName("t_fzss_fzxz_factor_temp")
+@Data
+public class FactorTemplateDTO {
+    @JsonProperty("tempId")
+    String id;
+
+    @TableField("land_type_code")
+    String landTypeCode;
+
+    @TableField("factor_id")
+    String factorId;
+
+    @TableField("factor_bsm")
+    @JsonProperty("bsm")
+    String factorBsm;
+
+    @TableField("factor_name")
+    @JsonProperty("name")
+    String factorName;
+
+    @TableField("order_index")
+    String orderIndex;
+
+    @TableField("condition_info")
+    String conditionInfo;
+    Boolean system;
+}

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/mapper/fzss/FactorTemplateMapper.java

@@ -0,0 +1,14 @@
+package com.onemap.apply.mapper.fzss;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.onemap.apply.domain.config.fzss.FactorTemplateDTO;
+import com.onemap.apply.domain.config.fzss.FzxzTemplateDTO;
+
+/**
+ * 数据层
+ *
+ * @author onemap
+ */
+public interface FactorTemplateMapper extends BaseMapper<FactorTemplateDTO> {
+
+}

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

@@ -16,7 +16,9 @@ public interface IFzxzService {
 
     RequestResult GetGetFactorList();
 
-    List<FzxzTemplateDTO> GetTemplateList(String search);
+    RequestResult GetTemplateFactorList(String userId, String landTypeCode, boolean system);
+
+    // List<FzxzTemplateDTO> GetTemplateList(String search);
 
     RequestResult AddTemplate(FzxzTemplateDTO fzxzTemplateDTO);
 

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

@@ -29,6 +29,8 @@ public class FzxzServiceImpl implements IFzxzService {
     private FzxzMapper fzxzMapper;
     @Resource
     private FzxzTemplateMapper fzxzTemplateMapper;
+    @Resource
+    private FactorTemplateMapper factorTemplateMapper;
 
     @Override
     public RequestResult GetSjyList(String param) {
@@ -76,33 +78,15 @@ public class FzxzServiceImpl implements IFzxzService {
                 FzxzDldmTreeDTO parent = nodeMap.get(node.getParent());
                 if (parent != null) {
                     parent.setIsparent(true);
-                    if(parent.getChildren()==null){
+                    if (parent.getChildren() == null) {
                         parent.setChildren(new ArrayList<>());
                     }
                     parent.getChildren().add(node);
-                }else {
+                } else {
                     System.out.println();
                 }
             }
         }
-
-
-        // List<FzxzDldmTreeDTO> rootNodes = new ArrayList<>();
-        // for (FzxzDldmTreeDTO dltbTree : trees) {
-        //     dltbTree.setChildren(new ArrayList<>());
-        //     if (StringUtils.isEmpty(dltbTree.getParent())) {
-        //         dltbTree.setIsparent(true);
-        //         treeNode.add(dltbTree);
-        //     } else {
-        //         for (FzxzDldmTreeDTO cur : treeNode) {
-        //             if (cur.getValue().equals(dltbTree.getParent())) {
-        //                 dltbTree.setIsparent(false);
-        //                 cur.getChildren().add(dltbTree);
-        //                 break;
-        //             }
-        //         }
-        //     }
-        // }
         return RequestResult.success("查询成功！", treeNode);
     }
 
@@ -133,20 +117,35 @@ public class FzxzServiceImpl implements IFzxzService {
     }
 
     @Override
-    public List<FzxzTemplateDTO> GetTemplateList(String search) {
-        try {
-            QueryWrapper<FzxzTemplateDTO> wrapper = new QueryWrapper<FzxzTemplateDTO>();
-            if (!StringUtils.isEmpty(search)) {
-                wrapper.like("mbmc", search);
-            }
-            List<FzxzTemplateDTO> res = fzxzTemplateMapper.selectList(wrapper);
-            return res;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return new ArrayList<FzxzTemplateDTO>();
+    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);
+        }
+        wrapper.eq("system", system);
+        wrapper.orderByAsc("order_index");
+        List<FactorTemplateDTO> list = factorTemplateMapper.selectList(wrapper);
+        return RequestResult.success("查询成功", list);
     }
 
+    // @Override
+    // public List<FzxzTemplateDTO> GetTemplateList(String search) {
+    //     try {
+    //         QueryWrapper<FzxzTemplateDTO> wrapper = new QueryWrapper<FzxzTemplateDTO>();
+    //         if (!StringUtils.isEmpty(search)) {
+    //             wrapper.like("mbmc", search);
+    //         }
+    //         List<FzxzTemplateDTO> res = fzxzTemplateMapper.selectList(wrapper);
+    //         return res;
+    //     } catch (Exception e) {
+    //         e.printStackTrace();
+    //         return new ArrayList<FzxzTemplateDTO>();
+    //     }
+    // }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public RequestResult AddTemplate(FzxzTemplateDTO fzxzTemplateDTO) {