From 284c8917d20d6cfe3cf5e721b8a89b0f1802b2b6 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Fri, 3 Jan 2020 12:18:11 +0800 Subject: [PATCH 01/27] =?UTF-8?q?webservice=E7=9A=84targetNamespace?= =?UTF-8?q?=E6=94=B9=E4=B8=BAhttps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CityGridInterfaceServiceWebService.java | 2 +- ...ityGridInterfaceServiceWebServiceImpl.java | 52 ++++++++++--------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java index 11fa9972a..712930549 100644 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java +++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java @@ -10,7 +10,7 @@ import javax.jws.WebService; * @Description: 供网格化平台调用webservice接口 */ // 命名空间，写一个有意义的http地址就行，并不是网上所说的要写成包名倒序,只不过写成包名倒序易读而已 -@WebService(targetNamespace = "http://service.epdc.esua.elink.com") +@WebService(targetNamespace = "https://service.epdc.esua.elink.com") public interface CityGridInterfaceServiceWebService { /** * @param requestXML 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..6b350bd43 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; @@ -40,7 +39,7 @@ import java.util.regex.Pattern; * @Date 2019/12/30 16:24 */ @WebService(serviceName = "CityGridInterfaceServiceWebService", - targetNamespace = "http://service.epdc.esua.elink.com", + targetNamespace = "https://service.epdc.esua.elink.com", endpointInterface = "com.elink.esua.epdc.service.CityGridInterfaceServiceWebService") @Component public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterfaceServiceWebService { @@ -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);//接口日志表新增一条处理记录 From 340b7b84a6cf36f0fb0793589a6bebe834763927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 3 Jan 2020 14:30:49 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E9=95=BF=E6=B3=A8=E5=86=8C=E6=8A=A5=E6=89=8B=E6=9C=BA=E5=8F=B7?= =?UTF-8?q?=E5=B7=B2=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/AppUserServiceImpl.java | 11 ++++++----- .../elink/esua/epdc/service/impl/UserServiceImpl.java | 8 ++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) 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 c462a0d73..d4be194be 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 @@ -265,11 +265,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()); 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 976d3ca0b..ea183d266 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 @@ -323,8 +323,8 @@ 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(); @@ -346,6 +346,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) { From 4dcc6b5c1e521021c01de45c4b6ba08d50a8c0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 3 Jan 2020 16:50:03 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E5=85=9A=E5=91=98=E5=AF=BC=E5=87=BA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/excel/PartyMembersExcel.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) 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 From 7cffd9413a1b1a5667be278a0d8d52b69ded27cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 3 Jan 2020 16:57:11 +0800 Subject: [PATCH 04/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=85=9A=E5=91=98=E5=AF=BC=E5=87=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/excel/PartyAuthenticationFailedExcel.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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; From 494ac185526d9febdeb98cd08fd9772afbba5ec8 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Fri, 3 Jan 2020 17:22:30 +0800 Subject: [PATCH 05/27] =?UTF-8?q?bug#5014=E8=AF=9D=E9=A2=98=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/topic/controller/TopicController.java | 7 ++++--- .../modules/topic/service/impl/TopicServiceImpl.java | 6 +----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java index 38fb4b3dd..407ebd6fc 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/controller/TopicController.java +++ b/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; @@ -50,7 +50,7 @@ import java.util.Map; @RestController @RequestMapping("topic") public class TopicController { - + @Autowired private TopicService topicService; @@ -92,6 +92,7 @@ public class TopicController { } @GetMapping("export") + @DataFilter(tableAlias = "temp", deptId = "grid_id", prefix = "AND", isPendingCreator = false) public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = topicService.list(params); ExcelUtils.exportExcelToTarget(response, null, list, TopicExcel.class); @@ -161,4 +162,4 @@ public class TopicController { return new Result().ok(data); } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java index 6a3d4f7f2..9bd0320cd 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java +++ b/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 imp @Override public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, TopicDTO.class); + return baseDao.selectListTopic(params); } private QueryWrapper getWrapper(Map params){ From a6bf84880972b385dce88cdb1c7b728851577480 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Fri, 3 Jan 2020 17:24:49 +0800 Subject: [PATCH 06/27] =?UTF-8?q?bug#5003=E5=85=9A=E7=BE=A4=E8=AE=AE?= =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E4=B8=AD=E5=92=8C?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=AD=E7=9A=84=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3:=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=8F=96OUT=5FHANDLE=5FADVICE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2ca753f91..b588ed43e 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 @@ -586,7 +586,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, From 8b2da2a033df0861966602c2827560ec5c3b4e4f Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Fri, 3 Jan 2020 17:26:46 +0800 Subject: [PATCH 07/27] =?UTF-8?q?bug#5016=E8=AF=9D=E9=A2=98=E8=BD=AC?= =?UTF-8?q?=E8=AE=AE=E9=A2=98=E5=90=8E=EF=BC=8C=E8=AF=9D=E9=A2=98=E8=AF=84?= =?UTF-8?q?=E8=AE=BA=E4=B8=8E=E8=AE=AE=E9=A2=98=E8=AF=84=E8=AE=BA=E7=9A=84?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=A0=87=E8=AF=86=E5=BA=94=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/comment/EventCommentDTO.java | 7 ++++++- .../comment/service/impl/EventCommentServiceImpl.java | 3 +-- 2 files changed, 7 insertions(+), 3 deletions(-) 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-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 00dfcacfa..f5bf49f04 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 @@ -20,10 +20,10 @@ package com.elink.esua.epdc.modules.comment.service.impl; 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.commons.tools.utils.Result; import com.elink.esua.epdc.constant.EventsNoticeConstant; import com.elink.esua.epdc.dto.UserDTO; @@ -343,7 +343,6 @@ public class EventCommentServiceImpl extends BaseServiceImpl Date: Fri, 3 Jan 2020 17:48:34 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=9A=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E7=AB=AF=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E8=BF=94=E5=9B=9Ecode=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/exception/UserModuleErrorCode.java | 16 ++++++++++++++++ .../esua/epdc/service/impl/UserServiceImpl.java | 6 +++++- .../src/main/resources/i18n/messages.properties | 2 ++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/exception/UserModuleErrorCode.java 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 ea183d266..2e96a4e9a 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 @@ -56,6 +56,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.UserGridRelationService; import com.elink.esua.epdc.service.UserInvitationRecordService; @@ -502,6 +503,7 @@ public class UserServiceImpl extends BaseServiceImpl implem @Override @Transactional(rollbackFor = Exception.class) public Result completeUserInfo(EpdcAppUserCompleteInfoFormDTO formDto) { + Result result = new Result(); EpdcCompleteAppUserDTO completeAppUser = formDto.getCompleteAppUser(); UserDTO userDto = ConvertUtils.sourceToTarget(completeAppUser, UserDTO.class); @@ -551,6 +553,8 @@ public class UserServiceImpl extends BaseServiceImpl implem userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value()); userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否，1-是) 认证失败：0 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value()); + // 党员认证失败返回code码 + result.error(UserModuleErrorCode.AUTHENTICATION_CODE); } else { UpdateWrapper partyUpdate = new UpdateWrapper<>(); partyUpdate.eq(UserFieldConsant.IDENTITY_NO, identityNo) @@ -600,7 +604,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..5eb4f45e8 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=Ա֤ʧ \ No newline at end of file From f07a2af055f51e0802ab151d82ec23774e4007f2 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Fri, 3 Jan 2020 18:04:21 +0800 Subject: [PATCH 09/27] =?UTF-8?q?bug#5003=E5=85=9A=E7=BE=A4=E8=AE=AE?= =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E4=B8=AD=E5=92=8C?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=AD=E7=9A=84=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3:=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=8F=96OUT=5FHANDLE=5FADVICE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 b588ed43e..f8d1d189d 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 @@ -586,7 +586,7 @@ SELECT hp.ID, hp.CREATED_TIME AS createdTime, - hp.OUT_HANDLE_ADVICE AS advice, + hp.HANDLE_ADVICE AS advice, hp.HANDLER_DEPT AS handlerDept, hp.STATE, itemDept.DEPT_NAME, @@ -606,7 +606,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, From 207250e013d9bb8687b71325854deff299a4dd85 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Fri, 3 Jan 2020 23:36:40 +0800 Subject: [PATCH 10/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9webservice=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/CityGridInterfaceServiceWebService.java | 2 +- .../service/impl/CityGridInterfaceServiceWebServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java index 712930549..11fa9972a 100644 --- a/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java +++ b/esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/service/CityGridInterfaceServiceWebService.java @@ -10,7 +10,7 @@ import javax.jws.WebService; * @Description: 供网格化平台调用webservice接口 */ // 命名空间，写一个有意义的http地址就行，并不是网上所说的要写成包名倒序,只不过写成包名倒序易读而已 -@WebService(targetNamespace = "https://service.epdc.esua.elink.com") +@WebService(targetNamespace = "http://service.epdc.esua.elink.com") public interface CityGridInterfaceServiceWebService { /** * @param requestXML 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 6b350bd43..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 @@ -39,7 +39,7 @@ import java.util.regex.Pattern; * @Date 2019/12/30 16:24 */ @WebService(serviceName = "CityGridInterfaceServiceWebService", - targetNamespace = "https://service.epdc.esua.elink.com", + targetNamespace = "http://service.epdc.esua.elink.com", endpointInterface = "com.elink.esua.epdc.service.CityGridInterfaceServiceWebService") @Component public class CityGridInterfaceServiceWebServiceImpl implements CityGridInterfaceServiceWebService { From 0285d86034d0a9629ba5cf7a56d35a384c18d4dc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 6 Jan 2020 10:27:35 +0800 Subject: [PATCH 11/27] =?UTF-8?q?=E5=A4=84=E7=90=86<=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E7=BB=9F=E8=AE=A1>=E6=8E=A5=E5=8F=A3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/issue/IssueDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..75a81d9bc 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 @@ -354,7 +354,7 @@ 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' From c8017c33464f0c2c7f23b1d3b699a6f2481c3bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Mon, 6 Jan 2020 13:25:04 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=9A=E5=91=98?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=A4=B1=E8=B4=A5code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/service/impl/UserServiceImpl.java | 3 ++- .../src/main/resources/i18n/messages.properties | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 2e96a4e9a..6d80933fb 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 @@ -32,6 +32,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; @@ -554,7 +555,7 @@ public class UserServiceImpl extends BaseServiceImpl implem userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否，1-是) 认证失败：0 userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value()); // 党员认证失败返回code码 - result.error(UserModuleErrorCode.AUTHENTICATION_CODE); + result.error(UserModuleErrorCode.AUTHENTICATION_CODE, MessageUtils.getMessage(UserModuleErrorCode.AUTHENTICATION_CODE)); } else { UpdateWrapper partyUpdate = new UpdateWrapper<>(); partyUpdate.eq(UserFieldConsant.IDENTITY_NO, identityNo) 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 5eb4f45e8..ae0fb72bf 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 @@ -1,2 +1,2 @@ #Default -100006001=Ա֤ʧ \ No newline at end of file +100006001=\u515A\u5458\u8BA4\u8BC1\u5931\u8D25 \ No newline at end of file From 8614366d85225b4a3c282ca686f95830db68d828 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 6 Jan 2020 14:54:42 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=B6=88=E6=81=AF=E6=95=B0=E9=87=8F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=20-=20=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=9A=E6=9C=AA=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 1 + 1 file changed, 1 insertion(+) 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 f8d1d189d..dae950e38 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 @@ -834,6 +834,7 @@ WHERE information.DEL_FLAG = '0' + and information.READ_FLAG = '0' AND information.DEPT_ID IN From 1662b608b737185f8292dd6f66009fc10656cda6 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 6 Jan 2020 16:36:47 +0800 Subject: [PATCH 14/27] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8-?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8app=E7=AB=AF=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6READ=5FFL?= =?UTF-8?q?AG=3D1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemInformationDao.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml index 52f4804bc..adac5fb01 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml +++ b/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' AND information.DEPT_ID = #{deptId} From 203ed1a8bfd062c9575111845cdb5d39336b2bca Mon Sep 17 00:00:00 2001 From: yujintao Date: Mon, 6 Jan 2020 16:54:20 +0800 Subject: [PATCH 15/27] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=94=E6=9D=91?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-admin/epdc-admin-server/pom.xml | 45 +++++++++++++++++++ .../src/main/resources/application-prod.yml | 14 +++--- esua-epdc/epdc-auth/pom.xml | 21 +++++++++ esua-epdc/epdc-gateway/pom.xml | 39 ++++++++++++++++ .../epdc-api/epdc-api-server/pom.xml | 35 +++++++++++++++ .../epdc-events/epdc-events-server/pom.xml | 35 ++++++++++++++- .../src/main/resources/application.yml | 1 - .../epdc-group/epdc-group-server/pom.xml | 25 +++++++++++ .../epdc-heart/epdc-heart-server/pom.xml | 27 +++++++++++ .../epdc-job/epdc-job-server/pom.xml | 24 ++++++++++ .../epdc-kpi/epdc-kpi-server/pom.xml | 24 ++++++++++ .../epdc-message/epdc-message-server/pom.xml | 24 ++++++++++ .../epdc-news/epdc-news-server/pom.xml | 24 ++++++++++ .../epdc-oss/epdc-oss-server/pom.xml | 24 ++++++++++ .../src/main/resources/application.yml | 3 +- .../epdc-user/epdc-user-server/pom.xml | 25 +++++++++++ esua-epdc/epdc-module/epdc-webservice/pom.xml | 23 ++++++++++ .../epdc-websocket-server/pom.xml | 33 ++++++++++++++ 18 files changed, 435 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 8d95b3d70..8f01e27a9 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -168,6 +168,12 @@ prod prod + + 0 + 10.5.34.164 + 6379 + Elink@833066 + true 10.5.34.164:8848 @@ -179,6 +185,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-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index f84f5cdc9..89a70d17e 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -215,6 +215,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-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index faf48b235..a9f4891d6 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 @@ -243,6 +243,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-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml index 4cd4fa70c..78593c756 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 @@ -187,7 +187,6 @@ true 47.104.224.45:8848 - test @@ -224,7 +223,6 @@ true 10.5.34.164:8848 - prod @@ -236,6 +234,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/resources/application.yml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml index acc1334b0..353ba573d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml @@ -28,7 +28,6 @@ spring: discovery: server-addr: @nacos.server-addr@ register-enabled: @nacos.register-enabled@ - ip: @nacos.register.ip@ alibaba: seata: tx-service-group: epdc-events-server-fescar-service-group diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml index 5826002cb..7147273a5 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml @@ -180,6 +180,31 @@ 10.5.34.164:8848 + + + prod_kongcun + + prod + prod + + 9063 + + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + true + 172.16.1.238:8848 + + diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml index 1c11c8921..5d379be3b 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml @@ -159,5 +159,32 @@ http://localhost:9411 + + + prod_kongcun + + prod + + 9060 + + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + elink888 + + + true + 172.16.1.238:8848 + + http://localhost:9411 + + diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml index 897818898..d5f56d19c 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml @@ -208,6 +208,30 @@ 10.5.34.164:8848 + + + prod_kongcun + + prod + prod + + 9061 + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + true + 172.16.1.238:8848 + + diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml index bae63c87b..5faa821e5 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/pom.xml @@ -179,6 +179,30 @@ 10.5.34.164:8848 + + + prod_kongcun + + prod + prod + + 9987 + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + true + 172.16.1.238:8848 + + diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml index 65e33181e..85a1fa225 100644 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml @@ -208,6 +208,30 @@ 10.5.34.164:8848 + + + prod_kongcun + + prod + prod + + 9062 + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + true + 172.16.1.238:8848 + + diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml index f261ef80e..da580cc04 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml @@ -174,6 +174,30 @@ 10.5.34.164:8848 + + + prod_kongcun + + prod + prod + + 9064 + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + true + 172.16.1.238:8848 + + 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 8ca3ac1be..8454671c9 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 @@ -221,5 +221,29 @@ 10.5.34.164:8848 + + + prod_kongcun + + prod + prod + + 9065 + + 0 + 172.16.1.238 + 6379 + Elink833066 + + + + + epdc + Elink@833066 + + true + 172.16.1.238:8848 + + diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml index d304db221..e2efc17d0 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml @@ -45,7 +45,8 @@ fdfs: so-timeout: 600000 connect-timeout: 6000 tracker-list: #TrackerList参数,支持多个 - - 10.5.34.165:22122 + # - 10.5.34.165:22122 # 市北党群，电政办服务器FastDFS + - 172.16.1.239:22122 # 孔村党群，阿里云服务器FastDFS management: endpoints: 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 3083936eb..2af539586 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 @@ -179,6 +179,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-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-websocket/epdc-websocket-server/pom.xml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/pom.xml index 7aca23c92..e7228bb19 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 @@ -230,6 +230,39 @@ 5bf4fb813145431b3493a10aa7e041e9 + + + 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 + + From 1b3bb9400071a8fd7cd12c4c85f9fffce3d1645e Mon Sep 17 00:00:00 2001 From: liuchuang Date: Mon, 6 Jan 2020 17:29:42 +0800 Subject: [PATCH 16/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/issue/form/IssueFormDTO.java | 9 +++++++-- .../esua/epdc/dto/issue/result/IssueDetailResultDTO.java | 5 +++++ .../com/elink/esua/epdc/dto/item/form/ItemFormDTO.java | 9 +++++++-- .../esua/epdc/dto/item/result/ItemDetailResultDTO.java | 5 +++++ .../src/main/resources/mapper/issue/IssueDao.xml | 9 +++++++-- .../src/main/resources/mapper/item/ItemDao.xml | 9 +++++++-- .../dto/topic/form/TopicListFormDTO.java | 5 +++++ .../src/main/resources/mapper/topic/TopicDao.xml | 3 +++ 8 files changed, 46 insertions(+), 8 deletions(-) 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/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-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 75a81d9bc..978341da9 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, 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 dae950e38..7d0ebc25f 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 @@ -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, diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicListFormDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicListFormDTO.java index 85e9ca29c..5fe1afb43 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicListFormDTO.java +++ b/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; + } diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml index 813f84bd3..2735e5a69 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/topic/TopicDao.xml @@ -167,6 +167,9 @@ #{timestamp} + + AND t1.ID = #{topicId} + = ]]> #{someMonthsAgo} ORDER BY From feeff0ca559421aadd63a9d1ca8bb6f6c2555073 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Mon, 6 Jan 2020 20:13:44 +0800 Subject: [PATCH 17/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=8C=96=E5=B9=B3=E5=8F=B0=E5=A4=84=E7=90=86=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shibei/dto/SearchCaseProcessByTaskIdItemDto.java | 11 +++++++++++ .../epdc/enums/ItemGridPlatformHandleStatusEnum.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) 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-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, "中间督办"), From 2ba57fbadabd73b56b4496d2924af9d80d489cd0 Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 7 Jan 2020 10:08:52 +0800 Subject: [PATCH 18/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E7=B1=BB=E5=88=AB=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/controller/ApiIssueController.java | 8 ++++---- .../com/elink/esua/epdc/controller/ApiItemController.java | 6 +++--- .../java/com/elink/esua/epdc/service/IssueService.java | 4 ++-- .../java/com/elink/esua/epdc/service/ItemService.java | 2 +- .../elink/esua/epdc/service/impl/IssueServiceImpl.java | 4 ++-- .../com/elink/esua/epdc/service/impl/ItemServiceImpl.java | 4 ++-- .../dto/issue/form/IssueCategoryStatisticsFormDTO.java | 2 +- .../epdc/dto/item/form/ItemCategoryStatisticsFormDTO.java | 2 +- .../src/main/resources/mapper/issue/IssueDao.xml | 2 +- .../src/main/resources/mapper/item/ItemDao.xml | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) 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/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java index 54ede305a..a5575b0db 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 @@ -151,12 +151,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/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/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-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 978341da9..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 @@ -365,7 +365,7 @@ 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 7d0ebc25f..85c9ce825 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 @@ -369,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} + + + 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}) + + From 30aa41300cecbd72ff99eca36f38173129e9e79d Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Tue, 7 Jan 2020 13:27:43 +0800 Subject: [PATCH 20/27] =?UTF-8?q?=E6=8B=89=E5=8F=96=E5=B8=82=E5=8C=97?= =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=8C=96=E5=B9=B3=E5=8F=B0=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=83=85=E5=86=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/modules/item/dao/ItemDao.java | 2 +- .../esua/epdc/modules/item/service/impl/ItemServiceImpl.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 6c09497b7..aeeda5137 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 @@ -204,6 +204,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 ce41affcf..33310165e 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; @@ -1106,7 +1107,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); } From 5f326763fa98a74b13a7e41e94a5bf818441ceb0 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 7 Jan 2020 14:04:12 +0800 Subject: [PATCH 21/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=20=EF=BC=9A=20?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=EF=BC=8C=E9=A6=96=E9=A1=B5=EF=BC=8C?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E4=B8=AD=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=88=96=E6=B6=88=E6=81=AF=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=9F=A5=E7=9C=8B=E5=90=8E=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=E5=B0=8F=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemInformationDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml index adac5fb01..9a2d4fea3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemInformationDao.xml @@ -45,7 +45,7 @@ UPDATE epdc_item_information SET READ_FLAG = '1' WHERE DEL_FLAG = '0' - + AND DEPT_ID = #{deptId} AND DEPT_ID IN From 9552a7c4891e080a52b347d4b8b792e30c05a792 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 7 Jan 2020 14:30:03 +0800 Subject: [PATCH 22/27] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E9=95=BF=E7=9B=B8?= =?UTF-8?q?=E5=85=B3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/AppUserServiceImpl.java | 7 ++++++- .../com/elink/esua/epdc/service/impl/UserServiceImpl.java | 7 +++---- 2 files changed, 9 insertions(+), 5 deletions(-) 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 d4be194be..238d129a4 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 @@ -283,7 +283,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); 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 6d80933fb..a5394d81e 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 @@ -329,7 +329,7 @@ public class UserServiceImpl extends BaseServiceImpl implem UserDTO existUser = selectUserByWxInfo(gridLeader.getWxOpenId(), gridLeader.getWxUnionId()); String userId; String faceImg = userEntity.getFaceImg(); - + userEntity.setLastLoginTime(new Date()); // 首次注册 if (null == existUser) { @@ -573,12 +573,11 @@ public class UserServiceImpl extends BaseServiceImpl implem userAuthenticateHistoryEntity.setRealName(userDto.getRealName()); userAuthenticateHistoryEntity.setAddress(userDto.getAddress()); userAuthenticateHistoryEntity.setRemark(userDto.getRemark()); - userAuthenticateHistoryEntity.setAuthenticatedType(AuthenticatedConsant.partyAuth); // 新维护的 认证类别(0-居民认证，1-党员认证，2-志愿者认证) + // 新维护的 认证类别(0-居民认证，1-党员认证，2-志愿者认证) + userAuthenticateHistoryEntity.setAuthenticatedType(AuthenticatedConsant.partyAuth); userAuthenticateHistoryDao.insert(userAuthenticateHistoryEntity); } else { - if (oldEntity.getState().equals(AppUserStatesEnum.STATE_INFORMATION_NOT_PASSED.value())) { userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value()); - } } // 昵称前缀 String nicknamePrefix = "网格长-"; From 14b594c074735df4225ca17f2eafc90eaa07a48b Mon Sep 17 00:00:00 2001 From: liuchuang Date: Tue, 7 Jan 2020 14:51:31 +0800 Subject: [PATCH 23/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/item/ItemDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 85c9ce825..d40ba30cc 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 @@ -237,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} From 96fbaa073feb2415609bfab4ffe92d86eafd8d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 7 Jan 2020 17:24:26 +0800 Subject: [PATCH 24/27] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/result/EpdcAppAuthorizationDTO.java | 11 +++++++++++ .../esua/epdc/service/impl/AppUserServiceImpl.java | 7 +++++++ .../elink/esua/epdc/service/impl/UserServiceImpl.java | 3 ++- .../src/main/resources/i18n/messages.properties | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) 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/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 238d129a4..4b9abf68a 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 @@ -826,6 +826,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()); } UserDTO user = completeResult.getData(); 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 a5394d81e..b15ca5226 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 @@ -552,7 +552,8 @@ public class UserServiceImpl extends BaseServiceImpl implem partyAuthenticationFailedDao.insert(authenticationFailedEntity); userDto.setState(AppUserStatesEnum.STATE_COMPLETED_INFORMATION_PENDING_REVIEW.value()); - userDto.setPartyFlag(YesOrNoEnum.NO.value());//是否是党员(0-否，1-是) 认证失败：0 + // 是否是党员(0-否，1-是) 认证失败：0 + userDto.setPartyFlag(YesOrNoEnum.NO.value()); userAuthenticateHistoryEntity.setAuthenticatedFlag(YesOrNoEnum.NO.value()); // 党员认证失败返回code码 result.error(UserModuleErrorCode.AUTHENTICATION_CODE, MessageUtils.getMessage(UserModuleErrorCode.AUTHENTICATION_CODE)); 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 ae0fb72bf..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 @@ -1,2 +1,2 @@ #Default -100006001=\u515A\u5458\u8BA4\u8BC1\u5931\u8D25 \ No newline at end of file +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 From f68d40a3729c464c766065fba243697d6fa66c38 Mon Sep 17 00:00:00 2001 From: yujintao Date: Wed, 8 Jan 2020 11:15:10 +0800 Subject: [PATCH 25/27] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-admin/epdc-admin-server/pom.xml | 2 +- esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml | 6 ++++++ .../epdc-oss-server/src/main/resources/application.yml | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml index 8f01e27a9..cfd2a8f33 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/pom.xml @@ -187,7 +187,7 @@ dc13065f79429979d9f687d249eb5c4e - + epdc Elink@833066 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 8454671c9..c077ee66b 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 @@ -219,6 +219,9 @@ true 10.5.34.164:8848 + + + 10.5.34.165:22122 @@ -243,6 +246,9 @@ true 172.16.1.238:8848 + + + 172.16.1.239:22122 diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml index e2efc17d0..47956a5c0 100644 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml @@ -45,8 +45,7 @@ fdfs: so-timeout: 600000 connect-timeout: 6000 tracker-list: #TrackerList参数,支持多个 - # - 10.5.34.165:22122 # 市北党群，电政办服务器FastDFS - - 172.16.1.239:22122 # 孔村党群，阿里云服务器FastDFS + - @fastdfs.server-addr@ management: endpoints: From e51b4bef973e3885a91baf42fb2e51dba9d2ee3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Wed, 8 Jan 2020 15:59:46 +0800 Subject: [PATCH 26/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B9=8B=E5=90=8E=E6=89=AB=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E4=B8=AA=E7=BD=91=E6=A0=BC=E6=98=B5=E7=A7=B0=E8=A2=AB=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/EpdcAppUserController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 cfacb52b1..2550651a4 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 @@ -14,6 +14,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; @@ -233,9 +234,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()); From 827d9415d5b7e0494082b054b86b2e9d4ce8fd6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 9 Jan 2020 08:59:47 +0800 Subject: [PATCH 27/27] =?UTF-8?q?=E6=96=B0=E9=97=BB=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E4=B8=8B=E7=BA=BF=20=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5banner?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dao/BannerDao.java | 22 +++++++++++++ .../esua/epdc/service/BannerService.java | 18 ++++++++++ .../epdc/service/impl/BannerServiceImpl.java | 19 ++++++++--- .../epdc/service/impl/NewsServiceImpl.java | 33 +++++++++++++++++-- .../src/main/resources/mapper/BannerDao.xml | 18 ++++++++++ 5 files changed, 103 insertions(+), 7 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/BannerDao.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/BannerDao.java index 4a4057439..b1aea43bd 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/dao/BannerDao.java +++ b/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 { * @date 2019/9/11 9:00 */ List 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); + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/BannerService.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/BannerService.java index e37ec6e98..ae4c8b193 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/BannerService.java +++ b/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 { * @date 2019/9/17 19:42 */ Result saveNewsToBanner(BannerDTO banner, List 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); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java index cbcb8afd0..9603ba6ca 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java +++ b/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 } 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); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index 4ed5f785a..c4f88a8e1 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/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 implem @Autowired private NewsUserAttitudeService newsUserAttitudeService; + @Autowired + private BannerService bannerService; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -169,6 +173,8 @@ public class NewsServiceImpl extends BaseServiceImpl implem baseDao.deleteBatchIds(Arrays.asList(ids)); //删除部门关系表相关数据 newsDepartmentService.deleteByNewsId(ids[0]); + // 下架banner + undataBannerSoltOut(ids[0]); } @Override @@ -185,11 +191,16 @@ public class NewsServiceImpl extends BaseServiceImpl 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 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 implem return new Result(); } - @Autowired - private BannerService bannerService; @Override @Transactional(rollbackFor = Exception.class) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml index 18e7e3584..1f03e6a52 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/BannerDao.xml @@ -23,4 +23,22 @@ limit 5 + + + + \ No newline at end of file