diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 2a3c286c8..a0f3c7cc5 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -173,6 +173,12 @@ prod prod + + 0 + 10.5.34.164 + 6379 + Elink@833066 + true 10.5.34.164:8848 @@ -184,6 +190,45 @@ wx9f20a46906ab2c3e dc13065f79429979d9f687d249eb5c4e + + + + + epdc + Elink@833066 + + + + + prod_kongcun + + 9055 + prod + prod + + + true + 172.16.1.238:8848 + + http://172.31.171.61:9411 + + wx04ee7d7a849fa2a8 + 3980e207b86bccea8d3c0bf7d16adeba + + wxddb240334d09049f + 071b8c70da0d0482aaf79052e64f83bc + + + + + epdc + Elink@833066 + + + 0 + 172.16.1.238 + 6379 + Elink833066 diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml index 8b5f372a1..5afdbc86a 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/application-prod.yml +++ b/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 diff --git a/esua-epdc/epdc-auth/pom.xml b/esua-epdc/epdc-auth/pom.xml index 14e2b8f77..a34114ce5 100644 --- a/esua-epdc/epdc-auth/pom.xml +++ b/esua-epdc/epdc-auth/pom.xml @@ -158,5 +158,26 @@ http://172.31.171.61:9411 + + + prod_kongcun + + 9056 + prod + prod + + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + true + 172.16.1.238:8848 + + http://172.31.171.61:9411 + + diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java b/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java index 91d380960..b9159e8e6 100644 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/src/main/java/com/elink/esua/epdc/gird/shibei/dto/SearchCaseProcessByTaskIdItemDto.java +++ b/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; + } } diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index a46aba6af..11520ad50 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -221,6 +221,45 @@ http://localhost:9411 + + + prod_kongcun + + 9094 + prod + + + lb://epdc-auth-server + lb://epdc-admin-server + lb://epdc-activiti-server + lb://epdc-api-server + lb://epdc-app-server + lb://epdc-heart-server + lb://epdc-job-server + lb://epdc-message-server + lb://epdc-news-server + lb://epdc-oss-server + lb://epdc-events-server + lb://epdc-services-server + lb://epdc-user-server + lb://epdc-demo-server + lb://epdc-group-server + lb://epdc-websocket-server + lb://epdc-kpi-server + + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + true + 172.16.1.238:8848 + + http://localhost:9411 + + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java index 718c39ed8..1b466aec6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppAuthorizationDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 40f83de43..80da348b7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -258,6 +258,41 @@ dc13065f79429979d9f687d249eb5c4e + + + prod_kongcun + + prod + prod + + 9040 + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + true + 172.16.1.238:8848 + + wx3ef8f2cd12a19fcb + 948aa2f21dbaa3943288ea5b119ac6f2 + 111 + 111 + + wx04ee7d7a849fa2a8 + 3980e207b86bccea8d3c0bf7d16adeba + + wxddb240334d09049f + 071b8c70da0d0482aaf79052e64f83bc + + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java index 05634c9cf..0e3d5fa20 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiIssueController.java +++ b/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 * @Author: liuchuang * @Date: 2019/9/9 12:26 */ - @GetMapping("statistics/{categoryCode}") - public Result issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryCode) { - return issueService.getIssueCategoryStatistics(userDetail, categoryCode); + @GetMapping("statistics/{firstCategoryCode}") + public Result issueCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String firstCategoryCode) { + return issueService.getIssueCategoryStatistics(userDetail, firstCategoryCode); } /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java index 64d80243d..1c795d9de 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java +++ b/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 itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String categoryCode) { - return itemService.getItemCategoryStatistics(userDetail, categoryCode); + @GetMapping("statistics/{firstCategoryCode}") + public Result itemCategoryStatistics(@LoginUser TokenDto userDetail, @PathVariable String firstCategoryCode) { + return itemService.getItemCategoryStatistics(userDetail, firstCategoryCode); } /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java index 0f543876d..8bcad6404 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/IssueService.java +++ b/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 * @Author: liuchuang * @Date: 2019/9/9 12:27 */ - Result getIssueCategoryStatistics(TokenDto userDetail, String categoryCode); + Result getIssueCategoryStatistics(TokenDto userDetail, String firstCategoryCode); /** * 议题处理进度 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java index 5afda54ab..36604cc01 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java +++ b/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 getItemCategoryStatistics(TokenDto userDetail, String categoryCode); + Result getItemCategoryStatistics(TokenDto userDetail, String firstCategoryCode); /** * 项目处理进度 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 6176a7ff0..b5c2ce3c0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/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 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 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()); } //更新用户缓存信息 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 8efb9be47..74c9b43af 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java +++ b/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 getIssueCategoryStatistics(TokenDto userDetail, String categoryCode) { + public Result getIssueCategoryStatistics(TokenDto userDetail, String firstCategoryCode) { if (null == userDetail) { return new Result().error("获取用户信息失败"); } IssueCategoryStatisticsFormDTO formDto = new IssueCategoryStatisticsFormDTO(); - formDto.setCategoryCode(categoryCode); + formDto.setFirstCategoryCode(firstCategoryCode); formDto.setGridId(userDetail.getGridId()); return issueFeignClient.issueCategoryStatistics(formDto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java index 94eb09699..e7e2f72fa 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java +++ b/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 getItemCategoryStatistics(TokenDto userDetail, String categoryCode) { + public Result getItemCategoryStatistics(TokenDto userDetail, String firstCategoryCode) { if (null == userDetail) { return new Result().error("获取用户信息失败"); } ItemCategoryStatisticsFormDTO formDto = new ItemCategoryStatisticsFormDTO(); - formDto.setCategoryCode(categoryCode); + formDto.setFirstCategoryCode(firstCategoryCode); formDto.setGridId(userDetail.getGridId()); return itemFeignClient.itemCategoryStatistics(formDto); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java index cb6576d01..a62590042 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentInsertDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentInsertDTO.java new file mode 100644 index 000000000..6f38b015e --- /dev/null +++ b/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; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentUserAttitudeInsertDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/comment/EventCommentUserAttitudeInsertDTO.java new file mode 100644 index 000000000..bf4269b5c --- /dev/null +++ b/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; +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java index 2d59a5a01..767b23aac 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueCategoryStatisticsFormDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java index 4c4712461..7fd5346c1 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java index e0b74d83d..a1ce07cf4 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/result/IssueDetailResultDTO.java +++ b/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 images; + + /** + * 一级分类编码 + */ + private String firstCategoryCode; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java index 0e675e04e..1efcdb715 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java index f1215f65e..c87fae02e 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemFormDTO.java +++ b/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; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java index 8c4196c82..541da97d0 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailResultDTO.java +++ b/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 images; + + /** + * 一级分类编码 + */ + private String firstCategoryCode; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java index ec16212bf..82b38ff9c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java +++ b/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, "中间督办"), diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index cafce2f12..b6e26ed44 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml @@ -204,7 +204,6 @@ true 47.104.224.45:8848 - test @@ -246,7 +245,6 @@ true 10.5.34.164:8848 - prod @@ -258,6 +256,39 @@ dc13065f79429979d9f687d249eb5c4e + + + prod_kongcun + + prod + + 9066 + + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + true + 172.16.1.238:8848 + + prod + + + wx04ee7d7a849fa2a8 + 3980e207b86bccea8d3c0bf7d16adeba + + wxddb240334d09049f + 071b8c70da0d0482aaf79052e64f83bc + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java index 3ad1dcce4..2866a53dd 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentDao.java +++ b/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 { * @return */ WorkEventsCommentsDTO commentReplyList(WorkCommentReplyFormDTO workCommentReplyFormDTO); + + /** + * @param commentEntities + * @return int + * @Author yinzuomei + * @Description 批量插入 + * @Date 2020/1/6 17:40 + **/ + int batchInsertEventComment(@Param("list") List commentEntities); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentUserAttitudeDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentUserAttitudeDao.java index 95df425bd..b2c23e76e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/dao/EventCommentUserAttitudeDao.java +++ b/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 { + /** + * @param attitudeEntities + * @return int + * @Author yinzuomei + * @Description + * @Date 2020/1/6 18:05 + **/ + int batchInsert(@Param("list") List attitudeEntities); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentUserAttitudeService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentUserAttitudeService.java index b91301340..9f215de77 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/EventCommentUserAttitudeService.java +++ b/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 attitudeEntities); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java index 1d72d84b6..809088684 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java +++ b/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 commentEntities = new ArrayList<>(formDto.getComments().size()); - for (EventCommentDTO dto: + List 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 attitudeEntities = new ArrayList<>(formDto.getAttitudes().size()); - for (EventCommentUserAttitudeDTO dto: + List 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(); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java index dffdcf12e..a3d853cca 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentUserAttitudeServiceImpl.java +++ b/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 attitudeEntities) { + int insertNum = 0; + if (CollUtil.isEmpty(attitudeEntities)) { + return insertNum; + } + insertNum = baseDao.batchInsert(attitudeEntities); + return insertNum; + } } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java index 530dde5ff..573505a4d 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java +++ b/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 { * @author liuchuang * @since 2019/12/25 19:23 */ - void deleteBatchItemHandleIds(List ids); + void deleteBatchItemHandleIds(@Param("ids") List ids); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index c6152c3af..5f93244a3 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/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 implem // 获取历史处理记录 List oldLogs = gridPlatformHandleLogService.listOfHandleProcessLogByItemGridPlatFormId(itemGridPlatformId); // 删除项目处理进度表历史记录 - baseDao.deleteBatchItemHandleIds(oldLogs); + if (!CollUtil.isEmpty(oldLogs)) { + baseDao.deleteBatchItemHandleIds(oldLogs); + } // 删除网格化平台处理记录表记录 gridPlatformHandleLogService.removeHandleProcessByItemGridPlatFormId(itemGridPlatformId); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml index 5b1403ed0..2d9dcf7f6 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/comment/EventCommentDao.xml @@ -249,4 +249,38 @@ rep.CREATED_TIME DESC + + + 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 + + (#{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}) + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/EventCommentUserAttitudeDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/EventCommentUserAttitudeDao.xml index fdf136a15..3a60c3f9b 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/EventCommentUserAttitudeDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/EventCommentUserAttitudeDao.xml @@ -16,5 +16,31 @@ - + + + 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 + + (#{item.id}, + #{item.eventCommentId}, + #{item.userId}, + #{item.attitudeFlag}, + #{item.delFlag}, + #{item.revision}, + #{item.createdBy}, + #{item.createdTime}, + #{item.updatedBy}, + #{item.updatedTime}) + + diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml index 3a5d17019..143d2aa45 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/issue/IssueDao.xml @@ -209,8 +209,11 @@ AND t1.ISSUE_CONTENT LIKE CONCAT('%',#{searchContent},'%') - - AND t1.category_code = #{categoryCode} + + AND t1.FIRST_CATEGORY_CODE = #{firstCategoryCode} + + + AND t1.ID = #{issueId} ORDER BY ( t2.APPROVE_NUM + t2.OPPOSE_NUM + t2.COMMENT_NUM + t2.BROWSE_NUM ) DESC, @@ -239,6 +242,7 @@ + @@ -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} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index 779396740..678bd9b2e 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -92,12 +92,15 @@ AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%') - - AND t1.CATEGORY_CODE = #{formDto.categoryCode} + + AND t1.FIRST_CATEGORY_CODE = #{formDto.firstCategoryCode} AND t1.USER_ID = #{formDto.userId} + + AND t1.ID = #{formDto.itemId} + ORDER BY t1.LAST_HANDLE_TIME DESC @@ -234,8 +237,8 @@ AND t1.ITEM_CONTENT LIKE CONCAT('%',#{formDto.searchContent},'%') - - AND t1.CATEGORY_CODE = #{formDto.categoryCode} + + AND t1.FIRST_CATEGORY_CODE = #{formDto.firstCategoryCode} AND t1.USER_ID = #{formDto.userId} @@ -278,6 +281,7 @@ + @@ -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} + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml index 5320dcb29..0aaefdec5 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml @@ -237,6 +237,36 @@ true 10.5.34.164:8848 + + + 10.5.34.165:22122 + + + + + prod_kongcun + + prod + prod + + 9065 + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + true + 172.16.1.238:8848 + + + 172.16.1.239:22122 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml index 075f3d715..e459399f2 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml @@ -203,6 +203,31 @@ 10.5.34.164:8848 + + + prod_kongcun + + prod + prod + + 9068 + + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + true + 172.16.1.238:8848 + + diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java index 7cf8fbe1a..c39807ada 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java +++ b/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()); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java index 9b2065bea..65ef33b67 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyAuthenticationFailedExcel.java +++ b/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; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java index 861156532..5cf674f62 100755 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/PartyMembersExcel.java +++ b/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; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/exception/UserModuleErrorCode.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/exception/UserModuleErrorCode.java new file mode 100644 index 000000000..02ae133b1 --- /dev/null +++ b/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; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 78c8987d5..c0b7829fb 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/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 implem QueryWrapper 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 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 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); // } /** diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties index e69de29bb..637e7475c 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/i18n/messages.properties +++ b/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 \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-webservice/pom.xml b/esua-epdc/epdc-module/epdc-webservice/pom.xml index 6db682ca9..3872a5966 100644 --- a/esua-epdc/epdc-module/epdc-webservice/pom.xml +++ b/esua-epdc/epdc-module/epdc-webservice/pom.xml @@ -182,5 +182,28 @@ 10.5.34.164:8848 + + prod_kongcun + + 9075 + prod + + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + + true + 172.16.1.238:8848 + + diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java index 7385e6856..82a4dd62b 100644 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/impl/CityGridInterfaceServiceWebServiceImpl.java +++ b/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);//接口日志表新增一条处理记录 diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml index a242b42e9..4c58d546e 100644 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml @@ -232,6 +232,39 @@ bfed51b731e53db9affb9e6131e7ae12 + + + prod_kongcun + + prod + prod + + 9988 + + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + true + 172.16.1.238:8848 + + wx3ef8f2cd12a19fcb + 948aa2f21dbaa3943288ea5b119ac6f2 + 111 + 111 + + wx04ee7d7a849fa2a8 + 3980e207b86bccea8d3c0bf7d16adeba + +