diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 1822235cdc..12111136e2 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -138,11 +138,11 @@ epmet-auth-client 2.0.0 - - dingtalk-spring-boot-starter - com.taobao - 1.0.0 - + + + + + commons-codec commons-codec diff --git a/epmet-auth/src/main/java/com/epmet/AuthApplication.java b/epmet-auth/src/main/java/com/epmet/AuthApplication.java index 07d85a0d5f..7cd7afed50 100644 --- a/epmet-auth/src/main/java/com/epmet/AuthApplication.java +++ b/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 diff --git a/epmet-commons/epmet-commons-tools/pom.xml b/epmet-commons/epmet-commons-tools/pom.xml index 4cd073f977..bf8cd4c2a3 100644 --- a/epmet-commons/epmet-commons-tools/pom.xml +++ b/epmet-commons/epmet-commons-tools/pom.xml @@ -14,7 +14,6 @@ 6.0.17.Final - 3.7 1.3.3 2.6 4.6.1 @@ -32,6 +31,12 @@ org.springframework.boot spring-boot-starter-web provided + + + hibernate-validator + org.hibernate.validator + + org.springframework.boot @@ -45,6 +50,16 @@ org.springframework.cloud spring-cloud-starter-openfeign + + + guava + com.google.guava + + + commons-fileupload + commons-fileupload + + org.springframework.boot @@ -66,15 +81,16 @@ hibernate-validator ${hibernate.validator.version} - - org.apache.commons - commons-lang3 - ${commons.lang.version} - commons-fileupload commons-fileupload ${commons.fileupload.version} + + + commons-io + commons-io + + commons-io @@ -90,6 +106,12 @@ cn.afterturn easypoi-base ${easypoi.version} + + + javassist + org.javassist + + @@ -137,24 +159,54 @@ org.apache.httpcomponents httpmime + + + httpclient + org.apache.httpcomponents + + org.apache.httpcomponents httpmime + + + httpclient + org.apache.httpcomponents + + commons-httpclient commons-httpclient 3.1 + + + commons-logging + commons-logging + + com.aliyun alibaba-dingtalk-service-sdk + + + commons-logging + commons-logging + + com.squareup.okhttp3 okhttp + + + kotlin-stdlib-common + org.jetbrains.kotlin + + io.github.wnjustdoit @@ -201,6 +253,16 @@ com.tencentcloudapi tencentcloud-sdk-java 3.1.322 + + + okio + com.squareup.okio + + + commons-logging + commons-logging + + diff --git a/epmet-module/data-report/data-report-client/pom.xml b/epmet-module/data-report/data-report-client/pom.xml index 8700a85f3b..52b71441b2 100644 --- a/epmet-module/data-report/data-report-client/pom.xml +++ b/epmet-module/data-report/data-report-client/pom.xml @@ -16,6 +16,16 @@ com.epmet epmet-commons-tools 2.0.0 + + + commons-collections4 + org.apache.commons + + + objenesis + org.objenesis + + com.epmet diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index dd4ade5343..37f3f887ff 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -100,6 +100,11 @@ 2.0.0 compile + + org.apache.commons + commons-collections4 + 4.4 + diff --git a/epmet-module/epmet-heart/epmet-heart-client/pom.xml b/epmet-module/epmet-heart/epmet-heart-client/pom.xml index 6ef934f473..93ddda3345 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-client/pom.xml @@ -17,12 +17,24 @@ com.epmet epmet-commons-tools 2.0.0 + + + objenesis + org.objenesis + + com.epmet epmet-user-client 2.0.0 compile + + + commons-collections4 + org.apache.commons + + diff --git a/epmet-module/epmet-third/epmet-third-client/pom.xml b/epmet-module/epmet-third/epmet-third-client/pom.xml index 37b51d9479..6f547acc9b 100644 --- a/epmet-module/epmet-third/epmet-third-client/pom.xml +++ b/epmet-module/epmet-third/epmet-third-client/pom.xml @@ -24,6 +24,14 @@ feign-form-spring io.github.openfeign.form + + objenesis + org.objenesis + + + asm + org.ow2.asm + @@ -31,12 +39,28 @@ weixin-java-mp 3.6.0 compile + + + guava + com.google.guava + + + commons-io + commons-io + + com.epmet epmet-user-client 2.0.0 compile + + + commons-collections4 + org.apache.commons + + io.github.openfeign.form @@ -52,6 +76,12 @@ commons-fileupload commons-fileupload 1.3.3 + + + commons-io + commons-io + + diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index a70d2ac789..81e7bf071b 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -157,16 +157,27 @@ rocketmq-acl 4.9.2 - - dingtalk-spring-boot-starter - com.taobao - 1.0.0 - + + + + + + + + + + commons-codec commons-codec 1.15 + + + com.github.xiaoymin + knife4j-spring-boot-starter + 2.0.5 + @@ -228,7 +239,8 @@ 20 60 epmet-third - callerRunsPolicy + callerRunsPolicy + false @@ -288,7 +300,8 @@ 20 60 epmet-third - callerRunsPolicy + callerRunsPolicy + false @@ -347,7 +360,8 @@ 20 60 epmet-third - callerRunsPolicy + callerRunsPolicy + true @@ -407,7 +421,8 @@ 20 60 epmet-third - callerRunsPolicy + callerRunsPolicy + true diff --git a/epmet-module/gov-issue/gov-issue-client/pom.xml b/epmet-module/gov-issue/gov-issue-client/pom.xml index 9d07717da1..3d3e48c82b 100644 --- a/epmet-module/gov-issue/gov-issue-client/pom.xml +++ b/epmet-module/gov-issue/gov-issue-client/pom.xml @@ -16,6 +16,20 @@ com.epmet epmet-commons-tools 2.0.0 + + + objenesis + org.objenesis + + + asm + org.ow2.asm + + + commons-collections4 + org.apache.commons + + com.epmet diff --git a/epmet-module/gov-org/gov-org-client/pom.xml b/epmet-module/gov-org/gov-org-client/pom.xml index 45a34fa42a..d608d5c67a 100644 --- a/epmet-module/gov-org/gov-org-client/pom.xml +++ b/epmet-module/gov-org/gov-org-client/pom.xml @@ -17,6 +17,20 @@ com.epmet epmet-commons-tools 2.0.0 + + + objenesis + org.objenesis + + + commons-collections4 + org.apache.commons + + + asm + org.ow2.asm + + diff --git a/epmet-module/gov-project/gov-project-client/pom.xml b/epmet-module/gov-project/gov-project-client/pom.xml index 6bf188e6e8..024e15c963 100644 --- a/epmet-module/gov-project/gov-project-client/pom.xml +++ b/epmet-module/gov-project/gov-project-client/pom.xml @@ -16,12 +16,21 @@ com.epmet epmet-commons-tools 2.0.0 + + + objenesis + org.objenesis + + + commons-collections4 + org.apache.commons + + com.epmet resi-mine-client 2.0.0 - compile \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventReplyFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventReplyFormDTO.java index 6c9bacafa8..05e42de873 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventReplyFormDTO.java +++ b/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; -} \ No newline at end of file +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java index 4379252a67..51b82fcfca 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventProcessListResultDTO.java +++ b/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; + } diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index abb978b7ce..282d044073 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -33,6 +33,12 @@ com.epmet epmet-commons-tools 2.0.0 + + + objenesis + org.objenesis + + com.epmet @@ -59,6 +65,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery + + + guava + com.google.guava + + com.alibaba.cloud diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java index 81c5635aaf..c20ab1ec25 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventEntity.java +++ b/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: 结果违规； diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventReplyEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventReplyEntity.java index e477a9cb2a..dfa2b8cbc7 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/IcEventReplyEntity.java +++ b/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; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index e5bf477bc6..62a42a2aea 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/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 - \ No newline at end of file + diff --git a/epmet-user/epmet-user-client/pom.xml b/epmet-user/epmet-user-client/pom.xml index 876d2e5e57..7d9a737683 100644 --- a/epmet-user/epmet-user-client/pom.xml +++ b/epmet-user/epmet-user-client/pom.xml @@ -17,6 +17,16 @@ com.epmet epmet-commons-tools 2.0.0 + + + objenesis + org.objenesis + + + asm + org.ow2.asm + + @@ -24,6 +34,12 @@ gov-org-client 2.0.0 compile + + + commons-collections4 + org.apache.commons + +