From 3b04d4378fc8fa0f3c5df622cd476c69e503293f Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 30 Dec 2020 17:34:02 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E5=A4=84=E7=90=86=E8=BF=9B=E5=B1=95=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=9B=BE=E7=89=87bug?= 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 ea914579..d4b37a01 100644 --- 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 @@ -734,7 +734,7 @@ epdc_item_handle_process hp LEFT JOIN epdc_item_dept itemDept ON hp.ID = itemDept.ITEM_HANDLE_ID LEFT JOIN epdc_img img ON hp.ID = img.REFERENCE_ID - AND IMG_TYPE = 'itemHandle' + AND IMG_TYPE = 'itemOutHandle' AND img.DEL_FLAG = '0' WHERE hp.DEL_FLAG = '0' From d4e6545cfccd6b4538db1b5551a21872d5e1154d Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 4 Jan 2021 13:59:04 +0800 Subject: [PATCH 2/9] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/pointcommons/tools/aop/UserBehaviorAop.java | 9 +++++++-- .../java/com/elink/esua/epdc/feign/UserFeignClient.java | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/aop/UserBehaviorAop.java b/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/aop/UserBehaviorAop.java index 636a046c..6bb2d401 100644 --- a/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/aop/UserBehaviorAop.java +++ b/esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/aop/UserBehaviorAop.java @@ -8,11 +8,12 @@ import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; import com.elink.esua.epdc.pointcommons.tools.dto.BehaviorResultDto; import com.elink.esua.epdc.pointcommons.tools.feign.PointsCommonFeignClient; import com.elink.esua.epdc.pointcommons.tools.rocketmq.dto.BehaviorDto; import com.elink.esua.epdc.pointcommons.tools.rocketmq.producer.PointsProducer; -import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -36,6 +37,7 @@ import java.util.Date; */ @Aspect @Component +@Slf4j public class UserBehaviorAop { @@ -134,6 +136,7 @@ public class UserBehaviorAop { Result result = pointsFeignClient.getBehaviorCodeInfo(behaviorCode); BehaviorResultDto behaviorResultDto = result.getData(); if (behaviorResultDto == null) { + log.info("根据行为编码获取编码动作失败！"); return; } behaviorRecodingTime = behaviorResultDto.getBehaviorRecordingTime(); @@ -154,7 +157,8 @@ public class UserBehaviorAop { String referenceId = this.covertData(recordUserBehavior.referenceId(), args, argNames); String userId = this.covertData(recordUserBehavior.userId(), args, argNames); String gridId = this.covertData(recordUserBehavior.gridId(), args, argNames); - if(StringUtils.isBlank(userId) || StringUtils.isBlank(referenceId)){ + if(StringUtils.isBlank(userId) || StringUtils.isBlank(referenceId) || StringUtils.isBlank(gridId)){ + log.info("用户ID，业务ID，网格ID转换失败！"); return; } BehaviorDto behaviorDto = new BehaviorDto(); @@ -163,6 +167,7 @@ public class UserBehaviorAop { behaviorDto.setUserId(userId); behaviorDto.setGridId(Long.parseLong(gridId)); behaviorDto.setOperationTime(new Date()); + log.info("动作发送信息：动作编码："+behaviorCode+" 用户ID："+userId+",业务ID："+referenceId+",网格ID："+gridId+",操作时间："+behaviorDto.getOperationTime()); //发送mq pointsProducer.sendMessage(RocketMqConstant.MQ_TOPIC_POINTS, RocketMqConstant.MQ_TAG_POINTS, referenceId, JSONObject.toJSONString(behaviorDto)); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 0aa507c6..7592997c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -560,7 +560,7 @@ public interface UserFeignClient { * @Param [userId] * @return com.elink.esua.epdc.commons.tools.utils.Result **/ - @PostMapping(value = "app-user/epdc-app/user/getPointsByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(value = "app-user/epdc-app/user/getPointsByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) Result getPointsByUserId(@PathVariable String userId); /** * @Description 获取用户认证的网格接口 @@ -569,7 +569,7 @@ public interface UserFeignClient { * @Param [userId] * @return com.elink.esua.epdc.commons.tools.utils.Result **/ - @PostMapping(value = "app-user/epdc-app/user/getUserGridIdByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) + @GetMapping(value = "app-user/epdc-app/user/getUserGridIdByUserId/{userId}", consumes = MediaType.APPLICATION_JSON_VALUE) Result getUserGridIdByUserId(@PathVariable String userId); } \ No newline at end of file From 392cc2b26980fb35462674b53294e9d540716e2c Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Tue, 5 Jan 2021 13:41:47 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/SysDeptDTO.java | 20 ++++++++++++---- .../elink/esua/epdc/entity/SysDeptEntity.java | 5 ++++ .../esua/epdc/service/SysDeptService.java | 9 +++++++ .../epdc/service/impl/SysDeptServiceImpl.java | 24 +++++++++++++++++++ 4 files changed, 54 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java index 3d5d9d58..556cecc1 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java @@ -16,10 +16,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Null; +import javax.validation.constraints.*; import java.io.Serializable; import java.util.Date; @@ -67,6 +64,13 @@ public class SysDeptDTO extends TreeNode implements Serializable { */ private String partyCode; + /** + * 区域编码 + */ + @NotBlank(message = "区域编码不能为空且在50字以内", groups = DefaultGroup.class) + @Size(min = 1, max = 50, message = "区域编码不能为空且在50字以内") + private String areaCode; + public String getPartyCode() { return partyCode; } @@ -134,4 +138,12 @@ public class SysDeptDTO extends TreeNode implements Serializable { public void setPid(Long pid) { this.pid = pid; } + + public String getAreaCode() { + return areaCode; + } + + public void setAreaCode(String areaCode) { + this.areaCode = areaCode; + } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java index 5e90ca0f..4b83b09e 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysDeptEntity.java @@ -79,4 +79,9 @@ public class SysDeptEntity extends BaseEntity { */ private String partyCode; + /** + * 区域编码 + */ + private String areaCode; + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index ae5168f9..93010c37 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -114,6 +114,15 @@ public interface SysDeptService extends BaseService { */ Integer getCodeCount(SysDeptDTO dto); + /*** + * 校验区域编码是否重复 + * @param dto + * @return java.lang.Integer + * @author qushutong + * @date 2019/9/21 14:14 + */ + Integer getAreaCodeCount(SysDeptDTO dto); + /** * 通过网格id集合，获取网格长管理的所有网格 * diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 2fd53574..1dbb5b7b 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -127,6 +127,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl 0) { + throw new RenException("您输入的区域编码已存在"); + } + } SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class); entity.setPids(getPidList(entity.getPid())); @@ -149,6 +156,14 @@ public class SysDeptServiceImpl extends BaseServiceImpl 0) { + throw new RenException("您输入的区域编码已存在"); + } + } + SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class); //上级部门不能为自身 @@ -321,6 +336,15 @@ public class SysDeptServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("area_code", dto.getAreaCode()); + Long id = dto.getId(); + wrapper.ne(id != null, "id", dto.getId()); + return baseDao.selectCount(wrapper); + } + @Override public Result getParentDeptIds(Long deptId) { return new Result().ok(getPidList(deptId)); From 0f044df2ead4f8a9cdf8ade49f9171545611cfac Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 5 Jan 2021 16:58:03 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BB=A5=E5=9F=8E=E6=89=BE=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/constant/SdsPtgNoticeConstant.java | 6 +- .../service/impl/GroupBuyInfoServiceImpl.java | 13 +--- .../sds/service/impl/SdsInfoServiceImpl.java | 4 +- .../mapper/groupBuy/GroupBuyInfoDao.xml | 2 +- .../main/resources/mapper/sds/SdsInfoDao.xml | 2 +- ...ResidentInfoByCurrentAddressResultDTO.java | 15 +++++ ...ScreenPopulationInformationController.java | 2 +- .../PopulationInformationController.java | 33 ++++++++++- .../epdc/dao/PopulationInformationDao.java | 12 +++- ...reenResidentInfoByCurrentAddressExcel.java | 44 ++++++++++++++ .../service/PopulationInformationService.java | 28 ++++++++- .../PopulationInformationServiceImpl.java | 25 ++++++++ .../mapper/PopulationInformationDao.xml | 59 +++++++++++++++---- 13 files changed, 210 insertions(+), 35 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/EpdcScreenResidentInfoByCurrentAddressExcel.java diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/SdsPtgNoticeConstant.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/SdsPtgNoticeConstant.java index fd054853..6acb8949 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/SdsPtgNoticeConstant.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/SdsPtgNoticeConstant.java @@ -26,7 +26,11 @@ public interface SdsPtgNoticeConstant { /** * 消息所属业务类型：SDS_PTG */ - String NOTICE_BUSINESS_TYPE_SDS_PTG= "sds_ptg"; + String NOTICE_BUSINESS_TYPE_PTG= "ptg"; + /** + * 消息所属业务类型：SDS_PTG + */ + String NOTICE_BUSINESS_TYPE_SDS= "sds"; /** * 我的消息类型：1互动通知 */ diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java index 0cde91f2..5b5ff335 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java @@ -42,12 +42,6 @@ import com.elink.esua.epdc.dto.GroupBuyInfoDTO; import com.elink.esua.epdc.dto.GroupBuyPriceNumberDTO; import com.elink.esua.epdc.dto.GroupBuySignUpDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; -import com.elink.esua.epdc.dto.form.EpdcAddGroupBuyInfoFormDTO; -import com.elink.esua.epdc.dto.form.EpdcSelectGroupBuyInfoListFormDTO; -import com.elink.esua.epdc.dto.form.GroupBuyTopFormDTO; -import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO; -import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO; -import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO; import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.modules.feign.AdminFeignClient; @@ -55,9 +49,8 @@ import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient; import com.elink.esua.epdc.modules.groupbuy.dao.GroupBuyInfoDao; import com.elink.esua.epdc.modules.groupbuy.dao.GroupBuyPriceNumberDao; import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyInfoEntity; -import com.elink.esua.epdc.modules.groupbuy.redis.GroupBuyInfoRedis; -import com.elink.esua.epdc.modules.groupbuy.service.GroupBuyEvaluationService; import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyPriceNumberEntity; +import com.elink.esua.epdc.modules.groupbuy.service.GroupBuyEvaluationService; import com.elink.esua.epdc.modules.groupbuy.service.GroupBuyInfoService; import com.elink.esua.epdc.modules.groupbuy.service.GroupBuySignUpService; import com.elink.esua.epdc.modules.reportissue.dao.CustomImgDao; @@ -165,7 +158,7 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/sds/SdsInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/sds/SdsInfoDao.xml index d2460e3f..7192d7ef 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/sds/SdsInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/sds/SdsInfoDao.xml @@ -64,7 +64,7 @@ t.CARRY_CONTENT, t.CARRY_STATUS from epdc_sds_info t - where t.DEL_FLAG = '0' and t.SHIELD_FLAG = '0' and t.ID = #{id} + where t.DEL_FLAG = '0' and t.ID = #{id} + \ No newline at end of file From 84466447fd6d8d86f91c2cf9a54b448b45a1f94d Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Thu, 7 Jan 2021 17:48:14 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BB=A5=E5=9F=8E=E6=89=BE=E4=BA=BA=20-=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BB=A5=E5=A7=93=E5=90=8D=E6=89=BE=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java | 5 ++++- .../src/main/resources/mapper/PopulationInformationDao.xml | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java index 4e83e907..3e682d30 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcScreenResidentInfoByCurrentAddressFormDTO.java @@ -28,7 +28,10 @@ public class EpdcScreenResidentInfoByCurrentAddressFormDTO { /** * 当前居住地址 */ - @NotBlank(message = "居住地址不能为空") private String currentAddress; + /** + * 居住人姓名 + */ + private String residentName; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml index e7c14ecc..b83f43cd 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PopulationInformationDao.xml @@ -475,6 +475,9 @@ and t.CURRENT_ADDRESS like concat('%', #{currentAddress}, '%') + + and t.RESIDENTS_NAME like concat('%', #{residentName}, '%') + group by t.ID LIMIT #{pageIndex},#{pageSize} @@ -488,6 +491,9 @@ and CURRENT_ADDRESS like concat('%', #{currentAddress}, '%') + + and t.RESIDENTS_NAME like concat('%', #{residentName}, '%') + - select id from epdc_party_topic_user_attitude where PARTY_TOPIC_ID = #{topicId} and USER_ID = #{userId} + select id from epdc_party_topic_user_attitude where PARTY_TOPIC_ID = #{topicId} and USER_ID = #{userId} and DEL_FLAG = '0' limit 1 From b375493298e11c11cd11e06d12453032e8a3f84a Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 12 Jan 2021 15:24:29 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-admin/epdc-admin-client/pom.xml | 5 + .../com/elink/esua/epdc/dto/SysDeptDTO.java | 2 + .../esua/epdc/dto/epdc/DeptCodeOption.java | 18 ++ .../epdc/controller/SysDeptController.java | 12 + .../esua/epdc/feign/AnalysisFeignClient.java | 32 +++ .../fallback/AnalysisFeignClientFallback.java | 23 ++ .../esua/epdc/service/SysDeptService.java | 20 ++ .../epdc/service/impl/SysDeptServiceImpl.java | 49 ++-- .../epdc-commons/epdc-commons-tools/pom.xml | 6 + .../commons/tools/constant/EpmetConstant.java | 212 ++++++++++++++++++ .../commons/tools/constant/NumConstant.java | 2 + .../epdc/commons/tools/redis/RedisKeys.java | 11 + .../src/main/resources/application.yml | 3 +- .../esua/epdc/dto/admin/DeptCodeFormDTO.java | 22 ++ .../esua/epdc/dto/admin/DeptCodeTree.java | 33 +++ .../epdc-analysis-server/pom.xml | 6 + .../com/elink/esua/epdc/jwt/JwtUtils.java | 46 ++++ .../controller/AdminAnalysisController.java | 38 ++++ .../admin/service/AdminAnalysisService.java | 20 ++ .../impl/AdminAnalysisServiceImpl.java | 47 ++++ .../esua/epdc/properties/EpmetProperties.java | 67 ++++++ .../com/elink/esua/epdc/utils/EpmetUtils.java | 88 ++++++++ .../src/main/resources/application-dev.yml | 30 ++- .../src/main/resources/application-prod.yml | 8 +- .../src/main/resources/application-test.yml | 6 + .../src/main/resources/application.yml | 1 + 26 files changed, 778 insertions(+), 29 deletions(-) create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/DeptCodeOption.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java create mode 100644 esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java create mode 100644 esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeTree.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/controller/AdminAnalysisController.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/AdminAnalysisService.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/properties/EpmetProperties.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/EpmetUtils.java diff --git a/esua-epdc/epdc-admin/epdc-admin-client/pom.xml b/esua-epdc/epdc-admin/epdc-admin-client/pom.xml index ff113fac..d76accf0 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/pom.xml +++ b/esua-epdc/epdc-admin/epdc-admin-client/pom.xml @@ -33,6 +33,11 @@ springfox-swagger-ui ${swagger.version} + + com.esua.epdc + epdc-analysis-client + 1.0.0 + diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java index 556cecc1..dabcc0b8 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java @@ -146,4 +146,6 @@ public class SysDeptDTO extends TreeNode implements Serializable { public void setAreaCode(String areaCode) { this.areaCode = areaCode; } + + } diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/DeptCodeOption.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/DeptCodeOption.java new file mode 100644 index 00000000..bc7500d9 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/DeptCodeOption.java @@ -0,0 +1,18 @@ +package com.elink.esua.epdc.dto.epdc; + +import lombok.Data; + +import java.util.List; + +/** + * 部门节点 + * + * @author work@yujt.net.cn + * @date 2019/11/27 10:03 + */ +@Data +public class DeptCodeOption { + + private List options; + +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java index 1fee39a9..6884e8ce 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java @@ -17,6 +17,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; 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.*; +import com.elink.esua.epdc.dto.epdc.DeptCodeOption; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.service.SysDeptService; @@ -257,4 +258,15 @@ public class SysDeptController { PageData page = sysDeptService.listCompleteDeptDTO(params); return new Result>().ok(page); } + /** + * @Description 获取部门区域编码树 + * @Author songyunpeng + * @Date 2021/1/7 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping("getDeptCode") + public Result getDeptCodeTree(){ + return sysDeptService.getDeptCodeTree(); + } } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java new file mode 100644 index 00000000..3a2dd4dc --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO; +import com.elink.esua.epdc.dto.epdc.DeptCodeOption; +import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 数据分析模块调用 + * + * @Author：liuchuang + * @Date：2020/9/9 15:41 + */ +@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class) +public interface AnalysisFeignClient { + + /** + * @Description 组织机构编码获取 + * @Author songyunpeng + * @Date 2021/1/7 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping(value = "analysis/admin/getDeptCode", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getDeptCode(@RequestBody DeptCodeFormDTO deptCodeFormDTO); + +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java new file mode 100644 index 00000000..76fe5976 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO; +import com.elink.esua.epdc.dto.epdc.DeptCodeOption; +import com.elink.esua.epdc.feign.AnalysisFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Author：songyunpeg + * @Date：2020/9/9 15:42 + */ +@Component +public class AnalysisFeignClientFallback implements AnalysisFeignClient { + + + @Override + public Result getDeptCode(DeptCodeFormDTO deptCodeFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "homePagePlatformSummary",deptCodeFormDTO); + } +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index 93010c37..1f42e0ad 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -12,6 +12,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.*; +import com.elink.esua.epdc.dto.epdc.DeptCodeOption; import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; @@ -250,4 +251,23 @@ public interface SysDeptService extends BaseService { * @date 2020/1/28 10:40 */ DeptOption getAllDeptOptionByLoginUser(); + + + /*** + * 组装孔村部门编码 + * @param + * @return void + * @author qushutong + * @date 2019/12/13 13:54 + */ + void packageKcDeptCodeOption(); + + /** + * @Description 获取部门区域编码树 + * @Author songyunpeng + * @Date 2021/1/7 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result getDeptCodeTree(); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 1dbb5b7b..9da8936b 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -29,11 +29,14 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.TreeUtils; import com.elink.esua.epdc.dao.SysDeptDao; import com.elink.esua.epdc.dto.*; +import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO; +import com.elink.esua.epdc.dto.epdc.DeptCodeOption; import com.elink.esua.epdc.dto.epdc.DeptTreeWithTypeKeyDTO; import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; import com.elink.esua.epdc.entity.SysDeptEntity; +import com.elink.esua.epdc.feign.AnalysisFeignClient; import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.rocketmq.producer.OrganizationModifyProducer; @@ -69,6 +72,9 @@ public class SysDeptServiceImpl extends BaseServiceImpl 0) { - throw new RenException("您输入的区域编码已存在"); - } - } SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class); entity.setPids(getPidList(entity.getPid())); @@ -156,14 +155,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl 0) { - throw new RenException("您输入的区域编码已存在"); - } - } - SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class); //上级部门不能为自身 @@ -915,6 +906,34 @@ public class SysDeptServiceImpl extends BaseServiceImpl(userDtoList, iPage.getTotal()); } + @Override + public Result getDeptCodeTree() { + String deptKey = RedisKeys.getAllDeptCodeOptionKey(); + Object obj = redisUtils.get(deptKey); + if (null == obj) { + this.packageKcDeptCodeOption(); + obj = redisUtils.get(deptKey); + } + //防止列表为空时 redis一直不更新 + DeptCodeOption deptCodeOption = (DeptCodeOption)obj; + if(deptCodeOption.getOptions().size()==0){ + this.packageKcDeptCodeOption(); + obj = redisUtils.get(deptKey); + } + return new Result().ok((DeptCodeOption)obj); + } + + @Override + public void packageKcDeptCodeOption() { + DeptCodeFormDTO deptCodeFormDTO = new DeptCodeFormDTO(); + deptCodeFormDTO.setRootAreaCode(EpmetConstant.DEPT_CODE_KCZ); + Result deptCodeResult = analysisFeignClient.getDeptCode(deptCodeFormDTO); + if(deptCodeResult.getData()!=null){ + DeptCodeOption deptCodeOption = deptCodeResult.getData(); + redisUtils.set(RedisKeys.getAllDeptCodeOptionKey(), deptCodeOption); + } + } + /** * * 组织机构名称修改发送MQ消息 diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/pom.xml b/esua-epdc/epdc-commons/epdc-commons-tools/pom.xml index b8b41d07..4618fdb7 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/pom.xml +++ b/esua-epdc/epdc-commons/epdc-commons-tools/pom.xml @@ -107,6 +107,12 @@ lombok ${lombok.version} + + io.jsonwebtoken + jjwt + 0.7.0 + compile + diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java new file mode 100644 index 00000000..a0372101 --- /dev/null +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java @@ -0,0 +1,212 @@ +package com.elink.esua.epdc.commons.tools.constant; + +/** + * 党群e事通接口配置 + * + * @Author：liuchuang + * @Date：2020/8/20 13:46 + */ +public interface EpmetConstant { + + /** + * 1、首页-平台各类总数上报 + */ + String EPMET_KC_SCREEN_COLL_HOMEPAGE_PLATFORM_SUMMARY = "/data/stats/kcscreencoll/homepage/platformsummary"; + + /** + * 2、议题分析-各类总数 + */ + String EPMET_KC_SCREEN_COLL_ISSUE_SUMMARY = "/data/stats/kcscreencoll/issue/summary"; + + /** + * 3、议题分析-参与趋势 + */ + String EPMET_KC_SCREEN_COLL_ISSUE_TREND = "/data/stats/kcscreencoll/issue/trend"; + + /** + * 4、用户分析-各类总数 + */ + String EPMET_KC_SCREEN_COLL_USER_SUMMARY = "/data/stats/kcscreencoll/user/summary"; + + /** + * 5、公益互助-志愿者公益时长排名 + */ + String EPMET_KC_SCREEN_COLL_VOLUNTEER_HEART_RANK = "/data/stats/kcscreencoll/volunteer/heartrank"; + + /** + * 6、用户分析-用户趋势 + */ + String EPMET_KC_SCREEN_COLL_USER_USER_HEART_RANK = "/data/stats/kcscreencoll/user/userheartrank"; + + /** + * 7、公益互助-活动各类总数 + */ + String EPMET_KC_SCREEN_COLL_ACT_SUMMARY = "/data/stats/kcscreencoll/act/summary"; + + /** + * 8、公益互助-活动次数趋势 + */ + String EPMET_KC_SCREEN_COLL_ACT_TREND = "/data/stats/kcscreencoll/act/trend"; + + /** + * 9、公益互助-志愿者画像 + */ + String EPMET_KC_SCREEN_COLL_ACT_VOLUNTEER_SUMMARY = "/data/stats/kcscreencoll/act/volunteersummary"; + + /** + * 10、项目分析-各类总数 + */ + String EPMET_KC_SCREEN_COLL_PROJECT_SUMMARY = "/data/stats/kcscreencoll/project/summary"; + + /** + * 11、项目分析-按分类统计 + */ + String EPMET_KC_SCREEN_COLL_PROJECT_CATEGORY_SUMMARY = "/data/stats/kcscreencoll/project/categorysummary"; + + /** + * 12、项目分析-满意度分析 + */ + String EPMET_KC_SCREEN_COLL_PROJECT_STATISTIC_ANALYSIS = "/data/stats/kcscreencoll/project/satisanalysis"; + + /** + * 13、党建声音-新闻各类总数汇总 + */ + String EPMET_KC_SCREEN_COLL_NEWS_SUMMARY = "/data/stats/kcscreencoll/news/summary"; + + /** + * 14、党建声音-新闻阅读参与趋势 + */ + String EPMET_KC_SCREEN_COLL_NEWS_TREND = "/data/stats/kcscreencoll/news/trend"; + + /** + * 15、党建声音-热度新闻排行 + */ + String EPMET_KC_SCREEN_COLL_NEWS_HOT_RANK = "/data/stats/kcscreencoll/news/hotrank"; + + /** + * 16、党建声音-新闻按类别统计 + */ + String EPMET_KC_SCREEN_COLL_NEWS_CATEGORY_ANALYSIS = "/data/stats/kcscreencoll/news/categoryanalysis"; + + /** + * 17、邻里党群-各类总数汇总 + */ + String EPMET_KC_SCREEN_COLL_GROUP_SUMMARY = "/data/stats/kcscreencoll/group/summary"; + + /** + * 18、邻里党群-小组详情 + */ + String EPMET_KC_SCREEN_COLL_GROUP_DETAIL = "/data/stats/kcscreencoll/group/detail"; + + /** + * 19、邻里党群-话题参与趋势 + */ + String EPMET_KC_SCREEN_COLL_GROUP_TOPIC_TREND = "/data/stats/kcscreencoll/group/topictrend"; + + /** + * 09、党建引领|基层治理-居民（党员）积分排行榜 + */ + String EPMET_KC_SCREEN_COLL_PARTY_USER_RANK_DATA = "/data/stats/screencoll/partyuserrankdata"; + + /** + * 01、党建能力-党员相关指标上报 + */ + String EPMET_INDEX_COLLECT_GRID_PARTY_MEMBER_DATA = "/data/stats/indexcollect/gridpartymemberdata"; + + /** + * 02、党建能力-网格相关指标上报 + */ + String EPMET_INDEX_COLLECT_GRID_PARTY_ABILITY = "/data/stats/indexcollect/gridpartyability"; + + /** + * 03、党建能力-区街道及社区相关指标 + */ + String EPMET_INDEX_COLLECT_ORG_PARTY_ABILITY = "/data/stats/indexcollect/orgpartyability"; + + /** + * 04、服务能力-网格相关指标 + */ + String EPMET_INDEX_COLLECT_GRID_SERVICE_ABILITY = "/data/stats/indexcollect/gridserviceability"; + + /** + * 05、服务能力-组织（街道|社区|全区）相关指标 + */ + String EPMET_INDEX_COLLECT_ORG_SERVICE_ABILITY = "/data/stats/indexcollect/orgserviceability"; + + /** + * 06、治理能力-网格相关指标 + */ + String EPMET_INDEX_COLLECT_GRID_GOVERN_ABILITY = "/data/stats/indexcollect/gridgovrnability"; + + /** + * 07、治理能力-区街道及社区相关指标 + */ + String EPMET_INDEX_COLLECT_ORG_GOVERN_ABILITY = "/data/stats/indexcollect/orggovrnability"; + + /** + * 08、治理能力-部门相关指标 + */ + String EPMET_INDEX_COLLECT_DEPT_GOVERN_ABILITY = "/data/stats/indexcollect/deptgovrnability"; + + /** + * 【按月】计算指标数据 + */ + String EPMET_INDEX_CALCULATE_ALL = "/data/stats/indexcalculate/all"; + + /** + * 014、组织层级 + */ + String EPMET_SCREEN_COLL_CUSTOMER_AGENCY = "/data/stats/screencoll/customeragency"; + + /** + * 015、网格信息上传 + */ + String EPMET_SCREEN_COLL_CUSTOMER_GRID = "/data/stats/screencoll/customergrid"; + + /** + * 016、部门信息上传 + */ + String EPMET_SCREEN_COLL_CUSTOMER_DEPT = "/data/stats/screencoll/customerdept"; + + /** + * 行政地区编码查询 + */ + String EPMET_SCREEN_COLL_DEPT_CODE = "/data/report/screen/agency/areacodedict"; + + + /** + * 行政地区编码查询 - 锦水街道 + */ + String DEPT_CODE_KCZ = "370124"; + + + /** + * 接口请求头 + */ + String HEARD_KEY_AUTHORIZATION = "Authorization"; + + /** + * 接口请求头 + */ + String HEARD_KEY_ACCESS_TOKEN = "AccessToken"; + + /** + * 接口请求头 + */ + String HEARD_KEY_APP_ID = "AppId"; + + /** + * AccessToken key：客户ID + */ + String ACCESS_TOKEN_KEY_CUSTOMER_ID = "customerId"; + + /** + * AccessToken key：应用ID + */ + String ACCESS_TOKEN_KEY_APP_ID = "appId"; + + /** + * AccessToken key：时间戳 + */ + String ACCESS_TOKEN_KEY_TS = "ts"; +} diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java index 932234e6..a3183463 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java @@ -44,4 +44,6 @@ public interface NumConstant { String SIX_STR = "6"; String SEVEN_STR = "7"; + int TWO_HUNDRED = 200; + } diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java index 23637390..1bdedbbc 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java @@ -254,4 +254,15 @@ public class RedisKeys { public static String getPhraseListKey() { return rootPrefix.concat("heart:phrase:list"); } + + /*** + * 部门编码所有孔村层级关系 + * @param + * @return java.lang.String + * @author qushutong + * @date 2019/12/13 15:03 + */ + public static String getAllDeptCodeOptionKey() { + return rootPrefix.concat("options:dept:code:js"); + } } diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml index 7cd48e8d..411f2a7a 100644 --- a/esua-epdc/epdc-gateway/src/main/resources/application.yml +++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml @@ -270,7 +270,7 @@ renren: - /api/work/*/swagger/** - /api/residentConfig/getResidentConfig #获取居民端配置 - /api/screenPopulationInfo/** #获取居民端配置 - + - /analysis/admin/getDeptCode #获取组织结构编码 workUrls: - /api/work/** #工作端接口 - /api/analysis/** #数据端接口 @@ -300,3 +300,4 @@ epdc: - /cloudAnalysis/** #数据端接口 - /api/residentConfig/getResidentConfig #获取居民端配置 - /api/screenPopulationInfo/** #获取居民端配置 + - /analysis/admin/getDeptCode #获取组织结构编码 diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java new file mode 100644 index 00000000..351ec1ec --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.dto.admin; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author songyunpeng + * @Description 获取行政区域编码参数 + * @create 2021-01-07 + */ +@Data +public class DeptCodeFormDTO implements Serializable { + + /** + * 部门区域编码 + */ + private String rootAreaCode; + + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeTree.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeTree.java new file mode 100644 index 00000000..363e62aa --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeTree.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.dto.admin; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author songyunpeng + * @Description + * @create 2021-01-07 + */ +@Data +public class DeptCodeTree implements Serializable { + + /** + * 部门区域编码 + */ + private String code; + + /** + * 名称 + */ + private String name; + + /** + * 下一级 + */ + private List children; + + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml index 6adfecdf..064f13f5 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml @@ -136,6 +136,8 @@ 47.105.119.155:8848 1da17390-6495-4e16-9ec6-0b8ece18a4a0 + https://epmet-dev.elinkservice.cn/api + @@ -158,6 +160,8 @@ 47.105.119.155:8848 47.105.119.155 1da17390-6495-4e16-9ec6-0b8ece18a4a0 + https://epmet-dev.elinkservice.cn/api + @@ -179,6 +183,8 @@ 172.16.0.7:10000,172.16.0.7:10001 172.16.0.8 + https://epmet-open.elinkservice.cn/api + diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java new file mode 100644 index 00000000..cc7f693f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java @@ -0,0 +1,46 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + * + * https://www.renren.io + * + * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc.jwt; + +import com.elink.esua.epdc.properties.EpmetProperties; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Map; + +/** + * Jwt工具类 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Component +public class JwtUtils { + + @Autowired + private EpmetProperties epmetProperties; + + /** + * 生成上报接口accessToken + * + * @param claims + * @return java.lang.String + * @author Liuchuang + * @since 2020/9/7 14:11 + */ + public String getEpmetAccessToken(Map claims){ + return Jwts.builder() + .setHeaderParam("typ", "JWT") + .setClaims(claims) + .signWith(SignatureAlgorithm.HS512, epmetProperties.getSecret()) + .compact(); + } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/controller/AdminAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/controller/AdminAnalysisController.java new file mode 100644 index 00000000..c62d3d6b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/controller/AdminAnalysisController.java @@ -0,0 +1,38 @@ +package com.elink.esua.epdc.modules.admin.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO; +import com.elink.esua.epdc.dto.epdc.DeptCodeOption; +import com.elink.esua.epdc.modules.admin.service.AdminAnalysisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description admin相关 + * @Author songyunpeng + * @Date 2020/2/10 16:06 + */ +@RestController +@RequestMapping("admin") +public class AdminAnalysisController { + + @Autowired + private AdminAnalysisService adminAnalysisService; + + /** + * @Description 获取组织机构编码 + * @Author songyunpeng + * @Date 2021/1/7 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @GetMapping("getDeptCode") + public Result getDeptCode(@RequestBody DeptCodeFormDTO deptCodeFormDTO){ + DeptCodeOption deptCodeOption = adminAnalysisService.getDeptCode(deptCodeFormDTO); + return new Result().ok(deptCodeOption); + } + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/AdminAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/AdminAnalysisService.java new file mode 100644 index 00000000..3f1edf4a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/AdminAnalysisService.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.modules.admin.service; + +import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO; +import com.elink.esua.epdc.dto.epdc.DeptCodeOption; + +/** + * @Description admin相关 + * @Author songyunpeng + * @Date 2020/2/10 16:06 + */ +public interface AdminAnalysisService { + /** + * @Description 获取组织机构编码 + * @Author songyunpeng + * @Date 2021/1/7 + * @Param [] + * @return java.lang.String + **/ + DeptCodeOption getDeptCode(DeptCodeFormDTO deptCodeFormDTO); +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java new file mode 100644 index 00000000..c4b6f851 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/admin/service/impl/AdminAnalysisServiceImpl.java @@ -0,0 +1,47 @@ +package com.elink.esua.epdc.modules.admin.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.EpmetConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.admin.DeptCodeFormDTO; +import com.elink.esua.epdc.dto.admin.DeptCodeTree; +import com.elink.esua.epdc.dto.epdc.DeptCodeOption; +import com.elink.esua.epdc.dto.issue.result.IssueResultDTO; +import com.elink.esua.epdc.modules.admin.service.AdminAnalysisService; +import com.elink.esua.epdc.modules.issue.dao.IssueAnalysisDao; +import com.elink.esua.epdc.utils.EpmetUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description admin相关 + * @Author songyunpeng + * @Date 2020/2/10 16:06 + */ +@Service +public class AdminAnalysisServiceImpl extends BaseServiceImpl implements AdminAnalysisService { + + @Autowired + private EpmetUtils epmetUtils; + + + @Override + public DeptCodeOption getDeptCode(DeptCodeFormDTO deptCodeFormDTO) { + String dataResult = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_COLL_DEPT_CODE, JSONObject.toJSONString(deptCodeFormDTO)); + JSONObject jsonObject = JSONObject.parseObject(dataResult); + Result deptCodeTreeResult = JSON.toJavaObject(jsonObject, Result.class ); + if(deptCodeTreeResult!=null && deptCodeTreeResult.getData()!=null){ + List deptCodeTreeList = JSONArray.parseArray(JSONObject.toJSONString(deptCodeTreeResult.getData()), DeptCodeTree.class); + DeptCodeOption deptCodeOption = new DeptCodeOption(); + deptCodeOption.setOptions(deptCodeTreeList); + return deptCodeOption; + } + return new DeptCodeOption(); + } + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/properties/EpmetProperties.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/properties/EpmetProperties.java new file mode 100644 index 00000000..b9723e82 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/properties/EpmetProperties.java @@ -0,0 +1,67 @@ +package com.elink.esua.epdc.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +/** + * 党群e事通接口配置 + * + * @Author：liuchuang + * @Date：2020/8/20 13:22 + */ +@Configuration +@ConfigurationProperties(prefix = "epmet.config") +public class EpmetProperties { + + /** + * 应用ID + */ + private String appId; + + /** + * 接口前缀 + */ + private String url; + + /** + * 生成AccessToken密钥 + */ + private String secret; + + /** + * 客户ID + */ + private String customerId; + + public String getAppId() { + return appId; + } + + public void setAppId(String appId) { + this.appId = appId; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getSecret() { + return secret; + } + + public void setSecret(String secret) { + this.secret = secret; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/EpmetUtils.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/EpmetUtils.java new file mode 100644 index 00000000..360589cb --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/EpmetUtils.java @@ -0,0 +1,88 @@ +package com.elink.esua.epdc.utils; + +import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpResponse; +import com.alibaba.fastjson.JSONObject; +import com.elink.esua.epdc.commons.tools.constant.EpmetConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; +import com.elink.esua.epdc.jwt.JwtUtils; +import com.elink.esua.epdc.properties.EpmetProperties; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.HashMap; +import java.util.Map; + +@Component +public class EpmetUtils { + + private final Logger logger = LogManager.getLogger(getClass()); + + @Autowired + private EpmetProperties epmetProperties; + + @Autowired + private JwtUtils jwtUtils; + + /** + * 大屏数据上报 + * + * @param urlSuffix 接口地址后缀 + * @param param 入参 + * @return java.lang.String + * @author Liuchuang + * @since 2020/9/7 14:07 + */ + public String httpPost(String urlSuffix,String param) { + + String code = "code"; + + // 应用ID + String appId = epmetProperties.getAppId(); + // 生成AccessToken + String accessToken = getEpmetAccessToken(); + // 接口地址 + String url = epmetProperties.getUrl().concat(urlSuffix); + HttpResponse response = null; + try { + response = HttpRequest.post(url).body(param) + .header(EpmetConstant.HEARD_KEY_ACCESS_TOKEN, accessToken) + .header(EpmetConstant.HEARD_KEY_APP_ID, appId) + .header("lan", "zh") + .header("Content-Type", "application/json") + .header("Date-Type","real") + .execute(); + if (NumConstant.TWO_HUNDRED != response.getStatus()) { + logger.error("数据上报失败, 返回状态：{}, 请求参数：{appId:{}, url:{}, accessToken:{}, param:{}}", + response.getStatus(), appId, url, accessToken, param); + } else { + JSONObject result = JSONObject.parseObject(response.body()); + if (!NumConstant.ZERO_STR.equals(result.get(code).toString())) { + logger.info("数据上报失败：{}，请求地址：{}，请求参数：{}", JSONObject.toJSONString(response.body()), url, param); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return response.body(); + + } + + /** + * 生成上报接口accessToken + * + * @return java.lang.String + * @author Liuchuang + * @since 2020/9/7 14:15 + */ + private String getEpmetAccessToken (){ + Map accessTokenMap = new HashMap<>(3); + accessTokenMap.put(EpmetConstant.ACCESS_TOKEN_KEY_CUSTOMER_ID, epmetProperties.getCustomerId()); + accessTokenMap.put(EpmetConstant.ACCESS_TOKEN_KEY_APP_ID, epmetProperties.getAppId()); + accessTokenMap.put(EpmetConstant.ACCESS_TOKEN_KEY_TS, System.currentTimeMillis()); + + return jwtUtils.getEpmetAccessToken(accessTokenMap); + } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml index 717a8fdb..16cef330 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml @@ -5,51 +5,51 @@ spring: druid: first: #数据源1 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 second: #数据源2 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_api?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 third: #数据源3 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_custom?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 fourth: #数据源4 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 fifth: #数据源5 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 sixth: #数据源6 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 seventh: #数据源7 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_kpi?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 eighth: #数据源8 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_mutuality?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 ninth: #数据源9 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_news?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 tenth: #数据源10 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_points?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 eleventh: #数据源11 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 twelve: #数据源12 url: jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_analysis?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: jinshui + username: jinshui_epdc_test password: jinshui@833066 initial-size: 10 max-active: 100 @@ -73,3 +73,9 @@ spring: wall: config: multi-statement-allow: true +epmet: + config: + secret: 0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e + appId: d44a6daaea58be408bb74fe93714710f + customerId: f5ff0770f409981c73adda6ae35143ef + url: @epmet.url@ diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml index 6d9110b3..d6e0c72f 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml @@ -71,4 +71,10 @@ spring: merge-sql: false wall: config: - multi-statement-allow: true \ No newline at end of file + multi-statement-allow: true +epmet: + config: + secret: 0f2ad2929f1e4f778dc1e90a64d154e572af864ea0eb4d73be56480f0af34ba1 + appId: f257a3497224ae078af12966b068a81c + customerId: 44876154d10d7cb7affd92000f84f833 + url: @epmet.url@ \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml index ddb63045..f8d89f67 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml @@ -73,3 +73,9 @@ spring: wall: config: multi-statement-allow: true +epmet: + config: + secret: 0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e + appId: d44a6daaea58be408bb74fe93714710f + customerId: f5ff0770f409981c73adda6ae35143ef + url: @epmet.url@ \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml index 954ebb6d..f324f2cc 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml @@ -62,3 +62,4 @@ mybatis-plus: map-underscore-to-camel-case: true cache-enabled: false call-setters-on-nulls: true + From 9a2b5aec1bcc8fa12ddd2dff61400d481ebc71f1 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 13 Jan 2021 14:05:01 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/SysDeptServiceImpl.java | 3 ++- .../esua/epdc/commons/tools/constant/EpmetConstant.java | 8 ++++++-- .../com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java | 5 +++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 9da8936b..2c75e71b 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -926,7 +926,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl deptCodeResult = analysisFeignClient.getDeptCode(deptCodeFormDTO); if(deptCodeResult.getData()!=null){ DeptCodeOption deptCodeOption = deptCodeResult.getData(); diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java index a0372101..33a4519d 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java @@ -175,9 +175,13 @@ public interface EpmetConstant { /** - * 行政地区编码查询 - 锦水街道 + * 行政地区编码查询 - 平阴县 */ - String DEPT_CODE_KCZ = "370124"; + String DEPT_CODE_PY = "370124"; + /** + * 行政地区编码查询 - 省级:province; 市级: city; 区县级: district ;乡（镇、街道）级:street ;社区级：community + */ + String DEPT_CODE_LEVEL_PY = "district"; /** diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java index 351ec1ec..aaaa9204 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/admin/DeptCodeFormDTO.java @@ -17,6 +17,11 @@ public class DeptCodeFormDTO implements Serializable { */ private String rootAreaCode; + /** + * 部门区域级别 + */ + private String rootAreaLevel; + } From 6096432f21530e7acd1f062cb4bb6b414e771af1 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 13 Jan 2021 14:31:41 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=B7=A1?= =?UTF-8?q?=E6=A3=80bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ModuleCategoryDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml index 09cb807a..82cb89f6 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml @@ -72,8 +72,8 @@ select CONCAT(PIDS,',',ID) from epdc_module_category - where CATEGORY_CODE = #{noticeCategoryCode} - + where CATEGORY_CODE = #{noticeCategoryCode} and DEL_FLAG = '0' limit 1 +