手机端增加水利工程资源CRUD接口，

手机端增加重点区域查询接口，带分页带筛选

data-ui/src/views/data/generalbusiness/importarea/index.vue

@@ -375,7 +375,7 @@
             {required: true, message: '区域名称不能为空', trigger: 'blur'}
           ],
           areaType: [
-            {required: true, message: '区域类型不能为空', trigger: 'change'}
+            {required: true, message: '所属分类不能为空', trigger: 'change'}
           ],
           areaInfo: [
             {required: true, message: '基本信息不能为空', trigger: 'blur'}
@@ -392,7 +392,8 @@
             {required: true, message: '所属部门不能为空', trigger: 'change'}
           ],
           projectType: [
-            {required: true, message: '所属分类不能为空', trigger: 'change'}
+            {required: true, message: '区域类型不能为空', trigger: 'change'}
+
           ]
         },
         cameraList: []

src/main/java/com/sooka/sponest/data/commandcenter/controller/CommandCenterController.java

@@ -3,10 +3,12 @@ package com.sooka.sponest.data.commandcenter.controller;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.security.utils.DictUtils;
 import com.sooka.sponest.data.commandcenter.domian.CommandCenterBO;
 import com.sooka.sponest.data.commandcenter.domian.ProjectBody;
 import com.sooka.sponest.data.commandcenter.service.ICommandCenterService;
 import com.sooka.sponest.data.digitalagriculture.domain.bo.AgricultureViewBO;
+import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestImportarea;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -150,6 +152,25 @@ public class CommandCenterController extends BaseController {
         return AjaxResult.success(commandCenterService.getImportAreaList(commandCenterBO));
     }
 
+    /**
+     * 重点区域
+     * @param CenterdataTForestImportarea
+     * @return
+     */
+    @ApiOperation(value = "重点区域", notes = "重点区域")
+    @GetMapping("/getImportAreaListByParams")
+    public AjaxResult getImportAreaListByParams(CenterdataTForestImportarea importarea) {
+        startPage();
+        List<CenterdataTForestImportarea> result = commandCenterService.getImportAreaListByParams(importarea);
+        Map<String, Object> areaTypeList = DictUtils.getDictCacheToMap("area_type");
+        Map<String, Object> projectLevelLists = DictUtils.getDictCacheToMap("centerdata_project_level");
+        for (CenterdataTForestImportarea hashMap : result) {
+            hashMap.setProjectTypeLabel(String.valueOf(areaTypeList.get(hashMap.getProjectType())));
+            hashMap.setProjectLevelLabel(String.valueOf(projectLevelLists.get(hashMap.getProjectLevel())));
+        }
+        return AjaxResult.success(result);
+    }
+
     @ApiOperation(value = "重点区域", notes = "重点区域")
     @GetMapping("/getImportAreaListOne")
     @ApiImplicitParams(value = {

src/main/java/com/sooka/sponest/data/commandcenter/domian/CommandCenterBO.java

@@ -22,5 +22,8 @@ public class CommandCenterBO extends BaseBusinessEntity {
     private String keyWord;
     private Integer pageNum;
     private Integer pageSize;
+    private String areaName;
+    private String areaType;
+
 
 }

src/main/java/com/sooka/sponest/data/commandcenter/service/ICommandCenterService.java

@@ -4,8 +4,10 @@ import com.sooka.sponest.data.commandcenter.domian.AreaBody;
 import com.sooka.sponest.data.commandcenter.domian.CommandCenterBO;
 import com.sooka.sponest.data.commandcenter.domian.ProjectBody;
 import com.sooka.sponest.data.digitalagriculture.domain.bo.AgricultureViewBO;
+import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestImportarea;
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestNetworkprocessing;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -55,4 +57,6 @@ public interface ICommandCenterService {
 
     // 资源落点
     List<Map<String, Object>> resourcePoint(AgricultureViewBO agricultureViewBO);
+
+    List<CenterdataTForestImportarea> getImportAreaListByParams(CenterdataTForestImportarea importarea);
 }

src/main/java/com/sooka/sponest/data/commandcenter/service/impl/ICommandCenterServiceImpl.java

@@ -22,8 +22,10 @@ import com.sooka.sponest.data.digitalresource.service.ICenterdataTFarmGridServic
 import com.sooka.sponest.data.digitalresource.service.IResourceViewService;
 import com.sooka.sponest.data.digitaltraffic.service.ITrafficViewService;
 import com.sooka.sponest.data.digitalwater.service.IWaterViewService;
+import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestImportarea;
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTForestNetworkprocessing;
 import com.sooka.sponest.data.generalbusiness.domain.CenterdataTKeyProjectsSchedule;
+import com.sooka.sponest.data.generalbusiness.mapper.CenterdataTForestImportareaMapper;
 import com.sooka.sponest.data.utils.BigDecimalUtil;
 import com.sooka.sponest.data.utils.DataConstants;
 import com.sooka.sponest.data.utils.TreeUtil;
@@ -44,6 +46,9 @@ import java.util.stream.Collectors;
 public class ICommandCenterServiceImpl extends BaseServiceImpl implements ICommandCenterService {
 
     @Autowired
+    private CenterdataTForestImportareaMapper centerdataTForestImportareaMapper;
+
+    @Autowired
     private CommandCenterMapper commandCenterMapper;
 
     @Autowired
@@ -537,4 +542,12 @@ public class ICommandCenterServiceImpl extends BaseServiceImpl implements IComma
         });
         return pointList;
     }
+
+
+    @Override
+    @DataScopeMutiDept(deptAlias = "d")
+    public List<CenterdataTForestImportarea> getImportAreaListByParams(CenterdataTForestImportarea importarea) {
+        setSookaDataBase(importarea);
+        return centerdataTForestImportareaMapper.selectCenterdataTForestImportareaList(importarea);
+    }
 }

src/main/java/com/sooka/sponest/data/generalbusiness/domain/CenterdataTForestImportarea.java

@@ -39,6 +39,7 @@ public class CenterdataTForestImportarea extends BaseBusinessEntity {
     @ApiModelProperty(value = "区域类型",required = true)
     @NotBlank(message = "区域类型不能为空")
     private String projectType;
+    private String projectTypeLabel;
 
     /**
      * 区域级别
@@ -46,6 +47,8 @@ public class CenterdataTForestImportarea extends BaseBusinessEntity {
     @ApiModelProperty(value = "区域级别")
     @Excel(name = "区域级别", dictType = "centerdata_project_level")
     private String projectLevel;
+    private String projectLevelLabel;
+
     /**
      * 数据状态(1-可用 2-不可用 )
      */