From 3f6f36cd9ae6291a02d987c86b7c45997c3f75da Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 19 Oct 2022 17:04:58 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/data/IcNatImportExcelData.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java index 052b0cb1eb..eca5620a39 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/data/IcNatImportExcelData.java @@ -24,9 +24,9 @@ public class IcNatImportExcelData { @Length(max = 15, message = "手机号长度不正确，应小于15位") private String mobile; - @NotBlank(message = "身份证号为必填项") - @ExcelProperty("身份证号") - @Length(max = 18, message = "身份证号长度不正确，应小于18位") + @NotBlank(message = "证件号为必填项") + @ExcelProperty("证件号") + @Length(max = 18, message = "证件号长度不正确，应小于18位") private String idCard; @NotNull(message = "检测时间为必填项") From e60958c0b8bf54a264ec11cdd356c6c7f116a326 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 19 Oct 2022 17:14:09 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/excel/ic_nat.xlsx | Bin 9220 -> 9167 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx b/epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx index d9038bfdc4faa94007e45287efb4b4b9e34a099b..fc749ef474f7a951c7e3881cb32b9efec6a7ee24 100644 GIT binary patch delta 5010 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 delta 5115 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 From 8221c1bc4b43b3de5661bcbd5b968ea3d668b96b Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 25 Oct 2022 19:56:38 +0800 Subject: [PATCH 3/6] =?UTF-8?q?gov-voice=20=E5=90=AF=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=20=E5=85=9A=E5=BB=BA=E5=A3=B0?= =?UTF-8?q?=E9=9F=B3=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/TagServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java index ce703e9f18..0803ba91dd 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.annotation.PostConstruct; import java.util.*; import java.util.stream.Collectors; @@ -133,6 +134,7 @@ public class TagServiceImpl implements TagService { return tagRedis.getResiTag(formDto); } + @PostConstruct @Override public Boolean initTag(InitTagFormDTO formDto) { List customerTagList = tagCustomerDao.selectInitData(formDto.getCustomerIdList()); From 9d37d0c2b37172a3632756be160be7e606fd5f78 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 25 Oct 2022 20:13:21 +0800 Subject: [PATCH 4/6] =?UTF-8?q?Revert=20"gov-voice=20=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=E5=88=9D=E5=A7=8B=E5=8C=96=20=E5=85=9A=E5=BB=BA?= =?UTF-8?q?=E5=A3=B0=E9=9F=B3=E6=A0=87=E7=AD=BE"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8221c1bc --- .../src/main/java/com/epmet/service/impl/TagServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java index 0803ba91dd..ce703e9f18 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java @@ -24,7 +24,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import javax.annotation.PostConstruct; import java.util.*; import java.util.stream.Collectors; @@ -134,7 +133,6 @@ public class TagServiceImpl implements TagService { return tagRedis.getResiTag(formDto); } - @PostConstruct @Override public Boolean initTag(InitTagFormDTO formDto) { List customerTagList = tagCustomerDao.selectInitData(formDto.getCustomerIdList()); From 3b55d153163d84aa5e473a5b3784684a7f0398e0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 25 Oct 2022 20:17:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?gov-voice=20=E5=90=AF=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=20=E5=85=9A=E5=BB=BA=E5=A3=B0?= =?UTF-8?q?=E9=9F=B3=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/TagServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java index ce703e9f18..cbfba74bb5 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import javax.annotation.PostConstruct; import java.util.*; import java.util.stream.Collectors; @@ -46,6 +47,12 @@ public class TagServiceImpl implements TagService { @Autowired private ArticlePublishRangeDao articlePublishRangeDao; + @PostConstruct + public void initDataToRedis(){ + //加载党建声音标签到redis + this.initTag(new InitTagFormDTO()); + } + /** * @Description 已发布列表页的标签——政府端 * @param tokenDto From 9ec98cd171ca37cc34f20e9eea035f2208ebc3b6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Oct 2022 10:07:34 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=81=B5=E5=B1=B1=E5=8D=AB=E4=B8=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=89=80=E5=B1=9E=E5=85=9A=E6=94=AF=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/GetListSocietyOrgFormDTO.java | 5 +++ .../controller/IcSocietyOrgController.java | 3 +- .../service/impl/ActLiveRecServiceImpl.java | 3 +- .../service/impl/IcSocietyOrgServiceImpl.java | 5 +-- .../dto/form/CustomerFootBarFormDTO.java | 2 +- .../service/impl/ResiGroupServiceImpl.java | 3 ++ .../partymember/IcPartymemberStyleDTO.java | 6 ++-- .../IcPartymemberStyleController.java | 1 + .../impl/IcPartymemberStyleServiceImpl.java | 3 ++ .../service/impl/IcResiUserServiceImpl.java | 35 +++++++++++++------ 10 files changed, 49 insertions(+), 17 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java index 9f0357a1d7..f13cef1bb6 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/GetListSocietyOrgFormDTO.java @@ -57,4 +57,9 @@ public class GetListSocietyOrgFormDTO implements Serializable { //token中userId所属组织Id private String agencyId; + /** + * resi:居民端 + */ + private String app; + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java index 3267ef36bb..89159c015b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcSocietyOrgController.java @@ -142,6 +142,7 @@ public class IcSocietyOrgController implements ResultDataResolver { public Result getList(@LoginUser TokenDto tokenDto, @RequestBody GetListSocietyOrgFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setApp(tokenDto.getApp()); return new Result().ok(societyOrgService.getList(formDTO)); } @@ -171,7 +172,7 @@ public class IcSocietyOrgController implements ResultDataResolver { // formDTO.setIsPage(false); // GetListSocietyOrgResultDTO list = societyOrgService.getList(formDTO); // ExcelUtils.exportExcelToTarget(response, null, list.getList(), IcSocietyOrgExportExcel.class); - + formDTO.setApp(tokenDto.getApp()); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); formDTO.setIsPage(false); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java index c45a4aeadc..4ef1610fd0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; import com.epmet.commons.tools.scan.param.ImgTaskDTO; @@ -95,7 +96,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl liveRecList(TokenDto tokenDto,Map map) { if (!map.containsKey("actId") || StringUtils.isEmpty(map.get("actId"))) { logger.warn("传参中没有actId,或者actId为空,userId:" + tokenDto.getUserId() + "客户id:" + tokenDto.getCustomerId()); - throw new RenException("actId不能为空"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"actId不能为空","活动id不能为空"); } // 数据汇总 ResiActLiveRecResultDTO resultDto = new ResiActLiveRecResultDTO(); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java index 063064f9cd..013ea62d1c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcSocietyOrgServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import com.alibaba.excel.EasyExcel; 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.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -148,10 +149,10 @@ public class IcSocietyOrgServiceImpl extends BaseServiceImpl achievementList = new ArrayList<>(); //1.小组创建时间 ResiGroupEntity group = baseDao.selectById(formDTO.getGroupId()); + if (null == group) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "resi_group is null groupId:" + formDTO.getGroupId(), "小组不存在"); + } resultDTO.setCreatedDate(DateUtils.dateToTimestamp(group.getCreatedTime())); //2.即将完成的3个成就 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleDTO.java index a2cda91a24..6e567e606a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/IcPartymemberStyleDTO.java @@ -19,6 +19,7 @@ package com.epmet.resi.partymember.dto.partymember; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -34,10 +35,11 @@ import java.util.List; public class IcPartymemberStyleDTO implements Serializable { private static final long serialVersionUID = 1L; - + public interface DetailGroup {} /** - * 楼栋主键 + * 主键 */ + @NotBlank(message = "党员风采主键不能为空",groups = DetailGroup.class) private String id; /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java index ef2469b7b0..786f22d542 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java @@ -84,6 +84,7 @@ public class IcPartymemberStyleController { @PostMapping("detail") public Result get(@RequestBody IcPartymemberStyleDTO dto) { + ValidatorUtils.validateEntity(dto,IcPartymemberStyleDTO.DetailGroup.class); IcPartymemberStyleDTO data = icPartymemberStyleService.get(dto.getId()); return new Result().ok(data); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java index d277201298..435038822f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java @@ -156,6 +156,9 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { if (!hash.containsKey("SSZB")) { - String errorMsg = "党员信息所属支部不能为空"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + // 10.26灵山卫的暂时放开，不校验 + if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){ + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } } } } else { - String errorMsg = "党员信息所属支部不能为空"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + // 10.26灵山卫的暂时放开，不校验 + if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){ + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } } partyMemberDTO.setCustomerId(tokenDto.getCustomerId()); @@ -541,20 +547,29 @@ public class IcResiUserServiceImpl extends BaseServiceImpl hash : formMap.get("ic_party_member")) { if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) { - String errorMsg = "党员信息所属支部不能为空"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + // 10.26灵山卫的暂时放开，不校验 + if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){ + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } } } } else { - String errorMsg = "党员信息所属支部不能为空"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + // 10.26灵山卫的暂时放开，不校验 + if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){ + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } } } else if (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty())) { if (formMap.containsKey("ic_party_member")) { for (LinkedHashMap hash : formMap.get("ic_party_member")) { if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) { - String errorMsg = "党员信息所属支部不能为空"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + // 10.26灵山卫的暂时放开，不校验 + if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){ + String errorMsg = "党员信息所属支部不能为空"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); + } } } }