From d906993c577d03597c73f494bddf100e95596f90 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 24 Aug 2021 10:50:30 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=90=8D=E4=B8=8E=E6=88=91=E6=94=B6=E5=88=B0?= =?UTF-8?q?=E7=9A=84key=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/dto/message/result/InfoDetailResDTO.java | 2 +- .../service/epmetmessage/impl/EpmetMessageServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/InfoDetailResDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/InfoDetailResDTO.java index d3b9f34c96..1dc61d381d 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/InfoDetailResDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/InfoDetailResDTO.java @@ -35,7 +35,7 @@ public class InfoDetailResDTO implements Serializable { /** * 发布人2级组织名 */ - private String publishOrgName; + private String publishStaffOrgName; /** * 发布人性别 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java index 6f66a145a5..21c7fa9589 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java @@ -258,7 +258,7 @@ public class EpmetMessageServiceImpl implements EpmetMessageService { if(StringUtils.isNotBlank(resDTO.getPublishStaffId())){ CustomerStaffInfoCacheResult publisher = CustomerStaffRedis.getStaffInfo(infoIdDTO.getCustomerId(), resDTO.getPublishStaffId()); resDTO.setHeadPhoto(StringUtils.isNotBlank(publisher.getHeadPhoto()) ? publisher.getHeadPhoto() : StrConstant.EPMETY_STR); - resDTO.setPublishOrgName(publisher.getTwoOrgName()); + resDTO.setPublishStaffOrgName(publisher.getTwoOrgName()); resDTO.setPublishStaffGender(publisher.getGender().toString()); resDTO.setPublishStaffName(publisher.getRealName()); } From 7b9f9ede9027698daadd37f9757797d847430f7d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 24 Aug 2021 11:06:23 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E5=88=A0=E9=99=A4test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/modules/test/TestController.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java index 6e7c165532..d57eba9d90 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/test/TestController.java @@ -2,7 +2,6 @@ package com.epmet.modules.test; import com.epmet.commons.tools.utils.HttpContextUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.TestFormDTO; import com.epmet.feign.OssFeignClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -33,11 +32,5 @@ public class TestController { return new Result(); } - @PostMapping("test-ribbon-sender") - public Result testRibbonSender() { - TestFormDTO form = new TestFormDTO(40000l); - Result result = ossFeignClient.testRibbonRcv(form); - return result; - } } From 22530cdbdb2b635a963bc9e22d4e46bc9cc4c359 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 24 Aug 2021 14:23:11 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmetmessage/impl/EpmetMessageServiceImpl.java | 11 +++++++---- .../service/epmetuser/impl/EpmetUserServiceImpl.java | 5 ++++- .../mapper/govorg/CustomerStaffAgencyDao.xml | 2 +- .../java/com/epmet/service/impl/StaffServiceImpl.java | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java index 21c7fa9589..4f7c8b3117 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetmessage/impl/EpmetMessageServiceImpl.java @@ -79,10 +79,13 @@ public class EpmetMessageServiceImpl implements EpmetMessageService { dto.setStaffId(item.getStaffId()); dto.setReadFlag(item.getReadFlag()); CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(item.getCustomerId(), item.getStaffId()); - dto.setStaffName(staffInfoCache.getRealName()); - dto.setGender(staffInfoCache.getGender()); - dto.setHeadPhoto(staffInfoCache.getHeadPhoto()); - dto.setOrgName(staffInfoCache.getTwoOrgName()); + if (null != staffInfoCache) { + dto.setStaffName(staffInfoCache.getRealName()); + dto.setGender(staffInfoCache.getGender()); + dto.setHeadPhoto(staffInfoCache.getHeadPhoto()); + dto.setOrgName(staffInfoCache.getTwoOrgName()); + } + return dto; }).collect(Collectors.toList()); result.setDataList(dataList); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 8806232b47..84cc6ea127 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -483,9 +483,12 @@ public class EpmetUserServiceImpl implements EpmetUserService { } return staffRoleList.stream().map(item -> { RoleUsersResultDTO dto = new RoleUsersResultDTO(); - dto.setStaffId(item.getStaffId()); //从redis获取用户信息 CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(item.getCustomerId(), item.getStaffId()); + if (null == staffInfoCache) { + return null; + } + dto.setStaffId(item.getStaffId()); dto.setGender(staffInfoCache.getGender()); dto.setHeadPhoto(staffInfoCache.getHeadPhoto()); dto.setName(staffInfoCache.getRealName()); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml index 29da78941d..e41789ecf6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml @@ -100,7 +100,7 @@ customer_agency ca LEFT JOIN ( SELECT - a.PIDS, + CONCAT( a.PIDS,':',a.ID) AS PIDS, b.USER_ID FROM customer_agency a diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index b6dd8c9de8..043694e0f7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -426,7 +426,7 @@ public class StaffServiceImpl implements StaffService { String key = RedisKeys.getCpUserKey("gov", "wxmp", fromDTO.getStaffId()); redisUtils.delete(key); //10 清除工作人员缓存 - customerStaffRedis.delStaffInfoFormCache(tokenDto.getCustomerId(), fromDTO.getStaffId()); + CustomerStaffRedis.delStaffInfoFormCache(tokenDto.getCustomerId(), fromDTO.getStaffId()); } /** From 097b92c67448772c869cd739504d3491915266fa Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 24 Aug 2021 16:05:00 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E8=A1=A5=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/FactOriginProjectCategoryDailyDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml index 2a466396bd..a33bda9bed 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectCategoryDailyDao.xml @@ -91,6 +91,7 @@ UNION ALL SELECT c.CUSTOMER_ID, + c.CUSTOMER_ID AS categoryOriginCustomerId, left(c.CATEGORY_CODE, 4) AS CATEGORY_CODE, '1' AS `LEVEL`, p.AGENCY_ID AS orgId, From 3fe62f4a70e1a96f3d938c8a5bed984af7c64f13 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 24 Aug 2021 17:22:42 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E9=94=99=E8=AF=AF=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/TagCustomerDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml index 183eb8317f..83ed4289ad 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/TagCustomerDao.xml @@ -31,7 +31,7 @@ VALUES ( - #{tag.id},#{tag.customerId}, #{tag.tagName}, #{tag.tagColor} #{tag.useCount}, #{tag.delFlag}, #{tag.revision}, #{tag.createdBy}, NOW(), #{tag.updatedBy}, NOW() + #{tag.id},#{tag.customerId}, #{tag.tagName}, #{tag.tagColor}, #{tag.useCount}, #{tag.delFlag}, #{tag.revision}, #{tag.createdBy}, NOW(), #{tag.updatedBy}, NOW() ) ON DUPLICATE KEY UPDATE From 3b2ede54cf4e2e3858553fdd3bc3636814dfb5ae Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 25 Aug 2021 11:08:00 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E7=BE=A4=E7=BB=84=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E8=BF=94=E5=9B=9EstaffNum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dto/message/result/MyInfoGroupResultDTO.java | 2 +- .../main/resources/mapper/epmetmessage/InfoReceiversDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/MyInfoGroupResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/MyInfoGroupResultDTO.java index 4e4c89b2d0..302ab42e37 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/MyInfoGroupResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/message/result/MyInfoGroupResultDTO.java @@ -16,7 +16,7 @@ public class MyInfoGroupResultDTO implements Serializable { private static final long serialVersionUID = 3621868560778309056L; private String receiverGroupId; private String name; - private Integer totalMem; + private Integer staffNum; @JsonIgnore private List staffIdList; private List staffNameList; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml index bea01703dc..7a8116f3bc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml @@ -6,7 +6,7 @@ - + @@ -16,7 +16,7 @@ SELECT irg.ID as receiverGroupId, irg.`NAME` as name, - ( SELECT count( igr.id ) FROM info_group_receivers igr WHERE igr.DEL_FLAG = '0' AND igr.info_receiver_group_id = irg.id ) AS totalMem, + ( SELECT count( igr.id ) FROM info_group_receivers igr WHERE igr.DEL_FLAG = '0' AND igr.info_receiver_group_id = irg.id ) AS staffNum, igr.STAFF_ID as staffId FROM info_receiver_group irg From 95f4437f2e24171e15dbd76b79cd29ecd711a380 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 25 Aug 2021 11:16:47 +0800 Subject: [PATCH 07/20] zadiule --- .../src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml index 7a8116f3bc..083bcd133f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetmessage/InfoReceiversDao.xml @@ -23,7 +23,7 @@ left join info_group_receivers igr on(irg.id=igr.info_receiver_group_id and igr.DEL_FLAG='0') WHERE - + irg.del_flag='0' AND irg.CREATE_STAFF_ID = #{staffId} AND irg.CUSTOMER_ID = #{customerId} From ec4388df6c7287e57a20fea9b1b8367bb06f9105 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 25 Aug 2021 13:46:37 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B715?= =?UTF-8?q?=E4=BD=8D=E6=8F=90=E5=8F=96=E7=94=9F=E6=97=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/partymember/PartyMemberDao.xml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/partymember/PartyMemberDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/partymember/PartyMemberDao.xml index 1a6a74ddd4..59933198f7 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/partymember/PartyMemberDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/partymember/PartyMemberDao.xml @@ -10,14 +10,18 @@ GRID_ID, USER_ID, ID_CARD, - STR_TO_DATE( SUBSTRING( ID_CARD, 7, 8 ),'%Y%m%d') AS birthday + ( + case when LENGTH(ID_CARD)=15 then STR_TO_DATE( concat('19',SUBSTRING( ID_CARD, 7, 6 )),'%Y%m%d') + else STR_TO_DATE( SUBSTRING( ID_CARD, 7, 8 ),'%Y%m%d') + end + )as birthday FROM partymember_info WHERE DEL_FLAG = 0 - AND ( CONFIRM_RESULT = 'auto_confirm_success' OR CONFIRM_RESULT = 'approved' ) - AND CUSTOMER_ID = #{customerId} - AND DATE_FORMAT( UPDATED_TIME, '%Y%m%d' ) = #{dateId} + AND ( CONFIRM_RESULT = 'auto_confirm_success' OR CONFIRM_RESULT = 'approved' ) + AND CUSTOMER_ID = #{customerId} + AND DATE_FORMAT( UPDATED_TIME, '%Y%m%d' ) = #{dateId} @@ -43,6 +55,37 @@ LIMIT #{pageNo}, #{pageSize} + + + + + + + + \ No newline at end of file From b88945f19bde79a5d47241f4d572a26d83ce0ff2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 25 Aug 2021 16:39:23 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E5=B7=A1?= =?UTF-8?q?=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GridManagerListYuShanResultDTO.java | 94 +++++++++++++++++++ .../user/StaffPatrolDetailController.java | 13 +++ .../user/StaffPatrolDetailService.java | 9 ++ .../impl/StaffPatrolDetailServiceImpl.java | 29 ++++++ .../mapper/screen/ScreenCustomerAgencyDao.xml | 2 +- 5 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListYuShanResultDTO.java diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListYuShanResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListYuShanResultDTO.java new file mode 100644 index 0000000000..51ab6b798a --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListYuShanResultDTO.java @@ -0,0 +1,94 @@ +package com.epmet.user.result; + +import com.epmet.commons.tools.constant.NumConstant; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2021/6/7 2:57 下午 + * @DESC + */ +@Data +public class GridManagerListYuShanResultDTO implements Serializable { + + private static final long serialVersionUID = -2770911125810373090L; + + /** + * 工作人员id + */ + private String staffId; + + /** + * 工作人员手机号 + */ + private String mobile; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 网格ID + */ + private String gridId; + + /** + * 正在巡查：patrolling；否则返回空字符串 + */ + private String status; + + /** + * 网格名称，最多显示上两级 + */ + private String gridName; + + /** + * 姓名 + */ + private String staffName; + + /** + * 巡查时长 + */ + private Integer patrolDuration; + + /** + * 巡查次数 + */ + private Integer patrolCount; + + /** + * 中心点位 + */ + @JsonIgnore + private String centerMark; + + /** + * 经纬度赋值状态 + */ + @JsonIgnore + private Boolean llStatus; + + public GridManagerListYuShanResultDTO() { + this.staffId = ""; + this.longitude = ""; + this.latitude = ""; + this.gridId = ""; + this.status = ""; + this.gridName = ""; + this.staffName = ""; + this.centerMark = ""; + this.llStatus = false; + this.patrolDuration = NumConstant.ZERO; + this.patrolCount = NumConstant.ZERO; + } +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java index e20e1e7d5c..5901ada344 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java @@ -11,6 +11,7 @@ import com.epmet.user.result.GridManagerListResultDTO; import com.epmet.dto.result.PatrolTrackResultDTO; import com.epmet.dto.result.RecordListResultDTO; import com.epmet.dto.result.PatrolCountResultDTO; +import com.epmet.user.result.GridManagerListYuShanResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -77,4 +78,16 @@ public class StaffPatrolDetailController { return new Result().ok(staffPatrolService.patrolCount(formDTO)); } + /** + * @Description 网格员分布-榆山 + * @Param formDTO + * @author zxc + * @date 2021/8/25 3:00 下午 + */ + @PostMapping("gridmanagerlist-yushan") + public Result> gridManagerListYuShan(@RequestBody GridManagerListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, GridManagerListFormDTO.GridManagerListForm.class); + return new Result>().ok(staffPatrolService.gridManagerListYuShan(formDTO)); + } + } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java index 95fc1eb064..41c1e3278c 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java @@ -8,6 +8,7 @@ import com.epmet.user.result.GridManagerListResultDTO; import com.epmet.dto.result.PatrolTrackResultDTO; import com.epmet.dto.result.RecordListResultDTO; import com.epmet.dto.result.PatrolCountResultDTO; +import com.epmet.user.result.GridManagerListYuShanResultDTO; import java.util.List; @@ -27,6 +28,14 @@ public interface StaffPatrolDetailService{ */ List gridManagerList(GridManagerListFormDTO formDTO); + /** + * @Description 网格员分布-榆山 + * @Param formDTO + * @author zxc + * @date 2021/8/25 3:00 下午 + */ + List gridManagerListYuShan(GridManagerListFormDTO formDTO); + /** * @Description 002、查看巡查记录 * @Param formDTO diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java index 6f01a162ac..48a11334e2 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java @@ -19,6 +19,7 @@ import com.epmet.dto.form.RecordListFormDTO; import com.epmet.dto.form.PatrolCountFormDTO; import com.epmet.user.result.GridManagerListResultDTO; import com.epmet.dto.result.PatrolCountResultDTO; +import com.epmet.user.result.GridManagerListYuShanResultDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -136,6 +137,34 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService { return result; } + /** + * @Description 网格员分布-榆山 + * @Param formDTO + * @author zxc + * @date 2021/8/25 3:00 下午 + */ + @Override + public List gridManagerListYuShan(GridManagerListFormDTO formDTO) { + List resultTwo = this.gridManagerList(formDTO); + List result = ConvertUtils.sourceToTarget(resultTwo, GridManagerListYuShanResultDTO.class); + Result> listResult = epmetUserOpenFeignClient.patrolInfo(formDTO.getAgencyId()); + if (!listResult.success()){ + throw new RenException("查询巡查次数和时长失败"); + } + List data = listResult.getData(); + if (!CollectionUtils.isEmpty(data)){ + result.forEach(r -> { + data.forEach(d -> { + if (r.getGridId().equals(d.getGridId()) && r.getStaffId().equals(d.getStaffId())){ + r.setPatrolCount(d.getPatrolCount()); + r.setPatrolDuration(d.getPatrolDuration()); + } + }); + }); + } + return result; + } + /** * @Description 根据中心点位截取经纬度 * @Param centMark diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml index f0e65a8bd1..3e058e209a 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml @@ -341,7 +341,7 @@ AND cg.AREA_CODE LIKE CONCAT(#{areaCode},'%') - AND cg.ALL_PARENT_IDS LIKE CONCAT(#{agencyId}, '%') + AND cg.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId}, '%') From a0471f2e63a969ad50272738ba25616dc2a2a887 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 25 Aug 2021 18:05:53 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E6=88=AA=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/InfoServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java index cc73e3c1a5..684b4ebd50 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java @@ -156,8 +156,8 @@ public class InfoServiceImpl extends BaseServiceImpl implem userMessageEntity.setApp(AppClientConstant.APP_GOV); userMessageEntity.setTitle(UserMessageConstans.INFO_TITLE); userMessageEntity.setMessageContent(String.format(UserMessageConstans.INFO_CONTENT_TEMP, - infoEntity.getContent().length() >= NumConstant.FIFTY ? - StringUtils.substring(infoEntity.getContent(), NumConstant.FORTY_NINE) : infoEntity.getContent())); + infoEntity.getContent().length() > NumConstant.FIFTY ? + StringUtils.substring(infoEntity.getContent(), NumConstant.ZERO,NumConstant.FORTY_NINE) : infoEntity.getContent())); userMessageEntity.setReadFlag(UserMessageConstans.UNREAD); userMessageEntity.setMessageType(UserMessageConstans.MESSAGE_TYPE_INFO); userMessageEntity.setTargetId(infoEntity.getId()); @@ -170,7 +170,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem InfoProfileEntity infoProfileEntity=new InfoProfileEntity(); infoProfileEntity.setCustomerId(formDTO.getCustomerId()); infoProfileEntity.setInfoId(infoEntity.getId()); - infoProfileEntity.setContent(infoEntity.getContent().length() >= NumConstant.FIFTY ? StringUtils.substring(infoEntity.getContent(), NumConstant.FORTY_NINE) : infoEntity.getContent()); + infoProfileEntity.setContent(infoEntity.getContent().length() > NumConstant.ONE_HUNDRED ? StringUtils.substring(infoEntity.getContent(), NumConstant.ZERO,NumConstant.NINETY_NINE) : infoEntity.getContent()); infoProfileEntity.setPublishStaffId(formDTO.getUserId()); infoProfileEntity.setTotalReceiver(totalReceiver.size()); infoProfileEntity.setFirstAttId(firstAttId); From 464938733409fa6b934b7c3639059a25400e6dd3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 25 Aug 2021 18:51:36 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E9=81=BF=E5=85=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/InfoController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/InfoController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/InfoController.java index 859db0c3f6..25b0414b59 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/InfoController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/InfoController.java @@ -18,6 +18,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -56,6 +57,7 @@ public class InfoController { * @author yinzuomei * @date 2021/8/19 10:25 上午 */ + @NoRepeatSubmit @PostMapping("send") public Result sendInfo(@LoginUser TokenDto tokenDto, @RequestBody SendInfoFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -91,6 +93,7 @@ public class InfoController { * @author yinzuomei * @date 2021/8/19 5:29 下午 */ + @NoRepeatSubmit @PostMapping("reply-info") public Result replyInfo(@LoginUser TokenDto tokenDto, @RequestBody ReplyInfoFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -127,6 +130,7 @@ public class InfoController { * @author yinzuomei * @date 2021/8/20 9:58 上午 */ + @NoRepeatSubmit @PostMapping("add-receivergroup") public Result addReceiverGroup(@LoginUser TokenDto tokenDto, @RequestBody AddReceiverGroupFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); From 1acf472b3fcbd3fc87340e284cf26a288a915fa0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 26 Aug 2021 10:18:09 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=9C=80=E5=A4=9A=E8=BE=93=E5=85=A5500=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 1 + .../epmet/service/impl/InfoServiceImpl.java | 20 +++++++++++-------- .../migration/V0.3.14__create_info_table.sql | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 3ec318507f..aa74cd8e2a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -107,6 +107,7 @@ public enum EpmetErrorCode { REPLY_INFO_CONTENT_NOT_NULL(8610,"回复内容不能为空"), PLEASE_CHOOSE_MEMBER(8611,"请选择成员"), INFO_GROUP_NAME_EXISTS(8612,"名称已存在"), + INFO_REPLY_CONTENT_LENGTH_LIMIT(8613,"回复内容最多输入500字"), // 爱心互助 居民端 NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"), diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java index 684b4ebd50..87c90c9cc7 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java @@ -17,12 +17,12 @@ package com.epmet.service.impl; -import com.alibaba.fastjson.JSON; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; +import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.Result; @@ -99,7 +99,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem Set orgStaffIds=queryOrgStaffIds(formDTO.getCustomerId(),formDTO.getOrgList()); Set roleStaffIds=queryRoleStaffIds(formDTO.getRoleIdList(),formDTO.getCustomerId()); Set groupStaffIds = CollectionUtils.isNotEmpty(formDTO.getGroupIdList()) ? infoGroupReceiversDao.selectStaffIds(formDTO.getGroupIdList()) : Collections.EMPTY_SET; - log.info("群组选择的人："+JSON.toJSONString(groupStaffIds,true)); + //log.info("群组选择的人："+JSON.toJSONString(groupStaffIds,true)); //3、计算接收人： Set totalReceiver=new LinkedHashSet(); @@ -222,10 +222,14 @@ public class InfoServiceImpl extends BaseServiceImpl implem @Override public ReplyInfoResultDTO replyInfo(ReplyInfoFormDTO formDTO) { //1、插入回复记录、回复附件 - //内容和附件 2选一 + // 2、内容和附件 2选一 if(StringUtils.isBlank(formDTO.getContent())&&CollectionUtils.isEmpty(formDTO.getAttachmentList())){ throw new RenException(EpmetErrorCode.REPLY_INFO_CONTENT_NOT_NULL.getCode(), EpmetErrorCode.REPLY_INFO_CONTENT_NOT_NULL.getMsg()); } + // 3、回复内容不能超过500字 + if(StringUtils.isNotBlank(formDTO.getContent())&&formDTO.getContent().length()>500){ + throw new RenException(EpmetErrorCode.INFO_REPLY_CONTENT_LENGTH_LIMIT.getCode(), EpmetErrorCode.INFO_REPLY_CONTENT_LENGTH_LIMIT.getMsg()); + } InfoReplyEntity infoReplyEntity=new InfoReplyEntity(); infoReplyEntity.setInfoId(formDTO.getInfoId()); infoReplyEntity.setCustomerId(formDTO.getCustomerId()); @@ -353,11 +357,11 @@ public class InfoServiceImpl extends BaseServiceImpl implem OrgStaffFormDTO orgStaffFormDTO=new OrgStaffFormDTO(); orgStaffFormDTO.setCustomerId(customerId); for(OrgCommonDTO org:orgList){ - if("grid".equals(org.getOrgType())){ + if(OrgTypeEnum.GRID.getCode().equals(org.getOrgType())){ orgStaffFormDTO.getGridIds().add(org.getOrgId()); - }else if("agency".equals(org.getOrgType())){ + }else if(OrgTypeEnum.AGENCY.getCode().equals(org.getOrgType())){ orgStaffFormDTO.getAgencyIds().add(org.getOrgId()); - }else if("dept".equals(org.getOrgType())){ + }else if(OrgTypeEnum.DEPT.getCode().equals(org.getOrgType())){ orgStaffFormDTO.getDeptIds().add(org.getOrgId()); } } @@ -366,7 +370,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem throw new RenException("根据组织查询工作人员异常"); } if(CollectionUtils.isEmpty(result.getData())){ - log.info("已选择的架构里没有工作人员"); + log.warn("已选择的架构里没有工作人员"); return Collections.EMPTY_SET; } return result.getData(); @@ -393,7 +397,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem throw new RenException("根据角色查询工作人员异常"); } if(CollectionUtils.isEmpty(result.getData())){ - log.info("角色下没有工作人员"); + log.warn("角色下没有工作人员"); return Collections.EMPTY_SET; } return result.getData(); diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql index 820e8ca67c..d13a3e6de3 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql @@ -127,7 +127,7 @@ CREATE TABLE `info_reply_content` ( `ATTACHMENT_NAME` varchar(64) DEFAULT NULL COMMENT '附件名', `ATTACHMENT_FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）', `REPLY_TYPE` varchar(64) NOT NULL COMMENT '回复的类型（文本-text、图片 - image、 视频 - video、 语音 - voice、 文档 - doc））', - `CONTENT` varchar(255) NOT NULL COMMENT '如果是文本对应的是文字，如果是其他类型，对应的是url', + `CONTENT` varchar(512) NOT NULL COMMENT '如果是文本对应的是文字，如果是其他类型，对应的是url', `SORT` int(1) NOT NULL COMMENT '排序字段', `ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小，单位b', `DURATION` int(11) unsigned DEFAULT '0' COMMENT '语音或视频时长，秒', From 78f90a702642ff11253f4f14077091bb856ec441 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 26 Aug 2021 10:24:47 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=9C=80=E5=A4=9A=E8=BE=93=E5=85=A5500=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 1 + .../epmet/service/impl/InfoServiceImpl.java | 40 ++++++++++--------- .../migration/V0.3.14__create_info_table.sql | 2 +- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 3ec318507f..aa74cd8e2a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -107,6 +107,7 @@ public enum EpmetErrorCode { REPLY_INFO_CONTENT_NOT_NULL(8610,"回复内容不能为空"), PLEASE_CHOOSE_MEMBER(8611,"请选择成员"), INFO_GROUP_NAME_EXISTS(8612,"名称已存在"), + INFO_REPLY_CONTENT_LENGTH_LIMIT(8613,"回复内容最多输入500字"), // 爱心互助 居民端 NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"), diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java index 684b4ebd50..ba3712ccca 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/InfoServiceImpl.java @@ -17,12 +17,12 @@ package com.epmet.service.impl; -import com.alibaba.fastjson.JSON; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; +import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.Result; @@ -99,7 +99,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem Set orgStaffIds=queryOrgStaffIds(formDTO.getCustomerId(),formDTO.getOrgList()); Set roleStaffIds=queryRoleStaffIds(formDTO.getRoleIdList(),formDTO.getCustomerId()); Set groupStaffIds = CollectionUtils.isNotEmpty(formDTO.getGroupIdList()) ? infoGroupReceiversDao.selectStaffIds(formDTO.getGroupIdList()) : Collections.EMPTY_SET; - log.info("群组选择的人："+JSON.toJSONString(groupStaffIds,true)); + //log.info("群组选择的人："+JSON.toJSONString(groupStaffIds,true)); //3、计算接收人： Set totalReceiver=new LinkedHashSet(); @@ -157,7 +157,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem userMessageEntity.setTitle(UserMessageConstans.INFO_TITLE); userMessageEntity.setMessageContent(String.format(UserMessageConstans.INFO_CONTENT_TEMP, infoEntity.getContent().length() > NumConstant.FIFTY ? - StringUtils.substring(infoEntity.getContent(), NumConstant.ZERO,NumConstant.FORTY_NINE) : infoEntity.getContent())); + StringUtils.substring(infoEntity.getContent(), NumConstant.ZERO,NumConstant.FORTY_NINE) : infoEntity.getContent())); userMessageEntity.setReadFlag(UserMessageConstans.UNREAD); userMessageEntity.setMessageType(UserMessageConstans.MESSAGE_TYPE_INFO); userMessageEntity.setTargetId(infoEntity.getId()); @@ -222,10 +222,14 @@ public class InfoServiceImpl extends BaseServiceImpl implem @Override public ReplyInfoResultDTO replyInfo(ReplyInfoFormDTO formDTO) { //1、插入回复记录、回复附件 - //内容和附件 2选一 + // 2、内容和附件 2选一 if(StringUtils.isBlank(formDTO.getContent())&&CollectionUtils.isEmpty(formDTO.getAttachmentList())){ throw new RenException(EpmetErrorCode.REPLY_INFO_CONTENT_NOT_NULL.getCode(), EpmetErrorCode.REPLY_INFO_CONTENT_NOT_NULL.getMsg()); } + // 3、回复内容不能超过500字 + if(StringUtils.isNotBlank(formDTO.getContent())&&formDTO.getContent().length()>500){ + throw new RenException(EpmetErrorCode.INFO_REPLY_CONTENT_LENGTH_LIMIT.getCode(), EpmetErrorCode.INFO_REPLY_CONTENT_LENGTH_LIMIT.getMsg()); + } InfoReplyEntity infoReplyEntity=new InfoReplyEntity(); infoReplyEntity.setInfoId(formDTO.getInfoId()); infoReplyEntity.setCustomerId(formDTO.getCustomerId()); @@ -233,14 +237,14 @@ public class InfoServiceImpl extends BaseServiceImpl implem infoReplyDao.insert(infoReplyEntity); int sort=1; if(StringUtils.isNotBlank(formDTO.getContent())){ - InfoReplyContentEntity contentEntity=new InfoReplyContentEntity(); - contentEntity.setCustomerId(formDTO.getCustomerId()); - contentEntity.setInfoReplyId(infoReplyEntity.getId()); - contentEntity.setReplyType("text"); - contentEntity.setContent(formDTO.getContent()); - contentEntity.setSort(sort); - infoReplyContentDao.insert(contentEntity); - sort++; + InfoReplyContentEntity contentEntity=new InfoReplyContentEntity(); + contentEntity.setCustomerId(formDTO.getCustomerId()); + contentEntity.setInfoReplyId(infoReplyEntity.getId()); + contentEntity.setReplyType("text"); + contentEntity.setContent(formDTO.getContent()); + contentEntity.setSort(sort); + infoReplyContentDao.insert(contentEntity); + sort++; } if(CollectionUtils.isNotEmpty(formDTO.getAttachmentList())){ for(FileCommonDTO att:formDTO.getAttachmentList()) { @@ -353,11 +357,11 @@ public class InfoServiceImpl extends BaseServiceImpl implem OrgStaffFormDTO orgStaffFormDTO=new OrgStaffFormDTO(); orgStaffFormDTO.setCustomerId(customerId); for(OrgCommonDTO org:orgList){ - if("grid".equals(org.getOrgType())){ - orgStaffFormDTO.getGridIds().add(org.getOrgId()); - }else if("agency".equals(org.getOrgType())){ + if(OrgTypeEnum.GRID.getCode().equals(org.getOrgType())){ + orgStaffFormDTO.getGridIds().add(org.getOrgId()); + }else if(OrgTypeEnum.AGENCY.getCode().equals(org.getOrgType())){ orgStaffFormDTO.getAgencyIds().add(org.getOrgId()); - }else if("dept".equals(org.getOrgType())){ + }else if(OrgTypeEnum.DEPT.getCode().equals(org.getOrgType())){ orgStaffFormDTO.getDeptIds().add(org.getOrgId()); } } @@ -366,7 +370,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem throw new RenException("根据组织查询工作人员异常"); } if(CollectionUtils.isEmpty(result.getData())){ - log.info("已选择的架构里没有工作人员"); + log.warn("已选择的架构里没有工作人员"); return Collections.EMPTY_SET; } return result.getData(); @@ -393,7 +397,7 @@ public class InfoServiceImpl extends BaseServiceImpl implem throw new RenException("根据角色查询工作人员异常"); } if(CollectionUtils.isEmpty(result.getData())){ - log.info("角色下没有工作人员"); + log.warn("角色下没有工作人员"); return Collections.EMPTY_SET; } return result.getData(); diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql index 820e8ca67c..d13a3e6de3 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.14__create_info_table.sql @@ -127,7 +127,7 @@ CREATE TABLE `info_reply_content` ( `ATTACHMENT_NAME` varchar(64) DEFAULT NULL COMMENT '附件名', `ATTACHMENT_FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）', `REPLY_TYPE` varchar(64) NOT NULL COMMENT '回复的类型（文本-text、图片 - image、 视频 - video、 语音 - voice、 文档 - doc））', - `CONTENT` varchar(255) NOT NULL COMMENT '如果是文本对应的是文字，如果是其他类型，对应的是url', + `CONTENT` varchar(512) NOT NULL COMMENT '如果是文本对应的是文字，如果是其他类型，对应的是url', `SORT` int(1) NOT NULL COMMENT '排序字段', `ATTACHMENT_SIZE` int(11) DEFAULT NULL COMMENT '文件大小，单位b', `DURATION` int(11) unsigned DEFAULT '0' COMMENT '语音或视频时长，秒', From 26daa379f8ddab53676ca4504c5c3a74d7c9f6ef Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 26 Aug 2021 10:41:54 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=91=98=E6=96=B9=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/mq/ProjectChangedCustomListener.java | 11 ++++------- .../resources/mapper/org/CustomerStaffGridDao.xml | 2 +- .../src/main/resources/mapper/user/UserDao.xml | 9 +++++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java index 852a5aec52..f62cfe09f8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java @@ -2,7 +2,6 @@ package com.epmet.mq; import com.alibaba.fastjson.JSON; import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg; -import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.distributedlock.DistributedLock; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.RedisKeys; @@ -12,8 +11,6 @@ import com.epmet.dto.extract.form.ExtractOriginFormDTO; import com.epmet.service.evaluationindex.extract.todata.FactOriginExtractService; import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService; import com.epmet.util.DimIdGenerator; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; @@ -23,7 +20,6 @@ import org.apache.rocketmq.common.message.MessageExt; import org.redisson.api.RLock; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.data.redis.core.RedisTemplate; import javax.annotation.PreDestroy; import java.util.Date; @@ -119,11 +115,12 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently extractOriginFormDTO.setDateId(dateId); Future aBoolean = SpringContextUtils.getBean(FactOriginExtractService.class).submitProjectRelationData(extractOriginFormDTO,null); try { - aBoolean.get(); + Object o = aBoolean.get(); + log.info("submitProjectRelationData result:{}",o); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("submitProjectRelationData tread InterruptedException",e); } catch (ExecutionException e) { - e.printStackTrace(); + log.error("submitProjectRelationData tread ExecutionException",e); } if (aBoolean.isDone()){ // 指标库，实时数据只更新:【screen_project_data】 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerStaffGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerStaffGridDao.xml index 75b9aa5b40..0dada73cae 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerStaffGridDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerStaffGridDao.xml @@ -16,7 +16,7 @@ grid.PIDS gridPids FROM customer_staff_grid sg - LEFT JOIN customer_grid grid ON grid.id = sg.grid_id + LEFT JOIN customer_grid grid ON grid.id = sg.grid_id AND grid.DEL_FLAG = '0' WHERE sg.del_flag = '0' diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml index 936f553485..f6ddac0fef 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml @@ -588,18 +588,19 @@ AND sr.CUSTOMER_ID = #{customerId}