Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

epmet-auth/pom.xml

@@ -138,11 +138,11 @@
             <artifactId>epmet-auth-client</artifactId>
             <version>2.0.0</version>
         </dependency>
-        <dependency>
-            <artifactId>dingtalk-spring-boot-starter</artifactId>
-            <groupId>com.taobao</groupId>
-            <version>1.0.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <artifactId>dingtalk-spring-boot-starter</artifactId>-->
+<!--            <groupId>com.taobao</groupId>-->
+<!--            <version>1.0.0</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>

epmet-auth/src/main/java/com/epmet/AuthApplication.java

@@ -8,7 +8,6 @@
 
 package com.epmet;
 
-import com.taobao.dingtalk.spring.annotations.EnableDingTalk;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletComponentScan;
@@ -21,7 +20,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author Mark sunlightcs@gmail.com
  * @since 1.0.0
  */
-@EnableDingTalk
+//@EnableDingTalk
 @SpringBootApplication
 @EnableDiscoveryClient
 @EnableFeignClients

epmet-commons/epmet-commons-tools/pom.xml

@@ -14,7 +14,6 @@
 
     <properties>
         <hibernate.validator.version>6.0.17.Final</hibernate.validator.version>
-        <commons.lang.version>3.7</commons.lang.version>
         <commons.fileupload.version>1.3.3</commons.fileupload.version>
         <commons.io.version>2.6</commons.io.version>
         <hutool.version>4.6.1</hutool.version>
@@ -32,6 +31,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>hibernate-validator</artifactId>
+                    <groupId>org.hibernate.validator</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -45,6 +50,16 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-fileupload</artifactId>
+                    <groupId>commons-fileupload</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -66,15 +81,16 @@
             <artifactId>hibernate-validator</artifactId>
             <version>${hibernate.validator.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons.lang.version}</version>
-        </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>${commons.fileupload.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-io</artifactId>
+                    <groupId>commons-io</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -90,6 +106,12 @@
             <groupId>cn.afterturn</groupId>
             <artifactId>easypoi-base</artifactId>
             <version>${easypoi.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>javassist</artifactId>
+                    <groupId>org.javassist</groupId>
+                </exclusion>
+            </exclusions>
             <!--<scope>system</scope>
             <systemPath>${project.basedir}/src/main/resources/jar/easypoi-base-4.4.0.jar</systemPath>-->
         </dependency>
@@ -137,24 +159,54 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>httpclient</artifactId>
+                    <groupId>org.apache.httpcomponents</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- 钉钉机器人 -->
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>alibaba-dingtalk-service-sdk</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>kotlin-stdlib-common</artifactId>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.github.wnjustdoit</groupId>
@@ -201,6 +253,16 @@
             <groupId>com.tencentcloudapi</groupId>
             <artifactId>tencentcloud-sdk-java</artifactId>
             <version>3.1.322</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>okio</artifactId>
+                    <groupId>com.squareup.okio</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

epmet-module/data-report/data-report-client/pom.xml

@@ -16,6 +16,16 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-collections4</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>objenesis</artifactId>
+                    <groupId>org.objenesis</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>

epmet-module/data-report/data-report-server/pom.xml

@@ -100,6 +100,11 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-heart/epmet-heart-client/pom.xml

@@ -17,12 +17,24 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>objenesis</artifactId>
+                    <groupId>org.objenesis</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-user-client</artifactId>
             <version>2.0.0</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-collections4</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

epmet-module/epmet-third/epmet-third-client/pom.xml

@@ -24,6 +24,14 @@
                     <artifactId>feign-form-spring</artifactId>
                     <groupId>io.github.openfeign.form</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>objenesis</artifactId>
+                    <groupId>org.objenesis</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>asm</artifactId>
+                    <groupId>org.ow2.asm</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -31,12 +39,28 @@
             <artifactId>weixin-java-mp</artifactId>
             <version>3.6.0</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-io</artifactId>
+                    <groupId>commons-io</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-user-client</artifactId>
             <version>2.0.0</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-collections4</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign.form</groupId>
@@ -52,6 +76,12 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>1.3.3</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-io</artifactId>
+                    <groupId>commons-io</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -157,16 +157,27 @@
             <artifactId>rocketmq-acl</artifactId>
             <version>4.9.2</version>
         </dependency>
-        <dependency>
-            <artifactId>dingtalk-spring-boot-starter</artifactId>
-            <groupId>com.taobao</groupId>
-            <version>1.0.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <artifactId>dingtalk-common</artifactId>-->
+<!--            <groupId>com.taobao</groupId>-->
+<!--            <version>1.0.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <artifactId>dingtalk-spring-boot-starter</artifactId>-->
+<!--            <groupId>com.taobao</groupId>-->
+<!--            <version>1.0.0</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
             <version>1.15</version>
         </dependency>
+        <!--Knife4j-->
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>2.0.5</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -228,7 +239,8 @@
                 <thread.threadPool.queue-capacity>20</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
                 <thread.threadPool.thread-name-prefix>epmet-third</thread.threadPool.thread-name-prefix>
-                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy
+                </thread.threadPool.rejected-execution-handler>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
 
@@ -288,7 +300,8 @@
                 <thread.threadPool.queue-capacity>20</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
                 <thread.threadPool.thread-name-prefix>epmet-third</thread.threadPool.thread-name-prefix>
-                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy
+                </thread.threadPool.rejected-execution-handler>
 
                 <spring.flyway.enabled>false</spring.flyway.enabled>
                 <!--钉钉 机器人地址-->
@@ -347,7 +360,8 @@
                 <thread.threadPool.queue-capacity>20</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
                 <thread.threadPool.thread-name-prefix>epmet-third</thread.threadPool.thread-name-prefix>
-                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy
+                </thread.threadPool.rejected-execution-handler>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
                 <!--测试钉钉 机器人地址-->
@@ -407,7 +421,8 @@
                 <thread.threadPool.queue-capacity>20</thread.threadPool.queue-capacity>
                 <thread.threadPool.keep-alive-seconds>60</thread.threadPool.keep-alive-seconds>
                 <thread.threadPool.thread-name-prefix>epmet-third</thread.threadPool.thread-name-prefix>
-                <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
+                <thread.threadPool.rejected-execution-handler>callerRunsPolicy
+                </thread.threadPool.rejected-execution-handler>
 
                 <spring.flyway.enabled>true</spring.flyway.enabled>
 

epmet-module/gov-issue/gov-issue-client/pom.xml

@@ -16,6 +16,20 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>objenesis</artifactId>
+                    <groupId>org.objenesis</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>asm</artifactId>
+                    <groupId>org.ow2.asm</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-collections4</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>

epmet-module/gov-org/gov-org-client/pom.xml

@@ -17,6 +17,20 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>objenesis</artifactId>
+                    <groupId>org.objenesis</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-collections4</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>asm</artifactId>
+                    <groupId>org.ow2.asm</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

epmet-module/gov-project/gov-project-client/pom.xml

@@ -16,12 +16,21 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>objenesis</artifactId>
+                    <groupId>org.objenesis</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-collections4</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>resi-mine-client</artifactId>
             <version>2.0.0</version>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventReplyFormDTO.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description 事件管理_回复
@@ -50,7 +51,27 @@ public class IcEventReplyFormDTO implements Serializable {
     @NotBlank(message = "满意度不能为空", groups = {Comment.class})
     private String satisfaction;
 
+    /**
+     * 办理状态：0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档
+     */
+    private Integer manageStatus;
+
+    /**
+     * 办理时间
+     */
+    private Date manageTime;
+
+    /**
+     * 办理人
+     */
+    private String manageResi;
+
+    /**
+     * 办理人电话
+     */
+    private String manageResiTel;
+
     private String customerId;
     private String userId;
 
-}
+}

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -92,5 +93,25 @@ public class IcEventProcessListResultDTO implements Serializable {
      */
     private String actualServiceTime;
 
+    /**
+     * 办理状态：0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档
+     */
+    private Integer manageStatus;
+
+    /**
+     * 办理时间
+     */
+    private Date manageTime;
+
+    /**
+     * 办理人
+     */
+    private String manageResi;
+
+    /**
+     * 办理人电话
+     */
+    private String manageResiTel;
+
 
 }

epmet-module/gov-project/gov-project-server/pom.xml

@@ -33,6 +33,12 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>objenesis</artifactId>
+                    <groupId>org.objenesis</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
@@ -59,6 +65,12 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java

@@ -61,6 +61,11 @@ public class IcEventEntity extends BaseEpmetEntity {
      */
 	private String idCard;
 
+	/**
+	 * 事件分类分类Id :灵山专用
+	 */
+	private String categoryId;
+
 	/**
 	 * 反映渠道【字典表】dictTypeKey:ic_event_source_type;随手拍随时讲0、多媒体反应1、社区电话2、12345:3、网格员手持终端：4
 	 */
@@ -117,7 +122,7 @@ public class IcEventEntity extends BaseEpmetEntity {
 	private Integer readFlag;
 
     /**
-     * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1; 
+     * 报事人的红点:展示1；不展示：0；人大代表回复，工作人员回复/立项/转需求/办结更新为1;
      */
 	private Integer redDot;
 
@@ -157,7 +162,7 @@ public class IcEventEntity extends BaseEpmetEntity {
 	private Date commentTime;
 
     /**
-     * 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing； 
+     * 事件审核状态[涉及附件审核需要加的状态]（审核中：auditing；
 		auto_passed: 自动通过；
 		review：结果不确定，需要人工审核；
 		block: 结果违规；

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventReplyEntity.java

@@ -46,4 +46,24 @@ public class IcEventReplyEntity extends BaseEpmetEntity {
      */
 	private String userShowName;
 
+	/**
+	 * 办理状态：0、上报 1、阅收 2、完结 3、审核 4、事件评价 5、结案归档
+	 */
+	private Integer manageStatus;
+
+	/**
+	 * 办理时间
+	 */
+	private Date manageTime;
+
+	/**
+	 * 办理人
+	 */
+	private String manageResi;
+
+	/**
+	 * 办理人电话
+	 */
+	private String manageResiTel;
+
 }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -798,6 +798,10 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         replyEntity.setCustomerId(formDTO.getCustomerId());
         replyEntity.setIcEventId(formDTO.getIcEventId());
         replyEntity.setFromUserId(formDTO.getUserId());
+        replyEntity.setManageResi(formDTO.getManageResi());
+        replyEntity.setManageResiTel(formDTO.getManageResiTel());
+        replyEntity.setManageStatus(formDTO.getManageStatus());
+        replyEntity.setManageTime(formDTO.getManageTime());
         replyEntity.setContent(formDTO.getContent());
         replyEntity.setUserShowName(staffInfo.getAgencyName() + "-" + staffInfo.getRealName());
         icEventReplyService.insert(replyEntity);

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventReplyDao.xml

@@ -10,7 +10,11 @@
             '回复' processName,
             UNIX_TIMESTAMP(created_time) processTime,
             user_show_name departmentName,
-            content publicReply
+            content publicReply,
+            manage_status,
+            manage_time,
+            manage_resi,
+            manage_resi_tel
         FROM
             ic_event_reply
         WHERE
@@ -34,4 +38,4 @@
         ORDER BY
             r.CREATED_TIME DESC
     </select>
-</mapper>
+</mapper>

epmet-user/epmet-user-client/pom.xml

@@ -17,6 +17,16 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-tools</artifactId>
             <version>2.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>objenesis</artifactId>
+                    <groupId>org.objenesis</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>asm</artifactId>
+                    <groupId>org.ow2.asm</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -24,6 +34,12 @@
             <artifactId>gov-org-client</artifactId>
             <version>2.0.0</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-collections4</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>