diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/ActPointEventMsg.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/ActPointEventMsg.java deleted file mode 100644 index 60db245a07..0000000000 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/ActPointEventMsg.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.epmet.commons.tools.dto.form.mq.eventmsg; - -import lombok.Data; - -/** - * 结束活动，发放活动积分消息体 - * - * @author yinzuomei@elink-cn.com - * @date 2020/7/27 9:26 - */ -@Data -public class ActPointEventMsg extends BasePointEventMsg{ - /** - * 参与活动的备注 - */ - private String remark; - -} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/BasePointEventMsg.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/BasePointEventMsg.java index 435234f7dd..ec14e7c812 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/BasePointEventMsg.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/BasePointEventMsg.java @@ -19,6 +19,11 @@ public class BasePointEventMsg implements Serializable { */ private String opAgencyId; + /** + * 操作人Id，当有固定的操作人时，传入此值，如果没有则为空 + * */ + private String operatorId; + /** * 客户Id */ @@ -42,4 +47,14 @@ public class BasePointEventMsg implements Serializable { * 是否是通用事件，通用事件不走规则 */ private Boolean isCommon; + + /** + * 备注 + */ + private String remark; + + /** + * 业务id eg：活动id + */ + private String sourceId; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java index 89d5c1e4ec..7906c364d5 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/LatestDraftActInfoResultDTO.java @@ -165,5 +165,5 @@ public class LatestDraftActInfoResultDTO implements Serializable { /** * 活动内容- */ - private List actContentList; + private List actContent; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 35e3c6384a..1ae781d21c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.7 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.8 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 61c9220650..20462901b2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.7 + 0.0.8 com.epmet epmet-heart diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java index e08ecfb96d..046a2c6854 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java @@ -131,7 +131,7 @@ public class ResiActListController { return actInfoService.latestAct(formDto); } - /* + /** * 正在进行中的活动 * 进入活动的快捷入口, 前端只取第一条 * @@ -158,8 +158,6 @@ public class ResiActListController { return actInfoService.actLookBack(formDto); } - // - /** * 活动详情 * @@ -217,8 +215,6 @@ public class ResiActListController { return actLiveRecService.liveRecList(map); } - // - /** * 取消活动报名 * @@ -293,12 +289,11 @@ public class ResiActListController { return actSignInRecService.actSignIn(tokenDto, formDTO); } - /* + /** * 活动报名 * * @param tokenDto * @param formDTO - * * @return com.epmet.commons.tools.utils.Result * @Author zhangyong * @Date 16:26 2020-07-28 @@ -309,4 +304,17 @@ public class ResiActListController { return actUserRelationService.registration(tokenDto, formDTO); } + /** + * 首页组件 - 活动回顾列表(包含状态：已结束：finished；) + * + * @param formDto + * @return com.epmet.commons.tools.utils.Result> + * @Author zhangyong + * @Date 13:39 2020-07-21 + **/ + @PostMapping("actlookbackassembly") + public Result> actLookBackAssembly(@RequestBody ResiLatestActFormDTO formDto) { + ValidatorUtils.validateEntity(formDto, ResiActBaseFormDTO.AddUserInternalGroup.class); + return actInfoService.actLookBackAssembly(formDto); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java index ce0d39cb16..e27d70b442 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java @@ -297,4 +297,16 @@ public interface ActInfoDao extends BaseDao { * @Date 2020/7/26 21:35 **/ InProgressActDetailResultDTO selectInProgressDetail(String actId); + + /** + * 首页组件 - 活动回顾列表(包含状态：已结束：finished；) + * 已结束的活动，并且有实况或有回顾 + * 按照时间顺序排序 + * + * @param formDTO + * @return java.util.List + * @Author zhangyong + * @Date 11:00 2020-07-20 + **/ + List selectListLookBackActAssembly(ResiLatestActFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java index 26a868572b..7fc4eb4963 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActInfoService.java @@ -225,4 +225,14 @@ public interface ActInfoService extends BaseService { * @Date 17:17 2020-07-23 **/ Integer checkActTime(ActInfoDTO actInfoDTO); + + /** + * 首页组件 - 活动回顾列表(包含状态：已结束：finished；) + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result> + * @Author zhangyong + * @Date 13:39 2020-07-21 + **/ + Result> actLookBackAssembly(ResiLatestActFormDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java index d47594761f..3afeddf4bb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java @@ -368,7 +368,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl().ok(dto); } else { - logger.info("您还未进入指定的签到范围～"); + logger.info(EpmetErrorCode.NOT_IN_THE_SIGN_IN_RANGE.getMsg()); dto.setIsAddress(false); dto.setErrorTip(EpmetErrorCode.NOT_IN_THE_SIGN_IN_RANGE.getMsg()); return new Result().ok(dto); @@ -379,4 +379,10 @@ public class ActInfoServiceImpl extends BaseServiceImpl> actLookBackAssembly(ResiLatestActFormDTO formDTO) { + List lookBackAct = baseDao.selectListLookBackActAssembly(formDTO); + return new Result>().ok(lookBackAct); + } } 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 ef55f849ab..d1f11ccf68 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 @@ -23,7 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO; -import com.epmet.commons.tools.dto.form.mq.eventmsg.ActPointEventMsg; +import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.enums.EventEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; @@ -109,7 +109,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl dataContainer = new ArrayList<>(); for (int k = 0; k < actLives.size(); k++) { - Map base = new HashMap<>(); + Map base = new HashMap<>(NumConstant.ONE); base.put("nickname", userWxInfos.getData().get(k).getNickname()); base.put("headImg", userWxInfos.getData().get(k).getHeadImgUrl()); base.put("desc", actLives.get(k).getDesc()); @@ -130,6 +130,9 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl()); + resultDto.setActLiveNum(NumConstant.ZERO); } return new Result().ok(resultDto); } @@ -221,13 +224,14 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl actPointEventMsgList=new ArrayList<>(); - ActPointEventMsg actPointEventMsg=new ActPointEventMsg(); + List actPointEventMsgList=new ArrayList<>(); + BasePointEventMsg actPointEventMsg=new BasePointEventMsg(); actPointEventMsg.setCustomerId(formDTO.getCustomerId()); actPointEventMsg.setUserId(formDTO.getUserId()); actPointEventMsg.setActionFlag(MqConstant.PLUS); actPointEventMsg.setIsCommon(false); actPointEventMsg.setRemark(remark); + actPointEventMsg.setSourceId(formDTO.getActId()); actPointEventMsgList.add(actPointEventMsg); mqBaseMsgDTO.setMsg(JSON.toJSONString(actPointEventMsgList)); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java index 22bc9b42dc..c84e1efa93 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java @@ -207,7 +207,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl().ok(resultDTO); @@ -216,7 +216,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl().ok(resultDTO); @@ -226,7 +226,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl().ok(resultDTO); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java index a8d0dfacfe..ce7167c259 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/HeartUserInfoServiceImpl.java @@ -127,7 +127,7 @@ public class HeartUserInfoServiceImpl extends BaseServiceImpl> leaderboard(ResiActBaseFormDTO formDTO) { - List resultDTOS = new ArrayList<>(); + List resultDtoS = new ArrayList<>(); // 获取排好序的 排行榜 List leaderboardList = baseDao.selectListLeaderboard(formDTO); if (leaderboardList.size() > NumConstant.ZERO){ @@ -151,14 +151,14 @@ public class HeartUserInfoServiceImpl extends BaseServiceImpl>().ok(resultDTOS); + return new Result>().ok(resultDtoS); } @Override diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java index 9e329e81af..7d219aca27 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java @@ -22,7 +22,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO; -import com.epmet.commons.tools.dto.form.mq.eventmsg.ActPointEventMsg; +import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.enums.EventEnum; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -102,8 +102,8 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl actPointEventMsgList=new ArrayList<>(); - ActPointEventMsg actPointEventMsg=new ActPointEventMsg(); + List actPointEventMsgList=new ArrayList<>(); + BasePointEventMsg actPointEventMsg=new BasePointEventMsg(); actPointEventMsg.setCustomerId(formDTO.getCustomerId()); actPointEventMsg.setUserId(formDTO.getUserId()); actPointEventMsg.setActionFlag(MqConstant.PLUS); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java index 1af9e0522b..0375e16a36 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java @@ -76,7 +76,7 @@ public class WorkActDraftServiceImpl implements WorkActDraftService { LatestDraftActInfoResultDTO latestAct=latestActInfoService.getLatestActDraft(userId); if(null!=latestAct){ List actContentList=latestActContentService.selectActContentList(latestAct.getActDraftId()); - latestAct.setActContentList(actContentList); + latestAct.setActContent(actContentList); } return latestAct; }else{ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index af47fd7134..b435c6088a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -6,7 +6,7 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO; -import com.epmet.commons.tools.dto.form.mq.eventmsg.ActPointEventMsg; +import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; import com.epmet.commons.tools.enums.EventEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; @@ -799,19 +799,21 @@ public class WorkActServiceImpl implements WorkActService { mqBaseMsgDTO.setEventClass(EventEnum.ACTIVE_SEND_POINT.getEventClass()); //事件code mqBaseMsgDTO.setEventTag(EventEnum.ACTIVE_SEND_POINT.getEventTag()); - List actPointEventMsgList=new ArrayList<>(); + List basePointEventMsgArrayList=new ArrayList<>(); for(ActUserRelationEntity actUserRelationEntity:actUserRelationEntityList){ - ActPointEventMsg actPointEventMsg=new ActPointEventMsg(); - actPointEventMsg.setOpAgencyId(opAgencyId); - actPointEventMsg.setCustomerId(actInfoDTO.getCustomerId()); - actPointEventMsg.setUserId(actUserRelationEntity.getUserId()); - actPointEventMsg.setActionFlag(MqConstant.PLUS); - actPointEventMsg.setPoint(actInfoDTO.getReward()); - actPointEventMsg.setIsCommon(true); - actPointEventMsg.setRemark(remark); - actPointEventMsgList.add(actPointEventMsg); + BasePointEventMsg basePointEventMsg=new BasePointEventMsg(); + basePointEventMsg.setOpAgencyId(opAgencyId); + basePointEventMsg.setCustomerId(actInfoDTO.getCustomerId()); + basePointEventMsg.setUserId(actUserRelationEntity.getUserId()); + basePointEventMsg.setActionFlag(MqConstant.PLUS); + basePointEventMsg.setPoint(actInfoDTO.getReward()); + basePointEventMsg.setIsCommon(true); + basePointEventMsg.setRemark(remark); + basePointEventMsg.setSourceId(actInfoDTO.getId()); + basePointEventMsg.setOperatorId(loginUserUtil.getLoginUserId()); + basePointEventMsgArrayList.add(basePointEventMsg); } - mqBaseMsgDTO.setMsg(JSON.toJSONString(actPointEventMsgList)); + mqBaseMsgDTO.setMsg(JSON.toJSONString(basePointEventMsgArrayList)); Result result=SendMqMsgUtils.sendMsg(mqBaseMsgDTO); if(!result.success()){ logger.error("活动积分发放失败"); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 3828a814f8..891cde8f20 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -59,7 +59,7 @@ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, i.ACT_ADDRESS actAddress, - IF(i.ACT_QUOTA_CATEGORY = 1, true , false ) as actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） + i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 'signing_up' AS actCurrentState, -- 活动状态：报名中，未报满 @@ -85,7 +85,7 @@ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, i.ACT_ADDRESS actAddress, - IF(i.ACT_QUOTA_CATEGORY = 1, true , false ) as actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） + i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 'enough' AS actCurrentState, -- 活动状态：报名中，已报满 @@ -112,7 +112,7 @@ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, i.ACT_ADDRESS actAddress, - IF(i.ACT_QUOTA_CATEGORY = 1, true , false ) as actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） + i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 'end_sign_up' AS actCurrentState, -- 活动状态：未开始 @@ -138,7 +138,7 @@ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, i.ACT_ADDRESS actAddress, - IF(i.ACT_QUOTA_CATEGORY = 1, true , false ) as actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） + i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 'in_progress' AS actCurrentState, -- 活动状态：进行中 @@ -164,7 +164,7 @@ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, i.ACT_ADDRESS actAddress, - IF(i.ACT_QUOTA_CATEGORY = 1, true , false ) as actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） + i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 'finished' AS actCurrentState, -- 活动状态：已结束 @@ -190,7 +190,7 @@ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, i.ACT_ADDRESS actAddress, - IF(i.ACT_QUOTA_CATEGORY = 1, true , false ) as actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） + i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 'auditing' AS actCurrentState -- 活动状态 @@ -213,7 +213,7 @@ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, i.ACT_ADDRESS actAddress, - IF(i.ACT_QUOTA_CATEGORY = 1, true , false ) as actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） + i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 'passed' AS actCurrentState -- 活动状态 @@ -236,7 +236,7 @@ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, i.ACT_ADDRESS actAddress, - IF(i.ACT_QUOTA_CATEGORY = 1, true , false ) as actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） + i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 'refused' AS actCurrentState -- 活动状态 @@ -259,7 +259,7 @@ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, i.ACT_ADDRESS actAddress, - IF(i.ACT_QUOTA_CATEGORY = 1, true , false ) as actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） + i.ACT_QUOTA_CATEGORY actQuotaCategory, -- 活动名额类型（true:固定名额(1) false： 不限制名额(0)） i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 'canceld' AS actCurrentState -- 活动状态 @@ -282,7 +282,7 @@ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, i.ACT_ADDRESS actAddress, - IF(i.ACT_QUOTA_CATEGORY = 1, true , false ) as actQuotaCategory, + i.ACT_QUOTA_CATEGORY actQuotaCategory, i.ACT_QUOTA actQuota, IFNULL(c.signupNum, 0) signupNum, -- 已报名人数 case @@ -330,7 +330,7 @@ + + + diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointActionLogDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointActionLogDTO.java index 254e53bbd6..113572b051 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointActionLogDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/UserPointActionLogDTO.java @@ -53,6 +53,11 @@ public class UserPointActionLogDTO implements Serializable { */ private String actionFlag; + /** + * 来源Id，可以是活动Id + * */ + private String sourceId; + /** * 来源ID 当来源为积分调整时 通过事件Id查找规则ID计算出分数 通过EVENT_ID能查出RUIE_ID */ diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java index 556b8471e1..79884a4842 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointDetailResultDTO.java @@ -17,11 +17,11 @@ public class ResiPointDetailResultDTO implements Serializable { /** * 累计积分 * */ - private Integer accumulatedPoint; + private Integer accumulatedPoint = 0; /** * 可用积分 * */ - private Integer usablePoint; + private Integer usablePoint = 0; } diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/dto/form/SendPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/dto/form/SendPointFormDTO.java index ae4c7aeeba..fef7e11cc5 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/dto/form/SendPointFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/dto/form/SendPointFormDTO.java @@ -14,5 +14,50 @@ import lombok.Data; @Data public class SendPointFormDTO { private String pointDesc; + + /** + * 积分 + * */ private Integer point; + + /** + * 操作人机关id + */ + private String opAgencyId; + + /** + * 操作人Id，当有固定的操作人时，传入此值，如果没有则为空 + * */ + private String operatorId; + + /** + * 客户Id + */ + private String customerId; + /** + * 被操作用户id + */ + private String userId; + + /** + * 加减分标识 plus/minus + */ + private String actionFlag; + + + /** + * 是否是通用事件，通用事件不走规则 + */ + private Boolean isCommon; + + /** + * 备注 + */ + private String remark; + + /** + * 业务id eg：活动id + */ + private String sourceId; + } diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index 5c503f97cf..a40dda53b8 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.5 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.7 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 7ab1904b5b..7f57bbf6e9 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.5 + 0.0.7 epmet-point com.epmet diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java index 0380836896..c30ee3c1d6 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java @@ -83,6 +83,7 @@ public class AdjustmentController { @PostMapping("adjust") public Result adjustPoint(@LoginUser TokenDto token, @RequestBody PointAdjustmentFormDTO param){ param.setOperatorId(token.getUserId()); + param.setCustomerId(token.getCustomerId()); ValidatorUtils.validateEntity(param, PointAdjustmentFormDTO.PointAdjustmentGroup.class); pointAdjustmentLogService.adjustPoint(param); return new Result(); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java index 51146befb0..10b21cf105 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/MqPointCallbackController.java @@ -46,7 +46,7 @@ public class MqPointCallbackController { } SendPointFormDTO formDTO = ConvertUtils.sourceToTarget(mqMsg.getMsg(), SendPointFormDTO.class); try { - //TODO 调用调整积分方法去给用户加减积分 userPointActionLogService. + userPointActionLogService.grantPoint(formDTO); } catch (Exception e) { logger.error("activeSendPoint consume fail,msg:{}",JSON.toJSONString(mqMsg.getMsg())); throw new RenException(EpmetErrorCode.SERVER_ERROR.getMsg()); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointActionLogEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointActionLogEntity.java index 4c72c5659a..b52ed79b2f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointActionLogEntity.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/UserPointActionLogEntity.java @@ -54,10 +54,15 @@ public class UserPointActionLogEntity extends BaseEpmetEntity { private String actionFlag; /** - * 来源ID 当来源为积分调整时 通过事件Id查找规则ID计算出分数 通过EVENT_ID能查出RUIE_ID + * 当来源为积分调整时 通过事件Id查找规则ID计算出分数 通过EVENT_ID能查出RUIE_ID */ private String eventId; + /** + * 来源Id，可以是活动Id + * */ + private String sourceId; + /** * 活动描述 获取积分的原因，相关内容，用来拼接【用户参加了xxx活动获取？积分】的文案，取活动的名称；【积分调整文案】；其他…… 如果是管理员手动调整扣减积分，ACTION_FLAG为"minus"，但是不会生成核销记录，核销记录只保存用户使用积分兑换商品的核销详情 diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java index 84d6379e22..81873314f7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java @@ -23,6 +23,7 @@ import com.epmet.dto.UserPointActionLogDTO; import com.epmet.dto.form.CommonPageUserFormDTO; import com.epmet.dto.result.ResiPointLogListResultDTO; import com.epmet.entity.UserPointActionLogEntity; +import dto.form.SendPointFormDTO; import java.util.List; import java.util.Map; @@ -104,5 +105,13 @@ public interface UserPointActionLogService extends BaseService getMyPointRecord(CommonPageUserFormDTO pageUser); + /** + * @Description 消息网关回调进行积分发放 + * @param grantPointParam + * @return + * @author wangc + * @date 2020.07.29 09:11 + **/ + void grantPoint(SendPointFormDTO grantPointParam); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java index 220dc525e7..a78e6f70bf 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdjustmentLogServiceImpl.java @@ -178,7 +178,7 @@ public class PointAdjustmentLogServiceImpl extends BaseServiceImpl NumConstant.ZERO){ point *= NumConstant.ONE_NEG; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index 7a80b9b3c8..319b3fa0ce 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -236,7 +236,8 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl implements UserPointActionLogService { + @Autowired + private UserPointTotalService userPointTotalService; + @Autowired + private UserPointStatisticalDailyService userPointStatisticalDailyService; @Override public PageData page(Map params) { @@ -131,4 +145,62 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl NumConstant.ZERO){ + //保证负数 + grantPointParam.setPoint(grantPointParam.getPoint() * NumConstant.ONE_NEG); + } + }else{ + //加 + if(grantPointParam.getPoint() < NumConstant.ZERO){ + //保证正数 + grantPointParam.setPoint(grantPointParam.getPoint() * NumConstant.ONE_NEG); + } + } + //1.新增用户积分行为记录 + UserPointActionLogEntity action = new UserPointActionLogEntity(); + action.setCustomerId(grantPointParam.getCustomerId()); + action.setPoint(grantPointParam.getPoint()); + action.setEventStatement(grantPointParam.getPointDesc()); + action.setEventName(EventEnum.ACTIVE_SEND_POINT.getEventDesc()); + action.setEventId(EventEnum.ACTIVE_INSERT_LIVE.getEventTag()); + action.setActionFlag(grantPointParam.getActionFlag()); + action.setUserId(grantPointParam.getUserId()); + action.setCreatedBy(grantPointParam.getOperatorId()); + action.setUpdatedBy(grantPointParam.getOperatorId()); + action.setSourceId(grantPointParam.getSourceId()); + action.setOperatorAgencyId(grantPointParam.getOpAgencyId()); + baseDao.insert(action); + //2.新增/修改用户积分日统计 + DimIdGenerator.DimIdBean dimVal = DimIdGenerator.getDimIdBean(new Date()); + UserPointStatisticalDailyEntity statistical = ConvertUtils.sourceToTarget(dimVal,UserPointStatisticalDailyEntity.class); + statistical.setPointChange(grantPointParam.getPoint()); + statistical.setActionFlag(grantPointParam.getActionFlag()); + statistical.setCustomerId(grantPointParam.getCustomerId()); + statistical.setUserId(grantPointParam.getUserId()); + statistical.setCreatedBy(grantPointParam.getOperatorId()); + statistical.setUpdatedBy(grantPointParam.getOperatorId()); + userPointStatisticalDailyService.insertOrUpdate(statistical); + //3.新增/修改用户总积分 + UserPointTotalEntity point = new UserPointTotalEntity(); + point.setCustomerId(grantPointParam.getCustomerId()); + point.setUserId(grantPointParam.getUserId()); + point.setTotalPoint(grantPointParam.getPoint()); + point.setUsablePoint(grantPointParam.getPoint()); + point.setUsedPoint(NumConstant.ZERO); + point.setCreatedBy(grantPointParam.getOperatorId()); + point.setUpdatedBy(grantPointParam.getOperatorId()); + userPointTotalService.insertOrUpdate(point); + } + } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java index 623cfb48f7..c6a3986193 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java @@ -118,7 +118,10 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml index 1603237883..cc797271a4 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml @@ -48,7 +48,7 @@ diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftDetailResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftDetailResultDTO.java index 6298a5cfca..d56bb74248 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftDetailResultDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftDetailResultDTO.java @@ -28,6 +28,11 @@ public class DraftDetailResultDTO implements Serializable { */ private String title; + /** + * 标题审核状态 + */ + private String titleAuditStatus; + /** * 发布单位名称 */ @@ -36,7 +41,7 @@ public class DraftDetailResultDTO implements Serializable { /** * 发布日期 */ - @JsonFormat(pattern="yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") private Date publishDate; /** diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index bf3de1429d..8f9b03861f 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -255,7 +255,7 @@ public class ArticleController { articleService.updateAuditStatusFailById(draftId, syncScanResult); } } catch (Exception e) { - articleService.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL); + articleService.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null); log.error("scanContent exception draftId:{} return result null", e); } } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java index 4e6c151df4..470ec938b6 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java @@ -75,10 +75,11 @@ public interface DraftDao extends BaseDao { /** * 草稿列表 - * @author zhaoqifeng - * @date 2020/6/3 14:54 + * * @param userId * @return java.util.List + * @author zhaoqifeng + * @date 2020/6/3 14:54 */ List selectDraftList(@Param("userId") String userId); @@ -102,5 +103,13 @@ public interface DraftDao extends BaseDao { int deleteDraft(String draftId); - int updateAuditStatusById(@Param("draftId") String draftId, @Param("statusFlag") String statusFlag); + /** + * desc:修改审核状态（2个状态至少填一个） + * + * @param draftId + * @param statusFlag + * @param titleAuditStatus + * @return + */ + int updateAuditStatusById(@Param("draftId") String draftId, @Param("statusFlag") String statusFlag, @Param("titleAuditStatus") String titleAuditStatus); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleEntity.java index 3b1021a004..13dc5bd83e 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/ArticleEntity.java @@ -18,7 +18,6 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -43,24 +42,29 @@ public class ArticleEntity extends BaseEpmetEntity { */ private String customerId; - /** - * 草稿ID - */ + /** + * 草稿ID + */ private String draftId; - /** - * 文章标题 - */ + /** + * 文章标题 + */ private String title; - /** - * 文章内容 精简内容 - */ + /** + * 标题审核状态 + */ + private String titleAuditStatus; + + /** + * 文章内容 精简内容 + */ private String previewContent; - /** - * 是否置顶 - */ + /** + * 是否置顶 + */ private Integer isTop; /** diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftEntity.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftEntity.java index b3c7fd96b6..04e1b22158 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftEntity.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/entity/DraftEntity.java @@ -18,7 +18,6 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -38,24 +37,29 @@ public class DraftEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; - /** - * 客户ID - */ + /** + * 客户ID + */ private String customerId; - /** - * 文章标题 - */ + /** + * 文章标题 + */ private String title; - /** - * 文章内容 精简内容 - */ + /** + * 标题审核状态 + */ + private String titleAuditStatus; + + /** + * 文章内容 精简内容 + */ private String previewContent; - /** - * 是否置顶 - */ + /** + * 是否置顶 + */ private Integer isTop; /** diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index 6b69368795..634fcfa7f5 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -200,12 +200,14 @@ public interface ArticleService extends BaseService { DraftContentSaveResultDTO saveDraft(TokenDto tokenDto, DraftContentFromDTO fromDTO); /** - * desc:政府端点审核结果处理异常后 修改草稿审核状态 + * desc:政府端点审核结果处理异常后 修改草稿审核状态 2选1 + * * @param draftId * @param statusFlag + * @param titleAuditStatus * @return */ - void updateDraftPublishStatus(String draftId,String statusFlag); + void updateDraftPublishStatus(String draftId, String statusFlag, String titleAuditStatus); /** * desc:人工发布文章 不走审核接口 diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index c5c4b74f0f..435f35c656 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -970,13 +970,19 @@ public class ArticleServiceImpl extends BaseServiceImpl failDataIds = syncScanResult.getFailDataIds(); for (String id : failDataIds) { if (id.indexOf(ModuleConstant.SCAN_COVER_PREFIX) >= NumConstant.ZERO) { draftCoverDao.updateAuditStatusById(id.replace(ModuleConstant.SCAN_COVER_PREFIX.concat(StrConstant.UNDER_LINE), ""), ModuleConstant.AUDIT_STATUS_FAIL); coverFail = true; + } else if (id.indexOf(ModuleConstant.SCAN_TITLE_PREFIX) >= NumConstant.ZERO) { + this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, ModuleConstant.AUDIT_STATUS_FAIL); + titleFail = true; } else { draftContentDao.updateAuditStatusById(id, ModuleConstant.AUDIT_STATUS_FAIL); contentFail = true; @@ -1113,18 +1121,28 @@ public class ArticleServiceImpl extends BaseServiceImpl { if (id.indexOf(ModuleConstant.SCAN_COVER_PREFIX) >= NumConstant.ZERO) { draftCoverDao.updateAuditStatusById(id.replace(ModuleConstant.SCAN_COVER_PREFIX.concat(StrConstant.UNDER_LINE), ""), ModuleConstant.AUDIT_STATUS_PASS); + } else if (id.indexOf(ModuleConstant.SCAN_TITLE_PREFIX) >= NumConstant.ZERO) { + this.updateDraftPublishStatus(draftId, null, ModuleConstant.AUDIT_STATUS_PASS); } else { draftContentDao.updateAuditStatusById(id, ModuleConstant.AUDIT_STATUS_PASS); } }); - if (coverFail || contentFail) { + if (coverFail || contentFail || titleFail) { String auditMsg = ""; - if (coverFail && contentFail) { + if (titleFail && coverFail && contentFail) { + auditMsg = ModuleConstant.DRAFT_TITLE_CONTENT_AND_COVER; + } else if (coverFail && contentFail) { auditMsg = ModuleConstant.DRAFT_CONTENT_AND_COVER; + } else if (titleFail && coverFail) { + auditMsg = ModuleConstant.DRAFT_TITLE_AND_COVER; + } else if (titleFail && contentFail) { + auditMsg = ModuleConstant.DRAFT_TITLE_AND_CONTENT; } else if (contentFail) { auditMsg = ModuleConstant.DRAFT_CONTENT; } else if (coverFail) { auditMsg = ModuleConstant.DRAFT_COVER; + } else if (titleFail) { + auditMsg = ModuleConstant.DRAFT_TITLE; } this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_AUDIT_CONTENT, draft.getTitle(), auditMsg)); } @@ -1154,8 +1172,8 @@ public class ArticleServiceImpl extends BaseServiceImpl - update draft set STATUS_FLAG =#{statusFlag,jdbcType=VARCHAR} where id=#{draftId,jdbcType=VARCHAR} + update draft + + + STATUS_FLAG =#{statusFlag,jdbcType=VARCHAR} + + + TITLE_AUDIT_STATUS = #{titleAuditStatus,jdbcType=VARCHAR} + + + where id=#{draftId,jdbcType=VARCHAR} \ No newline at end of file diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/VerificationCodeFromDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/VerificationCodeFromDTO.java index 5f655ffb7a..81db04b531 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/VerificationCodeFromDTO.java +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/VerificationCodeFromDTO.java @@ -32,7 +32,7 @@ public class VerificationCodeFromDTO implements Serializable { private String mobile; /** - * 行为记录表ID + * 行为记录表ID partymember_visit.id */ @NotBlank(message = "行为记录表ID不能为空") private String visitId; diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml index 7863b22fa0..1854054da8 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.30 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.31 ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 73700bf6ec..b8c200940a 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.30 + 0.3.31 com.epmet resi-mine diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index dc2d435422..522e015aa9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.55 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.56 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml index a8a1cbb894..99f585a927 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.55 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.56 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 7515fdf77f..06f9dfc87e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.55 + 0.3.56 com.epmet resi-partymember diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 7b4398dc31..b3a5addaa2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -560,6 +560,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService userResiInfoDTO.setResiVisitId(partyMemberInfoDTO.getPartymemberVisitId()); userResiInfoDTO.setDistrict(partyMemberInfoDTO.getEstate()); userResiInfoDTO.setBuildingAddress(partyMemberInfoDTO.getBuilding()); + userResiInfoDTO.setCustomerId(partyMemberInfoDTO.getCustomerId()); epmetUserFeignClient.saveResiInfo(userResiInfoDTO); } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java index eb38891968..9edf883123 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java @@ -17,9 +17,11 @@ package com.epmet.dto; +import lombok.Data; + +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -51,7 +53,8 @@ public class UserResiInfoDTO implements Serializable { /** * 手机号(注册手机号) */ - private String regMobile; + @NotBlank(message = "手机号不能为空") + private String regMobile; /** * 姓氏 @@ -121,6 +124,7 @@ public class UserResiInfoDTO implements Serializable { /** * 客户Id (customer.id) */ + @NotBlank(message = "客户Id不能为空") private String customerId; /** diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 00de36ca93..b405c1d094 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.86 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.87 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml index 2bd219f2ca..b9c4704080 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.86 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.87 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 46c8fdc23d..43bcda2035 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.86 + 0.3.87 com.epmet epmet-user diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java index 8844cfbdc1..56a75d64cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java @@ -149,6 +149,7 @@ public class UserResiInfoController { **/ @PostMapping("saveResiInfo") public Result saveResiInfo (@RequestBody UserResiInfoDTO userResiInfoDTO) { + ValidatorUtils.validateEntity(userResiInfoDTO); return userResiInfoService.saveResiInfo(userResiInfoDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index acb1ce5ab2..da37577505 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -39,8 +39,8 @@ import java.util.List; public interface UserResiInfoDao extends BaseDao { /** - * @return com.epmet.dto.UserResiInfoDTO * @param userResiInfoFormDTO + * @return com.epmet.dto.UserResiInfoDTO * @Author yinzuomei * @Description 查询用户注册信息 * @Date 2020/3/30 11:10 @@ -48,23 +48,23 @@ public interface UserResiInfoDao extends BaseDao { UserResiInfoResultDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); /** - * @Description 查询用户注册信息 不按照客户Id查询 * @param userResiInfoFormDTO - * @return UserResiInfoResultDTO + * @return UserResiInfoResultDTO + * @Description 查询用户注册信息 不按照客户Id查询 * @author wangc * @date 2020.05.21 13:18 - **/ + **/ UserResiInfoResultDTO selectUserResiInfoNotByCustId(UserResiInfoFormDTO userResiInfoFormDTO); /** * @Author sun * @Description 根据手机号查询居民注册信息(user_resi_info)表数据 **/ - List selectResiInfoByMobile(String regMobile); + List selectResiInfoByMobile(@Param("regMobile") String regMobile, @Param("customerId") String customerId); /** - * @return java.util.List * @param userIdList + * @return java.util.List * @Author yinzuomei * @Description 根据userId集合查询用户注册信息 * @Date 2020/4/7 18:26 @@ -72,8 +72,8 @@ public interface UserResiInfoDao extends BaseDao { List selectListUserResiInfoDTO(@Param("userIdList") List userIdList); /** - * @Description 根据userId查询议题发起人 * @param formDTO + * @Description 根据userId查询议题发起人 * @author zxc * @date 2020/5/11 11:18 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index aa5b0f702c..ba9479c97b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.common.token.util.UserUtil; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.FieldConstant; @@ -33,6 +34,7 @@ import com.epmet.constant.UserRoleConstant; import com.epmet.dao.UserResiInfoDao; import com.epmet.dao.UserWechatDao; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.UserResiRegisterVisitDTO; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.IssueInitiatorResultDTO; @@ -164,8 +166,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl result = epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO); - if(!result.success()||null==result.getData()||StringUtils.isBlank(result.getData().getCode())){ + if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getCode())) { return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); } //4:删除缓存中可能存在的旧验证码 @@ -244,7 +248,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl list = userResiInfoDao.selectResiInfoByMobile(mobile); + List list = userResiInfoDao.selectResiInfoByMobile(mobile, customerId); if (list.size() > 0) { bl = false; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml index 724d49a68b..bd2712d4a6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml @@ -98,8 +98,11 @@ SELECT FROM user_resi_info uri - WHERE uri.del_flag = '0' - AND uri.reg_mobile = #{regMobile} + LEFT JOIN user_customer uc ON uri.USER_ID = uc.USER_ID + WHERE + uri.DEL_FLAG = '0' + AND uri.REG_MOBILE = #{regMobile,jdbcType=VARCHAR} + AND uc.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}