Browse Source

Merge branch 'dev_1118' into dev_youhua

# Conflicts:
#	esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
#	esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
#	esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
#	esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
feature/dangjian
管理员 6 years ago
parent
commit
c5a4900aa5
  1. 45
      esua-epdc/epdc-admin/epdc-admin-server/pom.xml
  2. 14
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml
  3. 21
      esua-epdc/epdc-auth/pom.xml
  4. 11
      esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java
  5. 39
      esua-epdc/epdc-gateway/pom.xml
  6. 11
      esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java
  7. 35
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  8. 8
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java
  9. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java
  10. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java
  11. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java
  12. 25
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
  13. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java
  14. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java
  15. 7
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java
  16. 127
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentInsertDTO.java
  17. 66
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentUserAttitudeInsertDTO.java
  18. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java
  19. 9
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java
  20. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java
  21. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java
  22. 9
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java
  23. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java
  24. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java
  25. 35
      esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
  26. 12
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java
  27. 12
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentUserAttitudeDao.java
  28. 10
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentUserAttitudeService.java
  29. 25
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
  30. 15
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java
  31. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
  32. 5
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  33. 34
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml
  34. 28
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/EventCommentUserAttitudeDao.xml
  35. 13
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml
  36. 18
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
  37. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml
  38. 5
      esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicListFormDTO.java
  39. 25
      esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
  40. 3
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java
  41. 6
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java
  42. 3
      esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml
  43. 27
      esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
  44. 24
      esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
  45. 24
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml
  46. 24
      esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
  47. 24
      esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
  48. 22
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/BannerDao.java
  49. 18
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/BannerService.java
  50. 19
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java
  51. 33
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
  52. 18
      esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml
  53. 30
      esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
  54. 25
      esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
  55. 9
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
  56. 10
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java
  57. 16
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java
  58. 16
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/exception/UserModuleErrorCode.java
  59. 14
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
  60. 2
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties
  61. 23
      esua-epdc/epdc-module/epdc-webservice/pom.xml
  62. 50
      esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java
  63. 33
      esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml

45
esua-epdc/epdc-admin/epdc-admin-server/pom.xml

@ -173,6 +173,12 @@
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>10.5.34.164</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink@833066</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
@ -184,6 +190,45 @@
<!--工作端小程序-->
<work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
<work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://10.5.34.164:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<server.port>9055</server.port>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
<spring.zipkin.base-url>http://172.31.171.61:9411</spring.zipkin.base-url>
<!--居民端小程序配置-->
<wx.ma.appId>wx04ee7d7a849fa2a8</wx.ma.appId>
<wx.ma.secret>3980e207b86bccea8d3c0bf7d16adeba</wx.ma.secret>
<!--工作端小程序-->
<work.wx.ma.appId>wxddb240334d09049f</work.wx.ma.appId>
<work.wx.ma.secret>071b8c70da0d0482aaf79052e64f83bc</work.wx.ma.secret>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
</properties>
</profile>
</profiles>

14
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml

@ -1,16 +1,16 @@
spring:
redis:
database: 0
host: 10.5.34.164
database: @spring.redis.index@
host: @spring.redis.host@
timeout: 30s
port: 6379
password: Elink@833066
port: @spring.redis.port@
password: @spring.redis.password@
datasource:
druid:
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://10.5.34.164:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: epdc
password: Elink@833066
url: @spring.datasource.druid.url@
username: @spring.datasource.druid.username@
password: @spring.datasource.druid.password@
initial-size: 10
max-active: 100
min-idle: 10

21
esua-epdc/epdc-auth/pom.xml

@ -158,5 +158,26 @@
<spring.zipkin.base-url>http://172.31.171.61:9411</spring.zipkin.base-url>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<server.port>9056</server.port>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
<spring.zipkin.base-url>http://172.31.171.61:9411</spring.zipkin.base-url>
</properties>
</profile>
</profiles>
</project>

11
esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java

@ -29,6 +29,9 @@ public class SearchCaseProcessByTaskIdItemDto {
@XStreamAlias("note")
private String note;
@XStreamAlias("operatetype")
private String operatetype;
public String getTaskid() {
return taskid;
}
@ -76,4 +79,12 @@ public class SearchCaseProcessByTaskIdItemDto {
public void setNote(String note) {
this.note = note;
}
public String getOperatetype() {
return operatetype;
}
public void setOperatetype(String operatetype) {
this.operatetype = operatetype;
}
}

39
esua-epdc/epdc-gateway/pom.xml

@ -221,6 +221,45 @@
<spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<server.port>9094</server.port>
<docker.tag>prod</docker.tag>
<!-- gateway routes -->
<gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
<gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>
<gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
<gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
<gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
<gateway.routes.epdc-message-server.uri>lb://epdc-message-server</gateway.routes.epdc-message-server.uri>
<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>
<gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
<gateway.routes.epdc-events-server.uri>lb://epdc-events-server</gateway.routes.epdc-events-server.uri>
<gateway.routes.epdc-services-server.uri>lb://epdc-services-server</gateway.routes.epdc-services-server.uri>
<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>
<gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>
<gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server</gateway.routes.epdc-websocket-server.uri>
<gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
<spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
</properties>
</profile>
</profiles>
</project>

11
esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java

@ -43,4 +43,15 @@ public class EpdcAppAuthorizationDTO implements Serializable {
* 网格名称
*/
private String grid;
/**
* 0成功 1党员认证失败
*/
private String resultCode;
/**
* 党员认证失败信息
*/
private String resultMsg;
}

35
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml

@ -258,6 +258,41 @@
<work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<server.port>9040</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
<!--公众号配置-->
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
<wx.mp.configs.token>111</wx.mp.configs.token>
<wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
<!--居民端小程序配置-->
<wx.ma.appId>wx04ee7d7a849fa2a8</wx.ma.appId>
<wx.ma.secret>3980e207b86bccea8d3c0bf7d16adeba</wx.ma.secret>
<!--工作端小程序-->
<work.wx.ma.appId>wxddb240334d09049f</work.wx.ma.appId>
<work.wx.ma.secret>071b8c70da0d0482aaf79052e64f83bc</work.wx.ma.secret>
</properties>
</profile>
</profiles>
</project>

8
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java

@ -98,14 +98,14 @@ public class ApiIssueController {
/**
* 议题分类统计
* @Params: [userDetail, categoryCode]
* @Params: [userDetail, firstCategoryCode]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO>
* @Author: liuchuang
* @Date: 2019/9/9 12:26
*/
@GetMapping("statistics/{categoryCode}")
public Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryCode) {
return issueService.getIssueCategoryStatistics(userDetail, categoryCode);
@GetMapping("statistics/{firstCategoryCode}")
public Result<IssueCategoryStatisticsResultDTO> issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String firstCategoryCode) {
return issueService.getIssueCategoryStatistics(userDetail, firstCategoryCode);
}
/**

6
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java

@ -65,9 +65,9 @@ public class ApiItemController {
* @Author: liuchuang
* @Date: 2019/9/12 13:26
*/
@GetMapping("statistics/{categoryCode}")
public Result<ItemCategoryStatisticsResultDTO> itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryCode) {
return itemService.getItemCategoryStatistics(userDetail, categoryCode);
@GetMapping("statistics/{firstCategoryCode}")
public Result<ItemCategoryStatisticsResultDTO> itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String firstCategoryCode) {
return itemService.getItemCategoryStatistics(userDetail, firstCategoryCode);
}
/**

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java

@ -64,12 +64,12 @@ public interface IssueService {
/**
* 议题分类统计
* @Params: [userDetail, categoryCode]
* @Params: [userDetail, firstCategoryCode]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.issue.result.IssueCategoryStatisticsResultDTO>
* @Author: liuchuang
* @Date: 2019/9/9 12:27
*/
Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String categoryCode);
Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String firstCategoryCode);
/**
* 议题处理进度

2
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java

@ -48,7 +48,7 @@ public interface ItemService {
* @Author: liuchuang
* @Date: 2019/9/12 13:27
*/
Result<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String categoryCode);
Result<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String firstCategoryCode);
/**
* 项目处理进度

25
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@ -271,11 +271,12 @@ public class AppUserServiceImpl implements AppUserService {
// 校验手机号是否已被注册为小程序用户
EpdcUserRegistFormDTO verifyAppUser = new EpdcUserRegistFormDTO();
verifyAppUser.setMobile(mobile);
// 在获取信息时就进行校验,不消耗wxCode,用户可以重复提交
Result verifyUserRegisterData = userFeignClient.verifyUserRegisterData(verifyAppUser);
if (!verifyUserRegisterData.success()) {
return new Result().error(verifyUserRegisterData.getMsg());
}
//修改bug:已注册用户不能注册网格长 去调查重
// // 在获取信息时就进行校验,不消耗wxCode,用户可以重复提交
// Result verifyUserRegisterData = userFeignClient.verifyUserRegisterData(verifyAppUser);
// if (!verifyUserRegisterData.success()) {
// return new Result().error(verifyUserRegisterData.getMsg());
// }
// 校验手机验证码
this.checkSmsCode(mobile, formDto.getSmsCode());
@ -288,7 +289,12 @@ public class AppUserServiceImpl implements AppUserService {
// 组装用户注册信息
EpdcGridLeaderRegisterDTO gridLeaderRegister = this.packageGridLeaderWhileRegister(leaderRegisterDto.getSysUser(), formDto.getWxCode());
List<UserGridRelationDTO> userGridList = ConvertUtils.sourceToTarget(leaderRegisterDto.getLeaderGridList(), UserGridRelationDTO.class);
for(UserGridRelationDTO item: userGridList){
item.setAllDeptNames(item.getDistrict()+"-"+item.getStreet()+"-"+item.getCommunity()+"-"+item.getGrid());
item.setAllDeptIds(item.getDistrictId()+","+item.getStreetId()+","+item.getCommunityId()+","+item.getGridId());
item.setParentDeptIds(item.getDistrict()+"-"+item.getStreet()+"-"+item.getCommunity());
item.setParentDeptNames(item.getDistrictId()+","+item.getStreetId()+","+item.getCommunityId());
}
EpdcGridLeaderRegisterFormDTO registerDto = new EpdcGridLeaderRegisterFormDTO();
registerDto.setGridLeader(gridLeaderRegister);
registerDto.setUserGridList(userGridList);
@ -826,6 +832,13 @@ public class AppUserServiceImpl implements AppUserService {
Result<UserDTO> completeResult = userFeignClient.completeUserInfo(dto);
if (!completeResult.success()) {
//党员认证失败
if(100006001==completeResult.getCode()){
EpdcAppAuthorizationDTO authorizationDto = new EpdcAppAuthorizationDTO();
authorizationDto.setResultCode(YesOrNoEnum.YES.value());
authorizationDto.setResultMsg(completeResult.getMsg());
return new Result().ok(authorizationDto);
}
return new Result().error(completeResult.getMsg());
}
//更新用户缓存信息

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java

@ -156,12 +156,12 @@ public class IssueServiceImpl implements IssueService {
}
@Override
public Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String categoryCode) {
public Result<IssueCategoryStatisticsResultDTO> getIssueCategoryStatistics(TokenDto userDetail, String firstCategoryCode) {
if (null == userDetail) {
return new Result<IssueCategoryStatisticsResultDTO>().error("获取用户信息失败");
}
IssueCategoryStatisticsFormDTO formDto = new IssueCategoryStatisticsFormDTO();
formDto.setCategoryCode(categoryCode);
formDto.setFirstCategoryCode(firstCategoryCode);
formDto.setGridId(userDetail.getGridId());
return issueFeignClient.issueCategoryStatistics(formDto);
}

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java

@ -56,12 +56,12 @@ public class ItemServiceImpl implements ItemService {
}
@Override
public Result<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String categoryCode) {
public Result<ItemCategoryStatisticsResultDTO> getItemCategoryStatistics(TokenDto userDetail, String firstCategoryCode) {
if (null == userDetail) {
return new Result<ItemCategoryStatisticsResultDTO>().error("获取用户信息失败");
}
ItemCategoryStatisticsFormDTO formDto = new ItemCategoryStatisticsFormDTO();
formDto.setCategoryCode(categoryCode);
formDto.setFirstCategoryCode(firstCategoryCode);
formDto.setGridId(userDetail.getGridId());
return itemFeignClient.itemCategoryStatistics(formDto);
}

7
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java

@ -17,9 +17,10 @@
package com.elink.esua.epdc.dto.comment;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
@ -148,4 +149,8 @@ public class EventCommentDTO implements Serializable {
*/
private String partyFlag;
/**
* 屏蔽标识 0未屏蔽1已屏蔽
*/
private String shieldFlag;
}

127
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentInsertDTO.java

@ -0,0 +1,127 @@
package com.elink.esua.epdc.dto.comment;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Description 批量插入语句入参DTO
* @Author yinzuomei
* @Date 2020/1/7 10:54
*/
@Data
public class EventCommentInsertDTO implements Serializable {
private static final long serialVersionUID = 7655555156156253291L;
/**
* id
*/
private String id;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建者
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 修改者
*/
private String updatedBy;
/**
* 修改时间
*/
private Date updatedTime;
/**
* 是否已删除(0-未删除1-已删除)
*/
private String delFlag;
/**
* 事件ID
*/
private String eventId;
/**
* 评论人ID
*/
private String userId;
/**
* 评论人昵称
*/
private String userName;
/**
* 评论人头像
*/
private String userFace;
/**
* 评论内容
*/
private String content;
/**
* 评论类型 0评论1回复2回复的回复
*/
private String commentType;
/**
* 回复的评论ID
*/
private String commentId;
/**
* 被回复数
*/
private Integer replyCount;
/**
* 被回复人ID
*/
private String replyUserId;
/**
* 被回复人名称
*/
private String replyUserName;
/**
* 被回复人头像
*/
private String replyUserFace;
/**
* 点赞数
*/
private Integer likeCount;
/**
* 点踩数
*/
private Integer unLikeCount;
/**
* 屏蔽标识 0未屏蔽1已屏蔽
*/
private String shieldFlag;
/**
* PARTY_FLAG 党员标识0-1-
*/
private String partyFlag;
}

66
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentUserAttitudeInsertDTO.java

@ -0,0 +1,66 @@
package com.elink.esua.epdc.dto.comment;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Description insertBatch语句入参DTO
* @Author yinzuomei
* @Date 2020/1/7 10:59
*/
@Data
public class EventCommentUserAttitudeInsertDTO implements Serializable {
private static final long serialVersionUID = 7411860501816838452L;
/**
* 事件评论ID
*/
private String eventCommentId;
/**
* 用户ID
*/
private String userId;
/**
* 用户点赞点踩标识 0取消点赞1点赞
*/
private String attitudeFlag;
/**
* id
*/
private String id;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建者
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 修改者
*/
private String updatedBy;
/**
* 修改时间
*/
private Date updatedTime;
/**
* 是否已删除(0-未删除1-已删除)
*/
private String delFlag;
}

2
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java

@ -23,5 +23,5 @@ public class IssueCategoryStatisticsFormDTO implements Serializable {
* 议题类别ID
*/
@NotBlank(message = "议题类别ID不能为空")
private String categoryCode;
private String firstCategoryCode;
}

9
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java

@ -50,7 +50,12 @@ public class IssueFormDTO implements Serializable {
*/
private Date someMonthsAgo;
/**
* 议题分类ID
* 议题一级分类ID
*/
private String categoryCode;
private String firstCategoryCode;
/**
* 议题ID
*/
private String issueId;
}

5
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java

@ -79,4 +79,9 @@ public class IssueDetailResultDTO implements Serializable {
* 议事图片
*/
private List<String> images;
/**
* 一级分类编码
*/
private String firstCategoryCode;
}

2
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java

@ -24,5 +24,5 @@ public class ItemCategoryStatisticsFormDTO implements Serializable {
* 议题类别ID
*/
@NotBlank(message = "议题类别ID不能为空")
private String categoryCode;
private String firstCategoryCode;
}

9
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java

@ -45,9 +45,9 @@ public class ItemFormDTO implements Serializable {
*/
private Date someMonthsAgo;
/**
* 议题分类ID
* 议题一级分类ID
*/
private String categoryCode;
private String firstCategoryCode;
/**
* 用户ID
*/
@ -62,4 +62,9 @@ public class ItemFormDTO implements Serializable {
*/
@NotNull(message = "项目状态不能为空")
private Integer itemState;
/**
* 项目ID
*/
private String itemId;
}

5
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java

@ -125,4 +125,9 @@ public class ItemDetailResultDTO implements Serializable {
* 议事图片
*/
private List<String> images;
/**
* 一级分类编码
*/
private String firstCategoryCode;
}

2
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java

@ -15,7 +15,7 @@ public enum ItemGridPlatformHandleStatusEnum {
HANDLE_SL(20, "受理"),
HANDLE_LA(25, "立案"),
HANDLE_PQ(30, "派遣"),
HANDLE_ZJZP(35, "中间再派"),
HANDLE_ZJZP(35, "中间再派"),
HANDLE_JD(40, "接单"),
HANDLE_CL(45, "处理"),
HANDLE_ZJDB(50, "中间督办"),

35
esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml

@ -204,7 +204,6 @@
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
<nacos.register.ip></nacos.register.ip>
<docker.tag>test</docker.tag>
@ -246,7 +245,6 @@
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
<nacos.register.ip></nacos.register.ip>
<docker.tag>prod</docker.tag>
@ -258,6 +256,39 @@
<work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<server.port>9066</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
<docker.tag>prod</docker.tag>
<!--居民端小程序配置-->
<wx.ma.appId>wx04ee7d7a849fa2a8</wx.ma.appId>
<wx.ma.secret>3980e207b86bccea8d3c0bf7d16adeba</wx.ma.secret>
<!--工作端小程序-->
<work.wx.ma.appId>wxddb240334d09049f</work.wx.ma.appId>
<work.wx.ma.secret>071b8c70da0d0482aaf79052e64f83bc</work.wx.ma.secret>
</properties>
</profile>
</profiles>
</project>

12
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java

@ -18,7 +18,7 @@
package com.elink.esua.epdc.modules.comment.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.comment.EventCommentInsertDTO;
import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO;
@ -28,6 +28,7 @@ import com.elink.esua.epdc.dto.issue.result.IssueHotCommentResultDTO;
import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO;
import com.elink.esua.epdc.modules.comment.entity.EventCommentEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -112,4 +113,13 @@ public interface EventCommentDao extends BaseDao<EventCommentEntity> {
* @return
*/
WorkEventsCommentsDTO commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO);
/**
* @param commentEntities
* @return int
* @Author yinzuomei
* @Description 批量插入
* @Date 2020/1/6 17:40
**/
int batchInsertEventComment(@Param("list") List<EventCommentInsertDTO> commentEntities);
}

12
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentUserAttitudeDao.java

@ -18,8 +18,12 @@
package com.elink.esua.epdc.modules.comment.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeInsertDTO;
import com.elink.esua.epdc.modules.comment.entity.EventCommentUserAttitudeEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 事件评论点赞点踩表 事件评论点赞点踩表
@ -30,4 +34,12 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface EventCommentUserAttitudeDao extends BaseDao<EventCommentUserAttitudeEntity> {
/**
* @param attitudeEntities
* @return int
* @Author yinzuomei
* @Description
* @Date 2020/1/6 18:05
**/
int batchInsert(@Param("list") List<EventCommentUserAttitudeInsertDTO> attitudeEntities);
}

10
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentUserAttitudeService.java

@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO;
import com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeDTO;
import com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeInsertDTO;
import com.elink.esua.epdc.modules.comment.entity.EventCommentUserAttitudeEntity;
import java.util.List;
@ -100,4 +101,13 @@ public interface EventCommentUserAttitudeService extends BaseService<EventCommen
* @return
*/
void statement(CommentStatementFormDTO formDto);
/**
* @param attitudeEntities
* @return int
* @Author yinzuomei
* @Description 批量插入
* @Date 2020/1/6 17:40
**/
int batchInsert(List<EventCommentUserAttitudeInsertDTO> attitudeEntities);
}

25
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java

@ -26,9 +26,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.constant.EventsNoticeConstant;
import com.elink.esua.epdc.dto.comment.EpdcCommentsAndAttitudeFromTopicFormDTO;
import com.elink.esua.epdc.dto.comment.EventCommentDTO;
import com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeDTO;
import com.elink.esua.epdc.dto.comment.*;
import com.elink.esua.epdc.dto.comment.form.EventCommentsFormDTO;
import com.elink.esua.epdc.dto.comment.form.SubmitCommentFormDTO;
import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO;
@ -42,7 +40,6 @@ import com.elink.esua.epdc.dto.issue.result.WorkEventCommentResultDTO;
import com.elink.esua.epdc.modules.async.NewsTask;
import com.elink.esua.epdc.modules.comment.dao.EventCommentDao;
import com.elink.esua.epdc.modules.comment.entity.EventCommentEntity;
import com.elink.esua.epdc.modules.comment.entity.EventCommentUserAttitudeEntity;
import com.elink.esua.epdc.modules.comment.service.EventCommentService;
import com.elink.esua.epdc.modules.comment.service.EventCommentUserAttitudeService;
import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
@ -330,23 +327,23 @@ public class EventCommentServiceImpl extends BaseServiceImpl<EventCommentDao, Ev
@Transactional(rollbackFor = Exception.class)
public Result saveCommentAndAttitudeFromTopic(EpdcCommentsAndAttitudeFromTopicFormDTO formDto) {
// 保存评论
List<EventCommentEntity> commentEntities = new ArrayList<>(formDto.getComments().size());
for (EventCommentDTO dto:
List<EventCommentInsertDTO> commentEntities = new ArrayList<>(formDto.getComments().size());
for (EventCommentDTO dto :
formDto.getComments()) {
EventCommentEntity entity = ConvertUtils.sourceToTarget(dto, EventCommentEntity.class);
entity.setShieldFlag(NumConstant.ZERO_STR);
EventCommentInsertDTO entity = ConvertUtils.sourceToTarget(dto, EventCommentInsertDTO.class);
commentEntities.add(entity);
}
this.insertBatch(commentEntities);
if (commentEntities.size() > 0) {
baseDao.batchInsertEventComment(commentEntities);
}
// 保存表态
List<EventCommentUserAttitudeEntity> attitudeEntities = new ArrayList<>(formDto.getAttitudes().size());
for (EventCommentUserAttitudeDTO dto:
List<EventCommentUserAttitudeInsertDTO> attitudeEntities = new ArrayList<>(formDto.getAttitudes().size());
for (EventCommentUserAttitudeDTO dto :
formDto.getAttitudes()) {
EventCommentUserAttitudeEntity entity = ConvertUtils.sourceToTarget(dto, EventCommentUserAttitudeEntity.class);
EventCommentUserAttitudeInsertDTO entity = ConvertUtils.sourceToTarget(dto, EventCommentUserAttitudeInsertDTO.class);
attitudeEntities.add(entity);
}
eventCommentUserAttitudeService.insertBatch(attitudeEntities);
eventCommentUserAttitudeService.batchInsert(attitudeEntities);
return new Result();
}

15
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java

@ -17,16 +17,18 @@
package com.elink.esua.epdc.modules.comment.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.constant.EventsNoticeConstant;
import com.elink.esua.epdc.dto.comment.CommentStatementFormDTO;
import com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeDTO;
import com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeInsertDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
import com.elink.esua.epdc.modules.async.NewsTask;
import com.elink.esua.epdc.modules.comment.dao.EventCommentUserAttitudeDao;
@ -226,4 +228,15 @@ public class EventCommentUserAttitudeServiceImpl extends BaseServiceImpl<EventCo
newsTask.insertUserInformation(informationFormDTO);
}
@Override
@Transactional(rollbackFor = Exception.class)
public int batchInsert(List<EventCommentUserAttitudeInsertDTO> attitudeEntities) {
int insertNum = 0;
if (CollUtil.isEmpty(attitudeEntities)) {
return insertNum;
}
insertNum = baseDao.batchInsert(attitudeEntities);
return insertNum;
}
}

2
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@ -279,6 +279,6 @@ public interface ItemDao extends BaseDao<ItemEntity> {
* @author liuchuang
* @since 2019/12/25 19:23
*/
void deleteBatchItemHandleIds(List<String> ids);
void deleteBatchItemHandleIds(@Param("ids") List<String> ids);
}

5
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@ -17,6 +17,7 @@
package com.elink.esua.epdc.modules.item.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
@ -1164,7 +1165,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
// 获取历史处理记录
List<String> oldLogs = gridPlatformHandleLogService.listOfHandleProcessLogByItemGridPlatFormId(itemGridPlatformId);
// 删除项目处理进度表历史记录
baseDao.deleteBatchItemHandleIds(oldLogs);
if (!CollUtil.isEmpty(oldLogs)) {
baseDao.deleteBatchItemHandleIds(oldLogs);
}
// 删除网格化平台处理记录表记录
gridPlatformHandleLogService.removeHandleProcessByItemGridPlatFormId(itemGridPlatformId);
}

34
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml

@ -249,4 +249,38 @@
rep.CREATED_TIME DESC
</select>
<!-- 批量插入 -->
<insert id="batchInsertEventComment" parameterType="com.elink.esua.epdc.dto.comment.EventCommentInsertDTO">
INSERT INTO epdc_event_comment (
`ID`,
`EVENT_ID`,
`USER_ID`,
`USER_NAME`,
`USER_FACE`,
`CONTENT`,
`COMMENT_TYPE`,
`COMMENT_ID`,
`REPLY_COUNT`,
`REPLY_USER_ID`,
`REPLY_USER_NAME`,
`REPLY_USER_FACE`,
`LIKE_COUNT`,
`UN_LIKE_COUNT`,
`SHIELD_FLAG`,
`DEL_FLAG`,
`REVISION`,
`CREATED_BY`,
`CREATED_TIME`,
`UPDATED_BY`,
`UPDATED_TIME`,
`PARTY_FLAG`
)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(#{item.id},#{item.eventId},#{item.userId},#{item.userName},#{item.userFace},#{item.content},
#{item.commentType},#{item.commentId},#{item.replyCount},#{item.replyUserId},#{item.replyUserName},#{item.replyUserFace},
#{item.likeCount},#{item.unLikeCount},#{item.shieldFlag},
#{item.delFlag},#{item.revision},#{item.createdBy},#{item.createdTime},#{item.updatedBy},#{item.updatedTime},#{item.partyFlag})
</foreach>
</insert>
</mapper>

28
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/EventCommentUserAttitudeDao.xml

@ -16,5 +16,31 @@
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<!-- 批量插入 -->
<insert id="batchInsert" parameterType="com.elink.esua.epdc.dto.comment.EventCommentUserAttitudeInsertDTO">
INSERT INTO epdc_event_comment_user_attitude (
`ID`,
`EVENT_COMMENT_ID`,
`USER_ID`,
`ATTITUDE_FLAG`,
`DEL_FLAG`,
`REVISION`,
`CREATED_BY`,
`CREATED_TIME`,
`UPDATED_BY`,
`UPDATED_TIME`)
VALUES
<foreach collection="list" item="item" index="index" separator=",">
(#{item.id},
#{item.eventCommentId},
#{item.userId},
#{item.attitudeFlag},
#{item.delFlag},
#{item.revision},
#{item.createdBy},
#{item.createdTime},
#{item.updatedBy},
#{item.updatedTime})
</foreach>
</insert>
</mapper>

13
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml

@ -209,8 +209,11 @@
<if test='searchContent != null and searchContent != ""'>
AND t1.ISSUE_CONTENT LIKE CONCAT('%',#{searchContent},'%')
</if>
<if test='categoryCode != null and categoryCode != ""'>
AND t1.category_code = #{categoryCode}
<if test='firstCategoryCode != null and firstCategoryCode != ""'>
AND t1.FIRST_CATEGORY_CODE = #{firstCategoryCode}
</if>
<if test='issueId != null and issueId != ""'>
AND t1.ID = #{issueId}
</if>
ORDER BY
<if test='orderType == "1"'>( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC,</if>
@ -239,6 +242,7 @@
<result property="approveNum" column="APPROVE_NUM"/>
<result property="opposeNum" column="OPPOSE_NUM"/>
<result property="categoryCode" column="CATEGORY_CODE"/>
<result property="firstCategoryCode" column="FIRST_CATEGORY_CODE"/>
<result property="isOperational" column="isOperational"/>
<collection property="images" ofType="java.lang.String">
<result property="image" column="IMG_URL"/>
@ -259,6 +263,7 @@
issue.USER_FACE,
issue.ISSUE_ADDRESS,
issue.CATEGORY_CODE,
issue.FIRST_CATEGORY_CODE,
eve.APPROVE_NUM,
eve.OPPOSE_NUM,
eve.BROWSE_NUM,
@ -354,13 +359,13 @@
epdc_issue issue
LEFT JOIN epdc_events eve ON issue.EVENT_ID = eve.ID
AND eve.DEL_FLAG = '0'
LEFT JOIN epdc_category cate ON issue.CATEGORY_CODE = cate.category_code
LEFT JOIN epdc_category cate ON issue.FIRST_CATEGORY_CODE = cate.category_code
AND cate.DEL_FLAG = '0'
WHERE
issue.DEL_FLAG = '0'
AND issue.ISSUE_STATE = 0
AND issue.GRID_ID = #{gridId}
AND issue.CATEGORY_CODE = #{categoryCode}
AND issue.FIRST_CATEGORY_CODE = #{firstCategoryCode}
</select>
<resultMap id="issuesAndEventsOfMineMap" type="com.elink.esua.epdc.dto.issue.result.IssuesAndEventsOfMineResultDTO">

18
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@ -92,12 +92,15 @@
<if test='formDto.searchContent != null and formDto.searchContent != ""'>
AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%')
</if>
<if test='formDto.categoryCode != null and formDto.categoryCode != ""'>
AND t1.CATEGORY_CODE = #{formDto.categoryCode}
<if test='formDto.firstCategoryCode != null and formDto.firstCategoryCode != ""'>
AND t1.FIRST_CATEGORY_CODE = #{formDto.firstCategoryCode}
</if>
<if test='formDto.userId != null and formDto.userId != ""'>
AND t1.USER_ID = #{formDto.userId}
</if>
<if test='formDto.itemId != null and formDto.itemId != ""'>
AND t1.ID = #{formDto.itemId}
</if>
ORDER BY
<if test='formDto.orderType != null and formDto.orderType != "" and formDto.orderType == "1"'>
t1.LAST_HANDLE_TIME DESC
@ -234,8 +237,8 @@
<if test='formDto.searchContent != null and formDto.searchContent != ""'>
AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%')
</if>
<if test='formDto.categoryCode != null and formDto.categoryCode != ""'>
AND t1.CATEGORY_CODE = #{formDto.categoryCode}
<if test='formDto.firstCategoryCode != null and formDto.firstCategoryCode != ""'>
AND t1.FIRST_CATEGORY_CODE = #{formDto.firstCategoryCode}
</if>
<if test='formDto.userId != null and formDto.userId != ""'>
AND t1.USER_ID = #{formDto.userId}
@ -278,6 +281,7 @@
<result property="commentNum" column="COMMENT_NUM"/>
<result property="statementNum" column="statementNum"/>
<result property="categoryCode" column="CATEGORY_CODE"/>
<result property="firstCategoryCode" column="FIRST_CATEGORY_CODE"/>
<result property="isOperational" column="isOperational"/>
<result property="isSatisfactionEvaluation" column="isSatisfactionEvaluation"/>
<result property="isShowSatisfactionEvaluation" column="isShowSatisfactionEvaluation"/>
@ -302,6 +306,7 @@
item.USER_FACE,
item.ISSUE_ADDRESS,
item.CATEGORY_CODE,
item.FIRST_CATEGORY_CODE,
eve.APPROVE_NUM,
eve.OPPOSE_NUM,
eve.BROWSE_NUM,
@ -364,7 +369,7 @@
item.DEL_FLAG = '0'
AND item.ITEM_STATE IN (0, 10)
AND item.GRID_ID = #{gridId}
AND item.CATEGORY_CODE = #{categoryCode}
AND item.FIRST_CATEGORY_CODE = #{firstCategoryCode}
</select>
<select id="selectListOfPendingHandleItems" resultType="com.elink.esua.epdc.dto.item.ItemPendingHandleDTO">
@ -606,7 +611,7 @@
SELECT
hp.ID,
hp.CREATED_TIME AS createdTime,
hp.HANDLE_ADVICE AS advice,
hp.OUT_HANDLE_ADVICE AS advice,
hp.HANDLER_DEPT AS handlerDept,
hp.STATE,
itemDept.DEPT_NAME,
@ -834,6 +839,7 @@
WHERE
information.DEL_FLAG = '0'
and information.READ_FLAG = '0'
AND information.DEPT_ID IN
<foreach item="deptIdItem" collection="deptIdList" open="(" separator="," close=")">

3
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml

@ -28,7 +28,6 @@
WHERE
information.DEL_FLAG = '0'
AND information.READ_FLAG = '1'
<if test="deptId != null and deptId > 0">
AND information.DEPT_ID = #{deptId}
</if>
@ -46,7 +45,7 @@
<update id="updateInformationReadFlag">
UPDATE epdc_item_information SET READ_FLAG = '1' WHERE
DEL_FLAG = '0'
<if test="deptId != null">
<if test="deptId != null and deptId > 0">
AND DEPT_ID = #{deptId}
</if>
AND DEPT_ID IN

5
esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicListFormDTO.java

@ -53,4 +53,9 @@ public class TopicListFormDTO implements Serializable {
*/
private String currentUserId;
/**
* 话题ID
*/
private String topicId;
}

25
esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml

@ -215,6 +215,31 @@
<nacos.config.bootstrap.log.enable>true</nacos.config.bootstrap.log.enable>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<server.port>9063</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
</properties>
</profile>
</profiles>
</project>

3
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java

@ -25,8 +25,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import com.elink.esua.epdc.dto.topic.TopicDTO;
import com.elink.esua.epdc.dto.topic.TopicDetailDTO;
import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
@ -92,6 +92,7 @@ public class TopicController {
}
@GetMapping("export")
@DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false)
public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
List<TopicDTO> list = topicService.list(params);
ExcelUtils.exportExcelToTarget(response, null, list, TopicExcel.class);

6
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java

@ -23,8 +23,6 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.DateUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
@ -124,9 +122,7 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
@Override
public List<TopicDTO> list(Map<String, Object> params) {
List<TopicEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, TopicDTO.class);
return baseDao.selectListTopic(params);
}
private QueryWrapper<TopicEntity> getWrapper(Map<String, Object> params){

3
esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml

@ -167,6 +167,9 @@
<if test="timestamp != null and timestamp.trim() != ''">
<![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
</if>
<if test="topicId != null and topicId.trim() != ''">
AND t1.ID = #{topicId}
</if>
<![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{someMonthsAgo}
</if>
ORDER BY

27
esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml

@ -213,5 +213,32 @@
<spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<server.port>9060</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>elink888</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
<spring.zipkin.base-url>http://localhost:9411</spring.zipkin.base-url>
</properties>
</profile>
</profiles>
</project>

24
esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml

@ -226,6 +226,30 @@
<nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<server.port>9061</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
</properties>
</profile>
</profiles>
</project>

24
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml

@ -196,6 +196,30 @@
<nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<server.port>9987</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
</properties>
</profile>
</profiles>
</project>

24
esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml

@ -208,6 +208,30 @@
<nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<server.port>9062</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
</properties>
</profile>
</profiles>
</project>

24
esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml

@ -191,6 +191,30 @@
<nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<server.port>9064</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
</properties>
</profile>
</profiles>
</project>

22
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/BannerDao.java

@ -42,4 +42,26 @@ public interface BannerDao extends BaseDao<BannerEntity> {
* @date 2019/9/11 9:00
*/
List<EpdcBannerListResultDTO> selectListBanner(EpdcBannerListFromDTO fromDTO);
/***
* 根据新闻id获取bannerID
* @param newsId
* @return java.lang.String
* @author qushutong
* @date 2020/1/6 17:24
*/
String selectBannerIdByNewsId(String newsId);
/***
* 新闻下线 删除 banner同步下架
* @param newsId
* @return void
* @author qushutong
* @date 2020/1/8 18:40
*/
void updateSoltOut(String newsId);
}

18
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/BannerService.java

@ -113,4 +113,22 @@ public interface BannerService extends BaseService<BannerEntity> {
* @date 2019/9/17 19:42
*/
Result saveNewsToBanner(BannerDTO banner, List<Long> deptIds);
/***
* 通过新闻id获取bannerID
* @param newsId
* @return java.lang.String
* @author qushutong
* @date 2020/1/6 17:20
*/
String getBannerIdByNewsId(String newsId);
/***
* banner下架
* @param
* @return void
* @author qushutong
* @date 2020/1/8 18:14
*/
void updateSoltOut(String newsId);
}

19
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java

@ -45,10 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* banner表
@ -191,4 +188,18 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
}
return new Result();
}
@Override
public String getBannerIdByNewsId(String newsId) {
return baseDao.selectBannerIdByNewsId(newsId);
}
@Override
public void updateSoltOut(String newsId) {
BannerDTO bannerDTO = new BannerDTO();
bannerDTO.setNewsId(newsId);
bannerDTO.setStateTime(new Date());
bannerDTO.setState(YesOrNoEnum.NO.value());
baseDao.updateSoltOut(newsId);
}
}

33
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java

@ -37,6 +37,7 @@ import com.elink.esua.epdc.dto.NewsUserAttitudeDTO;
import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsDetailFormDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcNewsListResultDTO;
import com.elink.esua.epdc.entity.BannerEntity;
import com.elink.esua.epdc.entity.NewsUserAttitudeEntity;
import com.elink.esua.epdc.enums.AppNewsLikeEnum;
import com.elink.esua.epdc.dto.epdc.form.EpdcNewsBrowseFromDTO;
@ -77,6 +78,9 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
@Autowired
private NewsUserAttitudeService newsUserAttitudeService;
@Autowired
private BannerService bannerService;
@Override
public PageData<NewsDTO> page(Map<String, Object> params) {
IPage<NewsEntity> page = baseDao.selectPage(
@ -169,6 +173,8 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
baseDao.deleteBatchIds(Arrays.asList(ids));
//删除部门关系表相关数据
newsDepartmentService.deleteByNewsId(ids[0]);
// 下架banner
undataBannerSoltOut(ids[0]);
}
@Override
@ -185,11 +191,16 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
// 新闻不存在或已下线
return false;
}
undataBannerSoltOut(id);
return true;
}
private void undataBannerSoltOut(String id) {
NewsEntity entity = new NewsEntity();
entity.setId(id);
entity.setNewsUpDownState(YesOrNoEnum.YES.value());
updateById(entity);
return true;
bannerService.updateSoltOut(id);
}
@Override
@ -289,6 +300,24 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
}
this.baseDao.updateNewsById(entity);
newsDepartmentService.deleteByNewsId(entity.getId());
//已经上banner的处理
if(newsDto.getBannerFlag().equals(YesOrNoEnum.YES.value())){
String bannerId = bannerService.getBannerIdByNewsId(newsDto.getId());
BannerDTO bannerDto = ConvertUtils.sourceToTarget(newsDto, BannerDTO.class);
bannerDto.setId(bannerId);
bannerDto.setState(YesOrNoEnum.YES.value());
bannerDto.setStateTime(new Date());
bannerDto.setImgUrl(newsDto.getNewsImageUrl());
bannerDto.setNewsFlag(YesOrNoEnum.YES.value());
bannerDto.setNewsId(newsDto.getId());
bannerDto.setTitle(newsDto.getNewsTitle());
// 数据字典值,2-新闻类型
bannerDto.setBannerType(NumConstant.TWO_STR);
// banner位置,0顶部;1中间
bannerDto.setPosition(NumConstant.ZERO_STR);
bannerService.saveOrUpdate(bannerDto);
}
}
this.newsDepartmentService.save(entity.getId(), newsGridList);
}
@ -408,8 +437,6 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
return new Result();
}
@Autowired
private BannerService bannerService;
@Override
@Transactional(rollbackFor = Exception.class)

18
esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml

@ -23,4 +23,22 @@
limit 5
</select>
<select id="selectBannerIdByNewsId" resultType="String">
SELECT
eb.ID
FROM
epdc_banner eb
WHERE
eb.NEWS_ID = #{newsId}
AND eb.DEL_FLAG = '0'
</select>
<select id="updateSoltOut">
UPDATE epdc_banner bn
SET bn.STATE = '0'
WHERE
bn.NEWS_ID = #{newsId}
AND bn.DEL_FLAG = '0'
</select>
</mapper>

30
esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml

@ -237,6 +237,36 @@
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
<!-- fastDFS 文件服务器 -->
<fastdfs.server-addr>10.5.34.165:22122</fastdfs.server-addr>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<server.port>9065</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
<!-- fastDFS 文件服务器 -->
<fastdfs.server-addr>172.16.1.239:22122</fastdfs.server-addr>
</properties>
</profile>
</profiles>

25
esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml

@ -203,6 +203,31 @@
<nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<server.port>9068</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
</properties>
</profile>
</profiles>
</project>

9
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@ -15,6 +15,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
import com.elink.esua.epdc.enums.AppUserStatesEnum;
import com.elink.esua.epdc.service.UserInvitationRecordService;
import com.elink.esua.epdc.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
@ -234,9 +235,15 @@ public class EpdcAppUserController {
*/
@PostMapping("updateWxInfo")
public Result updateWxInfo(@RequestBody UserDTO userDto) {
UserDTO user = new UserDTO();
// 查询此用户是否已经注册并且完善了用户信息
UserDTO userDTO = userService.get(userDto.getId());
// 除了注册之外的 几个状态都不需要更新Nickname
if(AppUserStatesEnum.STATE_REGISTERED.value().equals(userDTO.getState())){
user.setNickname(userDto.getNickname());
}
user.setId(userDto.getId());
user.setNickname(userDto.getNickname());
user.setFaceImg(userDto.getFaceImg());
user.setSex(userDto.getSex());
user.setWxUnionId(userDto.getWxUnionId());

10
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java

@ -35,18 +35,18 @@ public class PartyAuthenticationFailedExcel {
@Excel(name = "姓名")
private String realName;
@Excel(name = "手机号")
private String mobile;
@Excel(name = "身份证号")
private String identityNo;
@Excel(name = "认证时间")
private Date createdTime;
@Excel(name = "手机号")
private String mobile;
@Excel(name = "所属网格")
private String allDeptNames;
@Excel(name = "认证时间", format = "yyyy-MM-dd HH:mm:ss")
private Date createdTime;
@Excel(name = "居民住址")
private String address;

16
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java

@ -49,18 +49,12 @@ public class PartyMembersExcel {
@Excel(name = "是否注册", replace = {"是_1", "否_0"})
private String registFlag;
@Excel(name = "注册时间", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "认证时间", format = "yyyy-MM-dd HH:mm:ss")
private Date registTime;
@Excel(name = "街道")
private String streetName;
@Excel(name = "社区")
private String communityName;
@Excel(name = "网格")
private String gridName;
@Excel(name = "注册时间", format = "yyyy-MM-dd HH:mm:ss")
private Date createdTime;
@Excel(name = "所在党组织")
private String partyOrganization;
@Excel(name = "街道-社区-网格")
private String allDeptNames;
}

16
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/exception/UserModuleErrorCode.java

@ -0,0 +1,16 @@
package com.elink.esua.epdc.exception;
import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
/**
* @author: qushutong
* @Date: 2020/1/3 17:31
* @Description:
*/
public interface UserModuleErrorCode extends ErrorCode {
/***
* 党员认证失败
*/
int AUTHENTICATION_CODE= 100006001;
}

14
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@ -38,6 +38,7 @@ import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.MessageUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.constant.AuthenticatedConsant;
import com.elink.esua.epdc.constant.UserFieldConsant;
@ -60,6 +61,7 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO;
import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO;
import com.elink.esua.epdc.enums.AppUserAuditStateEnum;
import com.elink.esua.epdc.enums.AppUserStatesEnum;
import com.elink.esua.epdc.exception.UserModuleErrorCode;
import com.elink.esua.epdc.feign.AdminFeignClient;
import com.elink.esua.epdc.service.PartyMembersService;
import com.elink.esua.epdc.service.UserGridRelationService;
@ -340,11 +342,11 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
wrapper.eq(UserFieldConsant.WX_OPEN_ID, gridLeader.getWxOpenId());
UserEntity existUser = this.baseDao.selectOne(wrapper);
// UserEntity existUser = this.baseDao.selectOne(wrapper);
UserDTO existUser = selectUserByWxInfo(gridLeader.getWxOpenId(), gridLeader.getWxUnionId());
String userId;
String faceImg = userEntity.getFaceImg();
userEntity.setLastLoginTime(new Date());
// 首次注册
if (null == existUser) {
@ -363,6 +365,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
// 不更新头像信息
userEntity.setFaceImg(null);
userEntity.setId(userId);
//用户已绑定手机号时不更新手机号
if(StringUtils.isNotBlank(existUser.getMobile())){
userEntity.setMobile(existUser.getMobile());
}
this.updateById(userEntity);
for (UserGridRelationDTO userGridRelation : userGridList) {
@ -834,7 +840,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
// UserGridRelationDTO relationInfo = userGridRelationService.getUserRelationInfo(userEntity.getId(), userGridRelation.getGridId());
// userDto.setLeaderFlag(relationInfo.getLeaderFlag());
// userDto.setFaceImg(oldEntity.getFaceImg());
// return new Result().ok(userDto);
// return result.ok(userDto);
// }
/**

2
esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties

@ -0,0 +1,2 @@
#Default
100006001=\u5728\u515A\u5458\u5E93\u4E2D\u6CA1\u6709\u627E\u5230\u60A8\u7684\u4FE1\u606F\uFF0C\u6211\u4EEC\u5148\u5C06\u60A8\u8BA4\u8BC1\u4E3A\u5C45\u6C11\uFF0C\u8BF7\u8054\u7CFB\u5F53\u5730\u7BA1\u7406\u4EBA\u5458\u5B8C\u5584\u515A\u5458\u5E93\u540E\u7EE7\u7EED\u8BA4\u8BC1

23
esua-epdc/epdc-module/epdc-webservice/pom.xml

@ -182,5 +182,28 @@
<nacos.server-addr>10.5.34.164:8848</nacos.server-addr>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<server.port>9075</server.port>
<spring.profiles.active>prod</spring.profiles.active>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
</properties>
</profile>
</profiles>
</project>

50
esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java

@ -12,7 +12,6 @@ import com.elink.esua.epdc.dao.ItemHandleProcessDao;
import com.elink.esua.epdc.dto.ItemHandleProcessDTO;
import com.elink.esua.epdc.dto.form.ItemPlatformSyncTaskDispatchFormDTO;
import com.elink.esua.epdc.dto.form.ItemPlatformSyncTaskEndFormDTO;
import com.elink.esua.epdc.dto.form.TestDTO;
import com.elink.esua.epdc.dto.result.DataReturnDTO;
import com.elink.esua.epdc.entity.GridPlatformHandleLogEntity;
import com.elink.esua.epdc.entity.InterfaceLogEntity;
@ -60,27 +59,43 @@ public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterface
@Autowired
private InterfaceLogDao interfaceLogDao;
private Pattern p = Pattern.compile("\\s*|\t|\r|\n");
/**
* @param requestXML
* @param str
* @return java.lang.String
* @Author yinzuomei
* @Description 测试
* @Date 2019/12/30 12:46
* @Description 去除字符串中的空格回车换行符制表符
* @Date 2020/1/3 10:23
**/
@Override
public String test(String requestXML) {
logger.info("requestXML=" + requestXML);
TestDTO testDTO = JaxbUtil.converyToJavaBean(requestXML, TestDTO.class);
String xmlStr = JaxbUtil.convertToXml(testDTO);
return "调用成功" + xmlStr;
private String replaceBlank(String str) {
String dest = "";
if (str != null) {
Matcher m = p.matcher(str);
dest = m.replaceAll("");
}
return dest;
}
public static void main(String[] args) {
DataReturnDTO dataReturnDTO = new DataReturnDTO();
System.out.println(JaxbUtil.convertToXmlIgnoreStandalone(dataReturnDTO, "utf-8"));
}
/**
* @param requestXML
* @return java.lang.String
* @Author yinzuomei
* @Description 测试
* @Date 2019/12/30 12:46
**/
@Override
public String test(String requestXML) {
return "调用成功requestXML=" + requestXML;
}
/**
* @param requestXML
* @return java.lang.String
@ -121,7 +136,7 @@ public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterface
} finally {
// 接口日志表新增一条处理记录
insertInterfaceLog(itemGridPlatformEntity, requestXML,
JaxbUtil.convertToXml(dataReturnDTO),
replaceBlank(JaxbUtil.convertToXmlIgnoreXmlHead(dataReturnDTO, "utf-8")),
successFlag,
InterfaceLogBusinessTypeEnum.SYNC_TASK_DISPATCH.getValue(),
ItemPlatFormConstant.SyncTaskDispatch);
@ -129,17 +144,6 @@ public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterface
}
}
private Pattern p = Pattern.compile("\\s*|\t|\r|\n");
private String replaceBlank(String str) {
String dest = "";
if (str != null) {
Matcher m = p.matcher(str);
dest = m.replaceAll("");
}
return dest;
}
/**
* @param taskNum
* @return com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity
@ -266,7 +270,7 @@ public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterface
throw new Exception("接口异常" + e.getMessage());
} finally {
insertInterfaceLog(itemGridPlatformEntity, requestXML,
JaxbUtil.convertToXml(dataReturnDTO),
replaceBlank(JaxbUtil.convertToXmlIgnoreXmlHead(dataReturnDTO, "utf-8")),
successFlag,
InterfaceLogBusinessTypeEnum.SYNC_TASK_END.getValue(),
ItemPlatFormConstant.SyncTaskEnd);//接口日志表新增一条处理记录

33
esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml

@ -232,6 +232,39 @@
<wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>
</properties>
</profile>
<profile>
<id>prod_kongcun</id>
<properties>
<spring.profiles.active>prod</spring.profiles.active>
<docker.tag>prod</docker.tag>
<server.port>9988</server.port>
<!-- redis配置 -->
<spring.redis.index>0</spring.redis.index>
<spring.redis.host>172.16.1.238</spring.redis.host>
<spring.redis.port>6379</spring.redis.port>
<spring.redis.password>Elink833066</spring.redis.password>
<spring.datasource.druid.url>
<![CDATA[jdbc:mysql://172.16.1.239:3306/esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
</spring.datasource.druid.url>
<spring.datasource.druid.username>epdc</spring.datasource.druid.username>
<spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.1.238:8848</nacos.server-addr>
<!--公众号配置-->
<wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
<wx.mp.configs.secret>948aa2f21dbaa3943288ea5b119ac6f2</wx.mp.configs.secret>
<wx.mp.configs.token>111</wx.mp.configs.token>
<wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
<!--居民端小程序配置-->
<wx.ma.appId>wx04ee7d7a849fa2a8</wx.ma.appId>
<wx.ma.secret>3980e207b86bccea8d3c0bf7d16adeba</wx.ma.secret>
</properties>
</profile>
</profiles>
</project>

Loading…
Cancel
Save