Merge remote-tracking branch 'origin/master'

data-ui/src/views/data/digitalagriculture/StillField/index.vue

@@ -558,6 +558,9 @@ export default {
           {required: true, message: "补助金额不能为空", trigger: "blur"},
           {validator: checkPositiveDecimal, trigger: 'blur'}
         ],
+        stillType: [
+          {required: true, message: "还田类型不能为空", trigger: "change"},
+        ],
         stillName: [
           { required: true, message: "标题不能为空", trigger: "blur" },
           { min: 2, max: 20, message: '标题长度必须介于 2 和 20 之间', trigger: 'blur' }

data-ui/src/views/data/digitalwater/outletsewage/index.vue

@@ -154,8 +154,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="排污闽值(m³)" prop="sewageThreshold">
-              <el-input v-model="form.sewageThreshold" placeholder="请输入排污闽值" maxlength="20"/>
+            <el-form-item label="排污阀值(m³)" prop="sewageThreshold">
+              <el-input v-model="form.sewageThreshold" placeholder="请输入排污阀值" maxlength="20"/>
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -78,6 +78,7 @@
       <el-table-column label="日报标题" align="center" prop="dailyTitle" />
       <el-table-column label="日报内容" align="center" prop="dailyContent" />
       <el-table-column label="所属部门" align="center" prop="deptName" />
+      <el-table-column label="创建人" align="center" prop="createName" />
       <!--<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -154,7 +155,8 @@ export default {
         dailyTitle: null,
         dailyContent: null,
         deptId: null,
-        deptName: null
+        deptName: null,
+        createName:null
       },
       // 表单参数
       form: {},

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: []

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

@@ -721,6 +721,9 @@ export default {
         projectName: [
           {required: true, message: "项目名称不能为空", trigger: "blur"}
         ],
+        territoriality: [
+          {required: true, message: "属地辖区不能为空", trigger: ["blur", "change"]}
+        ],
         principal: [
           {required: true, message: "负责人不能为空", trigger: "blur"}
         ],

data-ui/src/views/indexEcharts/mapHierarchy.vue

@@ -28,7 +28,6 @@
             {
               type: 'pie',
               radius: ['40%', '70%'],
-              avoidLabelOverlap: false,
               itemStyle: {
                 borderRadius: 10,
                 borderColor: '#fff',

data-ui/src/views/indexEcharts/siZhang.vue

@@ -31,7 +31,6 @@
               name: '四长人数',
               type: 'pie',
               radius: ['40%', '70%'],
-              avoidLabelOverlap: false,
               itemStyle: {
                 borderRadius: 10,
                 borderColor: '#fff',

pom.xml

@@ -81,12 +81,6 @@
         </dependency>
 
         <dependency>
-            <groupId>com.dahuatech.icc</groupId>
-            <artifactId>java-sdk-oauth</artifactId>
-            <version>1.0.9</version>
-        </dependency>
-
-        <dependency>
             <groupId>com.ruoyi</groupId>
             <artifactId>sooka-sponest-api-message</artifactId>
             <version>3.4.0</version>

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;
@@ -273,4 +275,5 @@ public class CommandCenterController extends BaseController {
         List list = commandCenterService.resourcePoint(agricultureViewBO);
         return AjaxResult.success(list);
     }
+
 }

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

@@ -4,6 +4,7 @@ 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.List;

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
@@ -320,7 +325,9 @@ public class ICommandCenterServiceImpl extends BaseServiceImpl implements IComma
     public List<Map<String, Object>> fourLengthOver(CommandCenterBO commandCenterBO) {
         setSookaDataBase(commandCenterBO);
         List<Map<String, Object>> resultList = getForestLeader(commandCenterBO);
-        if (resultList != null) return resultList;
+        if (resultList != null) {
+            return resultList;
+        }
         // 获取河长、路长、田长 2，3，6
         List<Map<String, Object>> leaderList = commandCenterMapper.getLeaderList(commandCenterBO);
         // 获取所有网格
@@ -537,4 +544,5 @@ public class ICommandCenterServiceImpl extends BaseServiceImpl implements IComma
         });
         return pointList;
     }
+
 }

src/main/java/com/sooka/sponest/data/digitalagriculture/domain/CenterdataTFarmFilingsLivestock.java

@@ -31,16 +31,6 @@ public class CenterdataTFarmFilingsLivestock extends BaseBusinessEntity {
     private String id;
 
     /**
-     * 创建人名称
-     */
-    private String createName;
-
-    /**
-     * 更新人名称
-     */
-    private String updateName;
-
-    /**
      * 养殖场名称
      */
     @ApiModelProperty(value = "养殖场名称", required = true)

src/main/java/com/sooka/sponest/data/digitaldevelopment/controller/DevelopmentViewController.java

@@ -0,0 +1,37 @@
+package com.sooka.sponest.data.digitaldevelopment.controller;
+
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.sooka.sponest.data.digitaldevelopment.domain.DevelopmentView;
+import com.sooka.sponest.data.digitaldevelopment.service.IDevelopmentViewService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 数字发改可视化
+ *
+ * @author hanfucheng
+ * @date 2023/9/11 11:23
+ */
+@RestController
+@RequestMapping("/developmentView")
+public class DevelopmentViewController extends BaseController {
+
+    @Autowired
+    private IDevelopmentViewService iDevelopmentViewService;
+
+    /**
+     * 统计重点工程/重点区域数量
+     *
+     * @author hanfucheng
+     * @date 2023/9/7 10:01
+     */
+    @ApiOperation(value = "统计重点工程/重点区域数量", notes = "统计重点工程/重点区域数量")
+    @GetMapping("/getKeyProjectsByDeptId")
+    public AjaxResult getKeyProjectsByDeptId(DevelopmentView developmentView) {
+        return AjaxResult.success(iDevelopmentViewService.getKeyProjectsByDeptId(developmentView));
+    }
+}

src/main/java/com/sooka/sponest/data/digitaldevelopment/domain/DevelopmentView.java

@@ -0,0 +1,19 @@
+package com.sooka.sponest.data.digitaldevelopment.domain;
+
+import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
+import lombok.Data;
+
+/**
+ * @author hanfucheng
+ * @date 2023/9/11 14:15
+ */
+@Data
+public class DevelopmentView extends BaseBusinessEntity {
+
+    //所属开发区
+    private String park;
+
+    //工程类型
+    private String projectType;
+
+}

src/main/java/com/sooka/sponest/data/digitaldevelopment/mapper/DevelopmentViewMapper.java

@@ -0,0 +1,17 @@
+package com.sooka.sponest.data.digitaldevelopment.mapper;
+
+import com.sooka.sponest.data.digitaldevelopment.domain.DevelopmentView;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author hanfucheng
+ * @date 2023/9/13 13:56
+ */
+public interface DevelopmentViewMapper {
+
+    List<Map<String, Object>> getKeyProjectsByDeptId(DevelopmentView developmentView);
+
+    List<Map<String, Object>> getImportAreaByDeptId(DevelopmentView developmentView);
+}

src/main/java/com/sooka/sponest/data/digitaldevelopment/service/IDevelopmentViewService.java

@@ -0,0 +1,16 @@
+package com.sooka.sponest.data.digitaldevelopment.service;
+
+import com.sooka.sponest.data.base.service.IBaseService;
+import com.sooka.sponest.data.digitaldevelopment.domain.DevelopmentView;
+
+import java.util.Map;
+
+/**
+ * @author hanfucheng
+ * @date 2023/9/11 13:18
+ */
+public interface IDevelopmentViewService extends IBaseService {
+
+    // 统计各开发区工程数量
+    Map<String, Object> getKeyProjectsByDeptId(DevelopmentView developmentView);
+}

src/main/java/com/sooka/sponest/data/digitaldevelopment/service/impl/DevelopmentViewServiceImpl.java

@@ -0,0 +1,37 @@
+package com.sooka.sponest.data.digitaldevelopment.service.impl;
+
+import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.sooka.sponest.data.base.service.impl.BaseServiceImpl;
+import com.sooka.sponest.data.digitaldevelopment.domain.DevelopmentView;
+import com.sooka.sponest.data.digitaldevelopment.mapper.DevelopmentViewMapper;
+import com.sooka.sponest.data.digitaldevelopment.service.IDevelopmentViewService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *
+ * @author hanfucheng
+ * @date 2023/9/11 13:10
+ */
+@Service
+public class DevelopmentViewServiceImpl extends BaseServiceImpl implements IDevelopmentViewService {
+
+    @Autowired
+    private DevelopmentViewMapper developmentViewMapper;
+
+    @DataScopeMutiDept(deptAlias = "d")
+    @Override
+    public Map<String, Object> getKeyProjectsByDeptId(DevelopmentView developmentView) {
+        setSookaDataBase(developmentView);
+        List<Map<String, Object>> keyProjectsList = developmentViewMapper.getKeyProjectsByDeptId(developmentView);
+        List<Map<String, Object>> importAreaList = developmentViewMapper.getImportAreaByDeptId(developmentView);
+        Map<String,Object> map = new HashMap<>();
+        map.put("keyProjects",keyProjectsList);
+        map.put("importArea",importAreaList);
+        return map;
+    }
+}

src/main/java/com/sooka/sponest/data/digitalforest/controller/CenterdataTForestGridLevelController.java

@@ -6,9 +6,11 @@ import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestAfforestation;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestGridLevel;
 import com.sooka.sponest.data.digitalforest.domain.CenterdataTForestLinleader;
 import com.sooka.sponest.data.digitalforest.domain.vo.CenterdataTForestGridLevelVo;
+import com.sooka.sponest.data.digitalforest.service.ICenterdataTForestAfforestationService;
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTForestGridLevelService;
 import com.sooka.sponest.data.digitalforest.service.ICenterdataTForestLinleaderService;
 import com.sooka.sponest.data.utils.DataConstants;
@@ -39,6 +41,9 @@ public class CenterdataTForestGridLevelController extends BaseController {
     @Autowired
     private ICenterdataTForestLinleaderService iCenterdataTForestLinleaderService;
 
+    @Autowired
+    private ICenterdataTForestAfforestationService centerdataTForestAfforestationService;
+
     /**
      * 查询林业网格层级信息列表
      */
@@ -154,6 +159,12 @@ public class CenterdataTForestGridLevelController extends BaseController {
         if (!list.isEmpty()) {
             return AjaxResult.error("已有下级资源");
         }
+        CenterdataTForestAfforestation centerdataTForestAfforestation = new CenterdataTForestAfforestation();
+        centerdataTForestAfforestation.setForestFarmId(String.valueOf(id));
+        List<CenterdataTForestAfforestation> afforestationList = centerdataTForestAfforestationService.selectCenterdataTForestAfforestationList(centerdataTForestAfforestation);
+        if (!afforestationList.isEmpty()) {
+            return AjaxResult.error("已有下级资源");
+        }
         int result = centerdataTForestGridLevelService.deleteCenterdataTForestGridLevelById(id);
         return toAjax(result);
     }

src/main/java/com/sooka/sponest/data/digitalwater/controller/CenterdataTHydraulicWaterProjectController.java

@@ -10,6 +10,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicWaterProject;
 import com.sooka.sponest.data.digitalwater.service.ICenterdataTHydraulicWaterProjectService;
+import com.sooka.sponest.data.utils.DataConstants;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -88,6 +89,12 @@ public class CenterdataTHydraulicWaterProjectController extends BaseController {
     @Log(title = "水利工程资源", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@Validated @RequestBody CenterdataTHydraulicWaterProject centerdataTHydraulicWaterProject) {
+        String tableName = "centerdata_t_hydraulic_water_project";
+        String[] keys = {"name","dept_id"};
+        String[] values = {centerdataTHydraulicWaterProject.getName(),String.valueOf(centerdataTHydraulicWaterProject.getDeptId())};
+        if(!centerdataTHydraulicWaterProjectService.uniqueCheck(tableName, keys, values)){
+            return AjaxResult.error(DataConstants.ERROR_MSG);
+        }
         return toAjax(centerdataTHydraulicWaterProjectService.insertCenterdataTHydraulicWaterProject(centerdataTHydraulicWaterProject));
     }
 
@@ -99,6 +106,12 @@ public class CenterdataTHydraulicWaterProjectController extends BaseController {
     @Log(title = "水利工程资源", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody CenterdataTHydraulicWaterProject centerdataTHydraulicWaterProject) {
+        String tableName = "centerdata_t_hydraulic_water_project";
+        String[] keys = {"name" , "id","dept_id"};
+        String[] values = {centerdataTHydraulicWaterProject.getName() , centerdataTHydraulicWaterProject.getId(),String.valueOf(centerdataTHydraulicWaterProject.getDeptId())};
+        if(!centerdataTHydraulicWaterProjectService.uniqueCheck(tableName, keys, values)){
+            return AjaxResult.error(DataConstants.ERROR_MSG);
+        }
         return toAjax(centerdataTHydraulicWaterProjectService.updateCenterdataTHydraulicWaterProject(centerdataTHydraulicWaterProject));
     }
 

src/main/java/com/sooka/sponest/data/digitalwater/controller/WaterBigDataController.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.data.digitalwater.controller;
 
-import com.dahuatech.hutool.core.map.MapUtil;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
@@ -9,6 +8,7 @@ import com.sooka.sponest.data.digitalwater.domain.*;
 import com.sooka.sponest.data.digitalwater.service.IWaterBigDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -59,7 +59,7 @@ public class WaterBigDataController extends BaseController {
         List<Map<String, Object>> result = waterBigDataService.getChannelBluelineGroupByWaterConservancy(centerdataTHydraulicChannelBlueline);
         List<Long> numList = new ArrayList<>();
         for (Map<String, Object> map : result) {
-            numList.add(MapUtil.getLong(map, "value"));
+            numList.add(MapUtils.getLong(map, "value"));
         }
         Map<String, List> resultMap = new HashMap<>();
         resultMap.put("firesource", result);

src/main/java/com/sooka/sponest/data/digitalwater/service/ICenterdataTHydraulicWaterProjectService.java

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.digitalwater.service;
 
+import com.sooka.sponest.data.base.service.IBaseService;
 import com.sooka.sponest.data.digitalwater.domain.CenterdataTHydraulicWaterProject;
 
 import java.util.List;
@@ -10,7 +11,7 @@ import java.util.List;
  * @author lyq
  * @date 2022-11-17
  */
-public interface ICenterdataTHydraulicWaterProjectService {
+public interface ICenterdataTHydraulicWaterProjectService extends IBaseService {
 
     /**
      * 查询水利工程资源列表

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-不可用 )
      */

src/main/resources/logback.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+	<property name="log.path" value="logs/center-data" />
+   <!-- 日志输出格式 -->
+	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+    <!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+            <charset>UTF-8</charset>
+		</encoder>
+	</appender>
+
+    <!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+	<logger name="com.sooka.sponest.data" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+    <!--系统操作日志-->
+	<root level="info">
+		<appender-ref ref="console" />
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+	</root>
+</configuration>

src/main/resources/mapper/commandcenter/CommandCentreMapper.xml

@@ -238,6 +238,9 @@
             <if test="params.projectLevel != null and params.projectLevel != ''">
                 AND a.project_level = #{params.projectLevel}
             </if>
+            <if test="params.projectType != null and params.projectType != ''">
+                AND a.project_type = #{params.projectType}
+            </if>
         </where>
     </select>
 
@@ -690,5 +693,4 @@
         <if test="radius != null ">having distance &lt; #{radius}</if>
         ORDER BY distance ASC
     </select>
-
 </mapper>

src/main/resources/mapper/digitaldevelopment/DevelopmentViewMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.sooka.sponest.data.digitaldevelopment.mapper.DevelopmentViewMapper">
+
+    <select id="getKeyProjectsByDeptId" parameterType="DevelopmentView" resultType="map">
+        SELECT a.territoriality,COUNT(*)
+        FROM centerdata_t_key_projects a
+        LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
+        WHERE 1=1 ${params.dataScope} AND a.territoriality IS NOT null
+        <if test="park != null  and park != ''">and a.park = #{park}</if>
+        GROUP BY a.territoriality
+    </select>
+
+    <select id="getImportAreaByDeptId" parameterType="DevelopmentView" resultType="map">
+        SELECT b.dict_label name,COUNT(a.id) num
+        FROM ${database_system}.sys_dict_data b
+        LEFT JOIN (
+        SELECT a.id,a.project_level FROM centerdata_t_forest_importarea a
+        LEFT JOIN ${database_system}.sys_dept d ON a.dept_id = d.dept_id
+        where 1=1
+        <if test="projectType != null  and projectType != ''">and a.project_type = #{projectType}</if>
+         ${params.dataScope}
+        ) a ON b.dict_value = a.project_level
+        WHERE b.dict_type = 'centerdata_project_level'
+        GROUP BY b.dict_value
+    </select>
+</mapper>

src/main/resources/mapper/digitalenvironment/CenterdataTEnvironmentBigDataMapper.xml

@@ -141,6 +141,10 @@
         select '排污口' name,count(*) value from centerdata_t_environment_sewage_outlet a
             left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
         where 1=1 ${params.dataScope}
+        union all
+        select '水质断面监测' name,count(*) value from centerdata_t_environment_water_monitor a
+            left join ${database_system}.sys_dept d on d.dept_id = a.dept_id
+        where 1=1 ${params.dataScope}
     </select>
 
     <select id="findDataByYear" resultType="java.util.Map">

src/main/resources/mapper/generalbusiness/CenterdataTDailyMapper.xml

@@ -18,15 +18,16 @@
         <result property="dailyContent" column="daily_content"/>
         <result property="deptId" column="dept_id"/>
         <result property="deptName" column="dept_name"/>
+        <result property="createName" column="create_name"/>
     </resultMap>
 
     <sql id="selectCenterdataTDailyVo">
-        select id, create_by, create_time, update_by, update_time, data_status, data_dept_id, daily_type, daily_time, daily_title, daily_content, dept_id, dept_name from centerdata_t_daily
+        select id, create_by, create_time, create_name,update_by, update_time, data_status, data_dept_id, daily_type, daily_time, daily_title, daily_content, dept_id, dept_name from centerdata_t_daily
     </sql>
 
     <select id="selectCenterdataTDailyList" parameterType="CenterdataTDaily" resultMap="CenterdataTDailyResult">
         select a.id, a.create_by, a.create_time, a.update_by, a.update_time, a.data_status, a.data_dept_id, a.daily_type, a.daily_time,
-               a.daily_title, a.daily_content, a.dept_id, d.dept_name from centerdata_t_daily a
+               a.daily_title, a.daily_content, a.dept_id, d.dept_name,a.create_name from centerdata_t_daily a
         left join ${database_system}.sys_dept d ON d.dept_id = a.dept_id
         <where>
             <if test="dataStatus != null  and dataStatus != ''">and data_status = #{dataStatus}</if>