From c4764b4e47e6c995d673c404a78ae1acf1e71c23 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Wed, 6 Mar 2024 17:23:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/IssueServiceImpl.java | 1 + .../epdc-events/epdc-events-server/pom.xml | 6 +++--- .../controller/VeteranTopicController.java | 2 +- .../service/impl/VeteranTopicServiceImpl.java | 20 +++++++++++++++++-- 4 files changed, 23 insertions(+), 6 deletions(-) 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 6954f078..73726a5b 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 @@ -202,6 +202,7 @@ public class IssueServiceImpl implements IssueService { @Override public Result submitVeterantopic(TokenDto userDetail, VeteranTopicDTO dto) { dto.setUserId(userDetail.getUserId()); + dto.setGridId(userDetail.getGridId()); dto.setUserFace(userDetail.getFaceImg()); dto.setMobile(userDetail.getMobile()); return issueFeignClient.submitVeterantopic(dto); 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 3c293668..c19c375a 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 @@ -165,10 +165,10 @@ elink!888 - + - jinshui_epdc_test - jinshui@833066 + epdc_root + epdc@jinshui888 false 115.29.142.202:8848 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java index 5ce7e37b..5a86d35c 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java @@ -104,7 +104,7 @@ public class VeteranTopicController { * @Version1.0 **/ @PostMapping("submitVeterantopic") - public Result submit(@RequestBody VeteranTopicDTO dto){ + public Result submit(@RequestBody VeteranTopicDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); veteranTopicService.save(dto); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java index 1e1a6b9b..0e43b12b 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java @@ -22,15 +22,18 @@ 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.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO; 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.dto.epdc.result.EpdcUserRegisterInfoResultDTO; import com.elink.esua.epdc.dto.events.VeteranTopicDTO; import com.elink.esua.epdc.dto.issue.form.VeteranFormDTO; import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; import com.elink.esua.epdc.modules.events.dao.VeteranTopicDao; import com.elink.esua.epdc.modules.events.entity.VeteranTopicEntity; import com.elink.esua.epdc.modules.events.service.VeteranTopicService; +import com.elink.esua.epdc.modules.feign.AdminFeignClient; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -49,6 +52,9 @@ import java.util.Map; @Service public class VeteranTopicServiceImpl extends BaseServiceImpl implements VeteranTopicService { + @Autowired + private AdminFeignClient adminFeignClient; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -65,8 +71,8 @@ public class VeteranTopicServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -83,6 +89,16 @@ public class VeteranTopicServiceImpl extends BaseServiceImpl parentAndAllDept = adminFeignClient.getParentAndAllDept(dto.getGridId()); + ParentAndAllDeptDTO data = parentAndAllDept.getData(); + if (null != data) { + dto.setGrid(dto.getGrid()); + dto.setAllDeptNames(data.getAllDeptNames()); + dto.setAllDeptIds(data.getAllDeptIds()); + dto.setParentDeptNames(data.getParentDeptNames()); + dto.setParentDeptIds(data.getParentDeptIds()); + } VeteranTopicEntity entity = ConvertUtils.sourceToTarget(dto, VeteranTopicEntity.class); insert(entity); }