Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_thirdplatform

epmet-auth/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.56
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.57
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/form/mq/eventmsg/ActPointEventMsg.java

@@ -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;
-
-}

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;
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -85,6 +85,7 @@ public enum EpmetErrorCode {
     NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"),
 	NON_CERTIFIED_VOLUNTEER(8511, "活动报名失败，请先认证志愿者"),
     ACT_TIME_CONFLICT(8512, "报名失败。您本次报名活动时间与已报名活动时间间隔较短，为了不影响您已报名的活动，请选择其他时间的活动，谢谢。"),
+	ACT_REGISTRATION_SUCCESS(8513, "报名成功。"),
 
     // 该错误不会提示给前端，只是后端传输错误信息用。
     ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"),

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActRegistrationResultDTO.java

@@ -0,0 +1,27 @@
+package com.epmet.dto.result.resi;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 活动报名 - 返回值
+ *
+ * @Auther: zhangyong
+ * @Date: 2020-07-28 16:22
+ */
+@Data
+public class ResiActRegistrationResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 异常编码
+     */
+    private Integer flag;
+
+    /**
+     * 提示信息
+     */
+    private String tip;
+}

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<ActDraftContentDTOResultDTO> actContentList;
+    private List<ActDraftContentDTOResultDTO> actContent;
 }

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.5
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.8
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.5</version>
+    <version>0.0.8</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

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);
     }
 
-    //
-
     /**
      * 取消活动报名
      *
@@ -298,12 +294,12 @@ public class ResiActListController {
      *
      * @param tokenDto
      * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.resi.ResiActRegistrationResultDTO>
      * @Author zhangyong
-     * @Date 16:46 2020-07-23
+     * @Date 16:26 2020-07-28
      **/
     @PostMapping("registration")
-    public Result registration(@LoginUser TokenDto tokenDto, @RequestBody ResiActRegistrationFormDTO formDTO) {
+    public Result<ResiActRegistrationResultDTO> registration(@LoginUser TokenDto tokenDto, @RequestBody ResiActRegistrationFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ResiActRegistrationFormDTO.AddUserInternalGroup.class);
         return actUserRelationService.registration(tokenDto, formDTO);
     }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java

@@ -24,6 +24,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.ActUserRelationDTO;
 import com.epmet.dto.form.resi.ResiActRegistrationFormDTO;
 import com.epmet.dto.form.resi.ResiActUserCancelSignUpFormDTO;
+import com.epmet.dto.result.resi.ResiActRegistrationResultDTO;
 import com.epmet.entity.ActUserRelationEntity;
 import org.apache.ibatis.annotations.Param;
 
@@ -145,9 +146,9 @@ public interface ActUserRelationService extends BaseService<ActUserRelationEntit
      *
      * @param tokenDto
      * @param formDTO
-     * @return com.epmet.commons.tools.utils.Result
+     * @return com.epmet.commons.tools.utils.Result<java.util.Map<java.lang.Integer,java.lang.String>>
      * @Author zhangyong
-     * @Date 16:46 2020-07-23
+     * @Date 15:54 2020-07-28
      **/
-    Result registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO);
+    Result<ResiActRegistrationResultDTO> registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO);
 }

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<ActInfoDao, ActInfoEntit
             dto.setErrorTip("");
             return new Result<ResiActAddressResultDTO>().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<ResiActAddressResultDTO>().ok(dto);

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<ActLiveRecDao, ActLiv
 
                 List<Object> dataContainer = new ArrayList<>();
                 for (int k = 0; k < actLives.size(); k++) {
-                    Map<String, Object> base = new HashMap<>();
+                    Map<String, Object> 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<ActLiveRecDao, ActLiv
                 logger.error("未查到用户基础信息");
                 throw new RenException("未查到用户基础信息");
             }
+        } else {
+            resultDto.setActLives(new ArrayList<>());
+            resultDto.setActLiveNum(NumConstant.ZERO);
         }
         return new Result<ResiActLiveRecResultDTO>().ok(resultDto);
     }
@@ -221,13 +224,14 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
         mqBaseMsgDTO.setEventClass(EventEnum.ACTIVE_INSERT_LIVE.getEventClass());
         //事件code
         mqBaseMsgDTO.setEventTag(EventEnum.ACTIVE_INSERT_LIVE.getEventTag());
-        List<ActPointEventMsg> actPointEventMsgList=new ArrayList<>();
+        List<BasePointEventMsg> actPointEventMsgList=new ArrayList<>();
-        ActPointEventMsg actPointEventMsg=new ActPointEventMsg();
+        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));

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java

@@ -39,6 +39,7 @@ import com.epmet.dto.ActUserRelationDTO;
 import com.epmet.dto.form.resi.ResiActRegistrationFormDTO;
 import com.epmet.dto.form.resi.ResiActUserCancelSignUpFormDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
+import com.epmet.dto.result.resi.ResiActRegistrationResultDTO;
 import com.epmet.entity.ActUserLogEntity;
 import com.epmet.entity.ActUserRelationEntity;
 import com.epmet.entity.HeartUserInfoEntity;
@@ -54,10 +55,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 用户活动关系表
@@ -197,9 +195,10 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO) {
+    public Result<ResiActRegistrationResultDTO> registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
         boolean satisfy = false;
+        ResiActRegistrationResultDTO resultDTO = new ResiActRegistrationResultDTO();
         // 查询活动信息
         ActInfoDTO actInfoDTO = actInfoService.get(formDTO.getActId());
         // >0 当前用户是志愿者
@@ -207,15 +206,35 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         if (actInfoDTO.getVolunteerLimit()){
             // 活动只能志愿者参加, 当前用户是否满足条件
             satisfy = this.volunteerParticipationAct(volunteerFlag);
+            if (!satisfy){
+                logger.info(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getMsg());
+                resultDTO.setFlag(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getCode());
+                resultDTO.setTip(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getMsg());
+                return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
+            }
         } else {
             // 活动不限制志愿者身份，但要求是 居民身份, 当前用户是否满足条件
             satisfy = this.resiParticipationAct(formDTO.getUserId());
+            if (!satisfy){
+                logger.info(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg());
+                resultDTO.setFlag(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode());
+                resultDTO.setTip(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg());
+                return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
+            }
         }
         if (satisfy){
             // 开始报名
-            this.actStartSignUp(actInfoDTO, formDTO, volunteerFlag);
+            boolean actTimeConflict = this.actStartSignUp(actInfoDTO, formDTO, volunteerFlag);
+            if (!actTimeConflict){
+                logger.info(EpmetErrorCode.ACT_TIME_CONFLICT.getMsg());
+                resultDTO.setFlag(EpmetErrorCode.ACT_TIME_CONFLICT.getCode());
+                resultDTO.setTip(EpmetErrorCode.ACT_TIME_CONFLICT.getMsg());
+                return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
+            }
         }
-        return new Result();
+        resultDTO.setFlag(EpmetErrorCode.ACT_REGISTRATION_SUCCESS.getCode());
+        resultDTO.setTip(EpmetErrorCode.ACT_REGISTRATION_SUCCESS.getMsg());
+        return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
     }
 
     /**
@@ -228,7 +247,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
      * @Author zhangyong
      * @Date 15:31 2020-07-24
      **/
-    private void actStartSignUp(ActInfoDTO actInfoDTO, ResiActRegistrationFormDTO formDTO, Integer volunteerFlag){
+    private boolean actStartSignUp(ActInfoDTO actInfoDTO, ResiActRegistrationFormDTO formDTO, Integer volunteerFlag){
         boolean signUp = true;
         Integer auditingNum = actUserLogService.countActTimesOfParticipation(formDTO.getUserId());
         if (auditingNum > NumConstant.ZERO){
@@ -237,8 +256,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             Integer actTimeFlag = actInfoService.checkActTime(actInfoDTO);
             if (actTimeFlag > NumConstant.ZERO){
                 signUp = false;
-                logger.info("报名失败。您本次报名活动时间与已报名活动时间间隔较短，为了不影响您已报名的活动，请选择其他时间的活动，谢谢。");
+                return signUp;
-                throw new RenException(EpmetErrorCode.ACT_TIME_CONFLICT.getCode());
             }
         } else {
             // 3.第一次报名
@@ -249,7 +267,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             this.insertActUserLog(formDTO);
         }
         // 5.插入 用户活动关系表
-       this.insertActUserRelation(formDTO, actInfoDTO);
+        this.insertActUserRelation(formDTO, actInfoDTO);
+        return signUp;
     }
 
     /**
@@ -265,10 +284,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         if (volunteerFlag > NumConstant.ZERO){
             satisfy = true;
             return satisfy;
-        } else {
-            logger.info("活动报名失败，请先认证志愿者");
-            throw new RenException(EpmetErrorCode.NON_CERTIFIED_VOLUNTEER.getCode());
         }
+        return satisfy;
     }
 
     /**
@@ -289,12 +306,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
                 }
             }
         }
-        if (!satisfy){
+        return satisfy;
-            logger.info("活动报名失败，请完善居民信息");
-            throw new RenException(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode());
-        } else {
-            return satisfy;
-        }
     }
 
     /**

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<HeartUserInfoDao,
 
     @Override
     public Result<List<ResiLeaderboardResultDTO>> leaderboard(ResiActBaseFormDTO formDTO) {
-        List<ResiLeaderboardResultDTO> resultDTOS = new ArrayList<>();
+        List<ResiLeaderboardResultDTO> resultDtoS = new ArrayList<>();
         // 获取排好序的 排行榜
         List<HeartUserInfoDTO> leaderboardList = baseDao.selectListLeaderboard(formDTO);
         if (leaderboardList.size() > NumConstant.ZERO){
@@ -151,14 +151,14 @@ public class HeartUserInfoServiceImpl extends BaseServiceImpl<HeartUserInfoDao,
                             dto.setNickname(wx.getNickname());
                         }
                     }
-                    resultDTOS.add(dto);
+                    resultDtoS.add(dto);
                 }
             } else {
                 logger.info("查询用户基本信息接口返回失败");
                 throw new RenException("查询用户基本信息失败");
             }
         }
-        return new Result<List<ResiLeaderboardResultDTO>>().ok(resultDTOS);
+        return new Result<List<ResiLeaderboardResultDTO>>().ok(resultDtoS);
     }
 
     @Override

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;
@@ -33,7 +33,6 @@ import com.epmet.dao.VolunteerInfoDao;
 import com.epmet.dto.HeartUserInfoDTO;
 import com.epmet.dto.form.WxUserInfoFormDTO;
 import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO;
-import com.epmet.entity.ActUserRelationEntity;
 import com.epmet.entity.VolunteerInfoEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.redis.VolunteerInfoRedis;
@@ -103,8 +102,8 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         mqBaseMsgDTO.setEventClass(EventEnum.REGISTER_VOLUNTEER.getEventClass());
         //事件code
         mqBaseMsgDTO.setEventTag(EventEnum.REGISTER_VOLUNTEER.getEventTag());
-        List<ActPointEventMsg> actPointEventMsgList=new ArrayList<>();
+        List<BasePointEventMsg> actPointEventMsgList=new ArrayList<>();
-        ActPointEventMsg actPointEventMsg=new ActPointEventMsg();
+        BasePointEventMsg actPointEventMsg=new BasePointEventMsg();
         actPointEventMsg.setCustomerId(formDTO.getCustomerId());
         actPointEventMsg.setUserId(formDTO.getUserId());
         actPointEventMsg.setActionFlag(MqConstant.PLUS);

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<ActDraftContentDTOResultDTO> actContentList=latestActContentService.selectActContentList(latestAct.getActDraftId());
-                latestAct.setActContentList(actContentList);
+                latestAct.setActContent(actContentList);
             }
             return latestAct;
         }else{

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -3,11 +3,10 @@ package com.epmet.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.tools.constant.AppClientConstant;
-import com.epmet.commons.tools.constant.FieldConstant;
 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;
@@ -122,8 +121,9 @@ public class WorkActServiceImpl implements WorkActService {
               sponsorResultDTO.setAgencyGridList(ConvertUtils.sourceToTarget(result.getData().getAgencyGridList(), Grid.class));
               return sponsorResultDTO;
           }
+        }else{
+            logger.error("当前用户id获取为空");
         }
-        logger.error("当前用户id获取为空");
         return null;
     }
 
@@ -687,13 +687,13 @@ public class WorkActServiceImpl implements WorkActService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void saveActualTime(SaveActualTimeFormDTO formDTO) {
-        if(formDTO.getActualStartTime().compareTo(formDTO.getActualEndTime())!=-1){
+        Date actualStartTime= DateUtils.minStrToSecondDate(formDTO.getActualStartTime());
+        Date actualEndTime= DateUtils.minStrToSecondDate(formDTO.getActualEndTime());
+        if(actualStartTime.compareTo(actualEndTime)!=-1){
             throw new RenException(EpmetErrorCode.ACT_ACTUAL_START_TIME_ERROR.getCode());
         }
         ActInfoDTO actInfoDTO=actInfoService.get(formDTO.getActId());
-        Date actualStartTime= DateUtils.minStrToSecondDate(formDTO.getActualStartTime());
         actInfoDTO.setActualStartTime(actualStartTime);
-        Date actualEndTime= DateUtils.minStrToSecondDate(formDTO.getActualEndTime());
         actInfoDTO.setActualEndTime(actualEndTime);
         actInfoDTO.setServiceMin(DateUtils.calculateMin(actualStartTime,actualEndTime));
         actInfoService.update(actInfoDTO);
@@ -778,7 +778,7 @@ public class WorkActServiceImpl implements WorkActService {
     private void grantActPoints(ActInfoDTO actInfoDTO) {
         //查询已经给分的用户
         QueryWrapper<ActUserRelationEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(actInfoDTO.getId()), FieldConstant.ID, actInfoDTO.getId())
+        wrapper.eq(StringUtils.isNotBlank(actInfoDTO.getId()), "ACT_ID", actInfoDTO.getId())
         .eq("PROCESS_FLAG",ActConstant.HANDLED)
         .eq("REWARD_FLAG",ActConstant.ACT_USER_STATUS_AGREE);
         List<ActUserRelationEntity> actUserRelationEntityList=actUserRelationDao.selectList(wrapper);
@@ -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<ActPointEventMsg> actPointEventMsgList=new ArrayList<>();
+        List<BasePointEventMsg> basePointEventMsgArrayList=new ArrayList<>();
         for(ActUserRelationEntity actUserRelationEntity:actUserRelationEntityList){
-            ActPointEventMsg actPointEventMsg=new ActPointEventMsg();
+            BasePointEventMsg basePointEventMsg=new BasePointEventMsg();
-            actPointEventMsg.setOpAgencyId(opAgencyId);
+            basePointEventMsg.setOpAgencyId(opAgencyId);
-            actPointEventMsg.setCustomerId(actInfoDTO.getCustomerId());
+            basePointEventMsg.setCustomerId(actInfoDTO.getCustomerId());
-            actPointEventMsg.setUserId(actUserRelationEntity.getUserId());
+            basePointEventMsg.setUserId(actUserRelationEntity.getUserId());
-            actPointEventMsg.setActionFlag(MqConstant.PLUS);
+            basePointEventMsg.setActionFlag(MqConstant.PLUS);
-            actPointEventMsg.setPoint(actInfoDTO.getReward());
+            basePointEventMsg.setPoint(actInfoDTO.getReward());
-            actPointEventMsg.setIsCommon(true);
+            basePointEventMsg.setIsCommon(true);
-            actPointEventMsg.setRemark(remark);
+            basePointEventMsg.setRemark(remark);
-            actPointEventMsgList.add(actPointEventMsg);
+            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("活动积分发放失败");

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
@@ -391,12 +391,12 @@
             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, -- 已报名人数
             i.REWARD reward,
             i.REQUIREMENT requirement,
-            IF(i.VOLUNTEER_LIMIT = 1, true , false ) as volunteerLimit, -- 是否是志愿者（true：只有志愿者才可以参加活动1，false: 只要是居民就可以参加活动0）
+            i.VOLUNTEER_LIMIT volunteerLimit, -- 是否是志愿者（true：只有志愿者才可以参加活动1，false: 只要是居民就可以参加活动0）
             i.SPONSOR_NAME sponsor,
             DATE_FORMAT(i.ACTUAL_START_TIME,'%Y-%m-%d %H:%i') actualStartTime,
             DATE_FORMAT(i.ACTUAL_END_TIME,'%Y-%m-%d %H:%i') actualEndTime,
@@ -420,7 +420,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,
             i.SPONSOR_CONTACTS contacts,
             i.SPONSOR_TEL tel,

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml

@@ -3,7 +3,7 @@ services:
   epmet-oss-server:
     container_name: epmet-oss-server-test
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:0.3.23
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-oss-server:0.3.24
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络

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
      */

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointVerificationFormDTO.java

@@ -44,10 +44,12 @@ public class PointVerificationFormDTO implements Serializable {
     @NotBlank(message = "当前工作人员Id不能为空", groups =  PointVerificationGroup.class)
     private String operatorId;
 
-
+    @NotBlank(message = "缺失经度信息" , groups = PointVerificationGroup.class)
     private String longitude;
 
+    @NotBlank(message = "缺失维度信息" , groups = PointVerificationGroup.class)
     private String dimension;
 
+    @NotBlank(message = "缺失地址信息" , groups = PointVerificationGroup.class)
     private String address;
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/WorkPointVerificationFormDTO.java

@@ -26,7 +26,7 @@ public class WorkPointVerificationFormDTO implements Serializable {
     private String timeParam;
 
     @Min(1)
-    private Integer pageNo;
+    private Integer pageNo = 1;
 
-    private Integer pageSize;
+    private Integer pageSize = 20;
 }

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;
+
 }

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.4
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.6
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.4</version>
+    <version>0.0.6</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/AdjustmentController.java

@@ -1,10 +1,13 @@
 package com.epmet.controller;
 
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.CustomerUserFormDTO;
 import com.epmet.dto.form.IssueInitiatorFormDTO;
+import com.epmet.dto.form.PointAdjustmentFormDTO;
 import com.epmet.dto.result.CustomerUser4PointResultDTO;
 import com.epmet.dto.result.CustomerUserDetailResultDTO;
 import com.epmet.dto.result.PointAdjustmentResultDTO;
@@ -69,5 +72,21 @@ public class AdjustmentController {
         ValidatorUtils.validateEntity(param, IssueInitiatorFormDTO.UserIdGroup.class);
         return new Result<List<PointAdjustmentResultDTO>>().ok(pointAdjustmentLogService.adjustRecord(param));
     }
+
+    /**
+     * @Description 积分调整
+     * @param param
+     * @return
+     * @author wangc
+     * @date 2020.07.27 13:52
+     **/
+    @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();
+    }
 }
 

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ExchangeController.java

@@ -1,5 +1,16 @@
 package com.epmet.controller;
 
+import com.epmet.common.token.annotation.Login;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dto.form.PointVerificationFormDTO;
+import com.epmet.dto.result.PointVerificationResultDTO;
+import com.epmet.service.PointVerificationLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -12,5 +23,22 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("work/exchange")
 public class ExchangeController {
 
+    @Autowired
+    private PointVerificationLogService pointVerificationLogService;
+
+    /**
+     * @Description 积分核销
+     * @param verificationParam
+     * @return
+     * @author wangc
+     * @date 2020.07.27 14:03
+     **/
+    @PostMapping("execute")
+    public Result<PointVerificationResultDTO> execute(@LoginUser TokenDto token, @RequestBody PointVerificationFormDTO verificationParam){
+        verificationParam.setOperatorId(token.getUserId());
+        ValidatorUtils.validateEntity(verificationParam, PointVerificationFormDTO.PointVerificationGroup.class);
+        return new Result<PointVerificationResultDTO>().ok(pointVerificationLogService.verifyPoint(verificationParam));
+    }
+
 
 }

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());

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointVerificationLogDao.java

@@ -54,5 +54,5 @@ public interface PointVerificationLogDao extends BaseDao<PointVerificationLogEnt
      * @author wangc
      * @date 2020.07.25 13:17
     **/
-    List<WorkPointVerificationLogResultDTO> selectStaffVerificationLog(String staffId, Date startDate, Date endDate);
+    List<WorkPointVerificationLogResultDTO> selectStaffVerificationLog(@Param("staffId") String staffId, @Param("startDate") Date startDate,@Param("endDate") Date endDate);
 }

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"，但是不会生成核销记录，核销记录只保存用户使用积分兑换商品的核销详情

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<UserPointActionLo
     **/
     List<ResiPointLogListResultDTO> getMyPointRecord(CommonPageUserFormDTO pageUser);
 
+    /**
+     * @Description 消息网关回调进行积分发放
+     * @param grantPointParam
+     * @return
+     * @author wangc
+     * @date 2020.07.29 09:11
+    **/
+    void grantPoint(SendPointFormDTO grantPointParam);
 
 }

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<PointAdjustme
         if(null == param.getPoint()) throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         Date currentTime = new Date();
         Integer point = param.getPoint();
-        if(StringUtils.equals(ModuleConstant.OPERATION_TYPE_MINUS,param.getAdjustmentType())){
+        if(StringUtils.equals(ModuleConstant.OPERATION_TYPE_MINUS,param.getAdjustmentType()) || param.getAdjustmentType().toLowerCase().contains("m")){
             if(point > NumConstant.ZERO){
                 point *= NumConstant.ONE_NEG;
             }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java

@@ -185,11 +185,24 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
 
         try{
             Date date = format.parse(verificationParam.getTimeParam());
+            if(NumConstant.ONE < verificationParam.getPageNo()){
+                PageHelper.startPage(verificationParam.getPageNo(),verificationParam.getPageSize());
+            }
             List<WorkPointVerificationLogResultDTO> dataList =
                 baseDao.selectStaffVerificationLog(verificationParam.getStaffId(),getFirstDayDateOfMonth(date),getLastDayOfMonth(date));
-            result.setTotalPoint(
+            if(NumConstant.ONE < verificationParam.getPageNo()){
-                    dataList.stream().mapToInt(o -> o.getPoint()).sum()
+                result.setTotalPoint(
-            );
+                        dataList.stream().mapToInt(o -> o.getPoint()).sum()
+                );
+            }else{
+                int fromIndex = verificationParam.getPageNo() * verificationParam.getPageSize();
+                int toIndex = (verificationParam.getPageNo() + 1) * verificationParam.getPageSize();
+                if(toIndex > dataList.size()) {
+                    toIndex = dataList.size();
+                }
+                dataList = dataList.subList(fromIndex,toIndex);
+            }
+
             List<String> userIds = dataList.stream().map(data -> data.getUserId()).collect(Collectors.toList());
             Result<List<UserBaseInfoResultDTO>> userInfo =
                 epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
@@ -223,7 +236,8 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public PointVerificationResultDTO verifyPoint(PointVerificationFormDTO verificationParam) {
-        Date currentTime = new Date();
+
+        DimIdGenerator.DimIdBean dim = DimIdGenerator.getDimIdBean(new Date());
         PointVerificationResultDTO result = new PointVerificationResultDTO();
         ResiCommonUserIdFormDTO userId = new ResiCommonUserIdFormDTO();
         userId.setUserId(verificationParam.getUserId());
@@ -247,7 +261,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
 
         String agencyId = ModuleConstant.EMPTY_STR;
         String operatorName = ModuleConstant.EMPTY_STR;
-        PointVerificationStatisticalDailyEntity statistical = new  PointVerificationStatisticalDailyEntity();
+        PointVerificationStatisticalDailyEntity statistical = new PointVerificationStatisticalDailyEntity();
         if(staffResult.success() && null != staffResult.getData()){
             statistical = ConvertUtils.sourceToTarget(staffResult.getData(),PointVerificationStatisticalDailyEntity.class);
             customerId = staffResult.getData().getCustomerId();
@@ -257,6 +271,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
 
         //1.记录积分行为日志 - 居民端
         UserPointActionLogEntity action = new UserPointActionLogEntity();
+        action.setCustomerId(customerId);
         action.setCreatedBy(verificationParam.getOperatorId());
         action.setUserId(verificationParam.getUserId());
         action.setActionFlag(ModuleConstant.OPERATION_TYPE_MINUS);
@@ -278,7 +293,7 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
         verificationLog.setAddress(verificationParam.getAddress());
         pointVerificationLogDao.insert(verificationLog);
         //3.记录积分日统计表
-        DimIdGenerator.DimIdBean dim = DimIdGenerator.getDimIdBean(currentTime);
+
         UserPointStatisticalDailyEntity userStatistical = ConvertUtils.sourceToTarget(dim,UserPointStatisticalDailyEntity.class);
         userStatistical.setUserId(verificationParam.getUserId());
         userStatistical.setActionFlag(ModuleConstant.OPERATION_TYPE_EXCHANGE);
@@ -287,6 +302,11 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl<PointVerifi
         userPointStatisticalDailyService.insertOrUpdate(userStatistical);
         //4.记录积分核销日统计 - 政府端
         statistical.setVerificatedPoint(point * NumConstant.ONE_NEG);
+        statistical.setDateId(dim.getDateId());
+        statistical.setWeekId(dim.getWeekId());
+        statistical.setMonthId(dim.getMonthId());
+        statistical.setQuarterId(dim.getQuarterId());
+        statistical.setYearId(dim.getYearId());
         pointVerificationStatisticalDailyService.insertOrUpdate(statistical);
         //5.更新用户总积分表
         UserPointTotalEntity userPoint = new UserPointTotalEntity();

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

@@ -20,6 +20,8 @@ package com.epmet.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.enums.EventEnum;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -29,10 +31,18 @@ import com.epmet.dto.form.CommonPageUserFormDTO;
 import com.epmet.dto.result.ResiPointLogListResultDTO;
 import com.epmet.dto.result.ResiPointLogPeriodResultDTO;
 import com.epmet.entity.UserPointActionLogEntity;
+import com.epmet.entity.UserPointStatisticalDailyEntity;
+import com.epmet.entity.UserPointTotalEntity;
 import com.epmet.service.UserPointActionLogService;
+import com.epmet.service.UserPointStatisticalDailyService;
+import com.epmet.service.UserPointTotalService;
+import com.epmet.utils.DimIdGenerator;
+import com.epmet.utils.ModuleConstant;
 import com.github.pagehelper.PageHelper;
 import com.google.common.collect.Maps;
+import dto.form.SendPointFormDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -48,6 +58,10 @@ import java.util.stream.Collectors;
 @Service
 public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActionLogDao, UserPointActionLogEntity> implements UserPointActionLogService {
 
+    @Autowired
+    private UserPointTotalService userPointTotalService;
+    @Autowired
+    private UserPointStatisticalDailyService userPointStatisticalDailyService;
 
     @Override
     public PageData<UserPointActionLogDTO> page(Map<String, Object> params) {
@@ -131,4 +145,62 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         return result;
     }
 
+    /**
+     * @Description 消息网关回调进行积分发放
+     * @param grantPointParam
+     * @return
+     * @author wangc
+     * @date 2020.07.29 09:11
+     **/
+    @Override
+    public void grantPoint(SendPointFormDTO grantPointParam){
+        if(StringUtils.equals(ModuleConstant.OPERATION_TYPE_MINUS,grantPointParam.getActionFlag())){
+            //减
+            if(grantPointParam.getPoint() > 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);
+    }
+
 }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java

@@ -147,19 +147,24 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         List<ResiPointRankResultDTO> rankList =
             baseDao.selectPointRankWithinTimeZone(pointRankFormDTO.getCustomerId(),pointRankFormDTO.getTimeDimension(),dimVal);
         if(null == rankList || rankList.isEmpty()){
-            o.setMyPoint(NumConstant.ZERO);
+            if(NumConstant.ONE < pointRankFormDTO.getPageNo()){
-            o.setMyRanking(NumConstant.ZERO);
+                return result;
-
+            }else {
-            return result;
+                o.setMyPoint(NumConstant.ZERO);
+                o.setMyRanking(NumConstant.ZERO);
+                result.add(o);
+                return result;
+            }
         }
         //如果请求的是第一页
         if(NumConstant.ONE == pointRankFormDTO.getPageNo()) {
-            ResiPointRankResultDTO myself =
+            ResiPointRankResultDTO myself = null;
-                    rankList.stream().filter(obj -> StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst().get();
+            Optional<ResiPointRankResultDTO> opt = rankList.stream().filter(obj -> StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst();
-            if (null != myself) {
+            if(opt.isPresent()){
+                myself = opt.get();
                 o.setMyPoint(myself.getTotalPoint());
                 o.setMyRanking(myself.getRank());
-            } else {
+            }else{
                 o.setMyPoint(NumConstant.ZERO);
                 if (rankList.get(rankList.size() - NumConstant.ONE).getTotalPoint() > NumConstant.ZERO) {
                     o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank() + NumConstant.ONE);
@@ -167,8 +172,9 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
                     o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank());
                 }
             }
-            int fromIndex = pointRankFormDTO.getPageNo() * pointRankFormDTO.getPageSize();
+
-            int toIndex = (pointRankFormDTO.getPageNo() + 1) * pointRankFormDTO.getPageSize();
+            int fromIndex = (pointRankFormDTO.getPageNo() - 1) * pointRankFormDTO.getPageSize();
+            int toIndex = pointRankFormDTO.getPageNo() * pointRankFormDTO.getPageSize();
             if(toIndex > rankList.size()) {
                 toIndex = rankList.size();
             }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java

@@ -156,29 +156,34 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
                 baseDao.selectUserPointRank(pointRankFormDTO.getCustomerId());
         //当排行榜没有数据时
         if(null == rankList || rankList.isEmpty()){
-            o.setMyPoint(NumConstant.ZERO);
+            if(NumConstant.ONE < pointRankFormDTO.getPageNo()){
-            o.setMyRanking(NumConstant.ZERO);
+                return result;
-
+            }else {
-            result.add(o);
+                o.setMyPoint(NumConstant.ZERO);
-            return result;
+                o.setMyRanking(NumConstant.ZERO);
+
+                result.add(o);
+                return result;
+            }
         }
         //如果当前请求不是第一页
         if(NumConstant.ONE == pointRankFormDTO.getPageNo()) {
-            ResiPointRankResultDTO myself =
+            ResiPointRankResultDTO myself = null;
-                    rankList.stream().filter(obj -> StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst().get();
+            Optional<ResiPointRankResultDTO> opt = rankList.stream().filter(obj -> StringUtils.equals(obj.getUserId(), pointRankFormDTO.getUserId())).findFirst();
-            if (null != myself) {
+            if(opt.isPresent()){
+                myself = opt.get();
                 o.setMyPoint(myself.getTotalPoint());
                 o.setMyRanking(myself.getRank());
             } else {
-
                 if (rankList.get(rankList.size() - NumConstant.ONE).getTotalPoint() > NumConstant.ZERO) {
                     o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank() + NumConstant.ONE);
                 } else {
                     o.setMyRanking(rankList.get(rankList.size() - NumConstant.ONE).getRank());
                 }
             }
-            int fromIndex = pointRankFormDTO.getPageNo() * pointRankFormDTO.getPageSize();
+
-            int toIndex = (pointRankFormDTO.getPageNo() + 1) * pointRankFormDTO.getPageSize();
+            int fromIndex = (pointRankFormDTO.getPageNo() - 1) * pointRankFormDTO.getPageSize();
+            int toIndex = pointRankFormDTO.getPageNo()  * pointRankFormDTO.getPageSize();
             if(toIndex > rankList.size()) {
                 toIndex = rankList.size();
             }
@@ -218,7 +223,7 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
     @Override
     public void insertOrUpdate(UserPointTotalEntity entity) {
         UserPointTotalEntity existed = baseDao.selectIfExisted(entity.getUserId());
-        if(null != existed && StringUtils.isBlank(existed.getId())){
+        if(null != existed && StringUtils.isNotBlank(existed.getId())){
             existed.setUsedPoint(null == existed.getUsedPoint() ? entity.getUsedPoint() : entity.getUsedPoint() + existed.getUsedPoint());
             existed.setUsablePoint(null == existed.getUsablePoint() ? entity.getUsablePoint() : entity.getUsablePoint() + existed.getUsablePoint());
             existed.setTotalPoint(null == existed.getTotalPoint() ? entity.getTotalPoint() : entity.getTotalPoint() + existed.getTotalPoint());

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdjustmentLogDao.xml

@@ -27,7 +27,7 @@
             adjust_reason AS reason,
             DATE_FORMAT( created_time, '%Y-%m-%d %H:%i:%s' ) AS date,
         CASE
-            action_flag
+            ADJUSTMENT_TYPE
             WHEN 'plus' THEN
             CONCAT( '+', POINT ) ELSE CONCAT( '-', POINT )
             END AS POINT

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml

@@ -9,6 +9,7 @@
         <result property="customerId" column="CUSTOMER_ID"/>
         <result property="actionFlag" column="ACTION_FLAG"/>
         <result property="eventId" column="EVENT_ID"/>
+        <result property="sourceId" column="SOURCE_ID" />
         <result property="eventStatement" column="EVENT_STATEMENT"/>
         <result property="eventName" column="EVENT_NAME"/>
         <result property="point" column="POINT"/>

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointStatisticalDailyDao.xml

@@ -25,38 +25,42 @@
     <!--  查询客户下周/月度用户积分排行榜 传参：客户Id | 维度 | 维度值 -->
     <!-- user_point_statistical_daily中的action_flag有三种key值，plus(获取)，exchange(积分兑换)，minus(调整、惩罚)，当action_flag为minus时,point_change为负值，其余均为正数 -->
     <select id="selectPointRankWithinTimeZone" resultType="com.epmet.dto.result.ResiPointRankResultDTO">
-        SELECT
+        SELECT IF ( @point > point.TOTAL_POINT,
-        IF
+        @rank := @rank + 1,
-            ( @point > point.TOTAL_POINT, @rank := @rank + 1, @rank := @rank + 0 ) AS rank,
+        @rank := @rank + 0
-            point.user_id,
+        ) AS rank,
-            point.TOTAL_POINT,
+        point.user_id,
-            -- CASE WHEN point.TOTAL_POINT <![CDATA[>=]]> 0 THEN point.TOTAL_POINT ELSE 0 END AS totalPoint,
+        point.TOTAL_POINT,
-            @point := point.TOTAL_POINT
+        @point := point.TOTAL_POINT
         FROM
-            (
+        (
         SELECT
-            USER_ID,
+        total.USER_ID,
-            SUM( POINT_CHANGE ) AS TOTAL_POINT
+        IFNULL( SUM( daily.POINT_CHANGE ), 0 ) AS POINT_CHANGE,
+        IF
+        ( POINT_CHANGE <![CDATA[ < ]]> 0, 0, IFNULL( SUM( daily.POINT_CHANGE ), 0 ) ) AS TOTAL_POINT
         FROM
-            user_point_statistical_daily
+        user_point_total total
+        LEFT JOIN user_point_statistical_daily daily ON daily.USER_ID = total.USER_ID
+        AND daily.DEL_FLAG = '0'
+        AND daily.USER_ID = total.USER_ID
+        AND daily.CUSTOMER_ID = #{customerId}
+        <if test='dimension == "week"'>
+            AND daily.WEEK_ID = #{dimensionId}
+        </if>
+        <if test='dimension == "month"'>
+            AND daily.MONTH_ID = #{dimensionId}
+        </if>
+        AND ( daily.ACTION_FLAG = 'plus' OR daily.ACTION_FLAG = 'minus' )
         WHERE
-            DEL_FLAG = '0'
+        total.DEL_FLAG = '0'
-            AND CUSTOMER_ID = #{customerId}
+        AND total.DEL_FLAG = '0'
-            <if test='dimension == "week"'>
-                AND WEEK_ID = #{dimensionId}
-            </if>
-            <if test='dimension == "month"'>
-                AND MONTH_ID = #{dimensionId}
-            </if>
-            AND ACTION_FLAG = 'plus'
-            OR   ACTION_FLAG = 'minus'
-
         GROUP BY
-            USER_ID
+        total.USER_ID
         ORDER BY
-            TOTAL_POINT DESC
+        TOTAL_POINT DESC
-            ) point,
+        ) point,
-            ( SELECT @point := NULL, @rank := 1 ) a
+        ( SELECT @point := NULL, @rank := 1 ) a
     </select>
 
     <!-- 查询有无指定日期的积分日统计 userId dateId actionFlag-->

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointTotalDao.xml

@@ -48,7 +48,7 @@
     <select id="selectIfExisted" resultType="com.epmet.entity.UserPointTotalEntity">
         SELECT
             ID,
-            USERD_POINT,
+            USED_POINT,
             USABLE_POINT,
             TOTAL_POINT
         FROM

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.72
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.75
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.65
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.72
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.72</version>
+    <version>0.0.75</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-mine-server:
     container_name: gov-mine-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.32
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.33
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.77
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.80
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.76
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.77
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

epmet-module/gov-org/gov-org-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.77</version>
+    <version>0.3.80</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -154,8 +154,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             //cx代表市
             //yz代表区
             map.put("areaCode",areaCode);
-            map.put("cityCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.TWO));
+            //map.put("cityCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.TWO));
-            map.put("provinceCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.FOUR));
+            //map.put("provinceCode",areaCode.substring(NumConstant.ZERO,areaCode.length()-NumConstant.FOUR));
             map.put("pageSize",listCustomerGridFormDTO.getPageSize());
             map.put("pageNo",listCustomerGridFormDTO.getPageNo());
 

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -65,7 +65,7 @@
 
         SELECT c.*
         FROM
-        (
+
 
         (
         SELECT
@@ -98,52 +98,10 @@
         a.area_code = #{areaCode}
         ORDER BY
           CONVERT ( gridName USING gbk ) ASC
-        LIMIT 0,999999999999
-
-        )
-
-        UNION
-
-        (
-        SELECT
-        b.id AS grid_id,
-        b.customer_id,
-        concat(agency.fullname , '-' ,b.grid_name) as gridName
-        FROM
-        CUSTOMER_GRID b
-
-
-        LEFT JOIN (
-        SELECT
-        a1.id,
-        CASE
-
-        WHEN a2.ORGANIZATION_NAME IS NULL THEN
-        a1.ORGANIZATION_NAME ELSE concat( a2.ORGANIZATION_NAME, '-', a1.ORGANIZATION_NAME )
-        END AS fullname
-        FROM
-        customer_agency a1
-        LEFT JOIN customer_agency a2 ON a1.PID = a2.ID
-        AND a1.del_flag = '0'
-        WHERE
-        a1.del_flag = '0'
-        ) agency ON b.PID = agency.ID
-
 
+        ) c
 
-        WHERE
-        b.del_flag = 0
-        AND
-        b.area_code LIKE CONCAT(#{cityCode},'%')
 
-        AND  <![CDATA[ b.area_code <> #{areaCode}
-                ]]>
-        ORDER BY
-        	b.area_code DESC ,CONVERT ( gridName USING gbk ) ASC
-        LIMIT 0,999999999999
-
-        )
-        ) AS c
         LIMIT #{pageNo}, #{pageSize}
 
     </select>

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerStaffAgencyDao.xml

@@ -121,7 +121,7 @@
     <select id="selectActSponsorGrid" resultType="com.epmet.dto.result.ActSponsorGridInfo" parameterType="java.lang.String">
         SELECT
             csg.GRID_ID,
-            CONCAT( ca.ORGANIZATION_NAME, '-', cg.GRID_NAME ) AS agencyGridName,
+            CONCAT( ca.ORGANIZATION_NAME, '-', cg.GRID_NAME ) AS agencyGridName
         FROM
             customer_staff_grid csg
             LEFT JOIN customer_grid cg ON ( csg.GRID_ID = cg.ID AND cg.DEL_FLAG = '0' )

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;
 
     /**

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.59
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.62
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

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);
 		}
 	}

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftDao.java

@@ -75,10 +75,11 @@ public interface DraftDao extends BaseDao<DraftEntity> {
 
     /**
      * 草稿列表
-     * @author zhaoqifeng
+     *
-     * @date 2020/6/3 14:54
      * @param userId
      * @return java.util.List<com.epmet.dto.result.DraftListResultDTO>
+     * @author zhaoqifeng
+     * @date 2020/6/3 14:54
      */
     List<DraftListResultDTO> selectDraftList(@Param("userId") String userId);
 
@@ -102,5 +103,13 @@ public interface DraftDao extends BaseDao<DraftEntity> {
 
     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);
 }

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;
 
     /**

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;
 
     /**

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java

@@ -200,12 +200,14 @@ public interface ArticleService extends BaseService<ArticleEntity> {
 	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:人工发布文章 不走审核接口

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<ArticleDao, ArticleEntit
 
 		if (!isOk) {
 			this.sendMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
-			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
+			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null);
 			return null;
 		}
 		SyncScanResult result = null;
 		try {
 			TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
 			ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
+
+			TextTaskDTO titleTextTask = new TextTaskDTO();
+			titleTextTask.setDataId(ModuleConstant.SCAN_TITLE_PREFIX.concat(StrConstant.UNDER_LINE).concat(draftEntity.getId()));
+			titleTextTask.setContent(draftEntity.getTitle());
+			textScanParamDTO.getTasks().add(titleTextTask);
+
 			DraftCoverDTO draftCoverDTO = draftCoverDao.selectCoverIdAndUrlByDraftId(draftId);
 			if (draftCoverDTO != null) {
 				ImgTaskDTO taskDTO = new ImgTaskDTO();
@@ -1021,7 +1027,6 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 				}
 			}
 
-
 			result = new SyncScanResult();
 			if (imgSyncScanResult != null) {
 				SyncScanResult imgSyncScanResultData = imgSyncScanResult.getData();
@@ -1042,7 +1047,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		} catch (Exception e) {
 			log.error("scanContent exception", e);
 			this.sendMsg(draftEntity.getCustomerId(), draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
-			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
+			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null);
 		}
 		log.debug("scanContent result:{}", JSON.toJSONString(result));
 		return result;
@@ -1092,18 +1097,21 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
 		}
 		if (syncScanResult.isAllPass()) {
-			this.updateDraftPublishStatus(draftId, DraftConstant.PUBLISHED);
+			this.updateDraftPublishStatus(draftId, DraftConstant.PUBLISHED, null);
 		} else {
-			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
+			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL, null);
 		}
 
-		boolean coverFail = false, contentFail = false;
+		boolean coverFail = false, contentFail = false, titleFail = false;
 		try {
 			List<String> 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<ArticleDao, ArticleEntit
 			successDataIds.forEach(id -> {
 				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<ArticleDao, ArticleEntit
 	}
 
 	@Override
-	public void updateDraftPublishStatus(String draftId, String statusFlag) {
+	public void updateDraftPublishStatus(String draftId, String statusFlag, String titleAuditStatus) {
-		draftDao.updateAuditStatusById(draftId, statusFlag);
+		draftDao.updateAuditStatusById(draftId, statusFlag, titleAuditStatus);
 	}
 
 	@Override
@@ -1164,7 +1182,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		try {
 			//校验草稿状态 并更新为已发布
 			DraftEntity draftEntity = checkDraftStatus(draftId);
-			this.updateDraftPublishStatus(draftId, DraftConstant.PUBLISHED);
+			this.updateDraftPublishStatus(draftId, DraftConstant.PUBLISHED, null);
 			//复制 草稿到文章（草稿内容，封面，属性）
 			ArticleEntity articleEntity = this.publishDraftToArticle(draftEntity, ArticleConstant.PUBLISH_WAY_MANUAL);
 			UpdateCustomerTagCacheDTO updateCustomerTagCacheDTO = this.updateCustomerTag(tokenDto, draftId);

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/utils/ModuleConstant.java

@@ -66,22 +66,27 @@ public interface ModuleConstant {
 
     /**
      * 草稿未找到异常模板
-     * */
+     */
     String SPECIFIED_DRAFT_NOT_FOUNT_EXCEPTION_TEMPLATE = "未找到指定草稿，草稿Id：【%s】";
 
     /**
      * 内容审核 封面图片前缀，用于标识这个Id是封面图片
-     * */
+     */
     String SCAN_COVER_PREFIX = "cover_";
 
+    /**
+     * 内容审核 标题前缀，用于标识这个Id是标题
+     */
+    String SCAN_TITLE_PREFIX = "title_";
+
     /**
      * 文章站内消息标题
-     * */
+     */
     String MSG_TITLE = "您有一条文章【%s】的消息";
 
     /**
      * 文章未审核通过 消息内容模版
-     * */
+     */
     String MSG_AUDIT_CONTENT = "您好，您发布的【%s】文章%s审核未通过，请重新编辑后发布，谢谢。";
 
     /**
@@ -116,11 +121,15 @@ public interface ModuleConstant {
 
     String DRAFT_ID_IS_NULL = "草稿ID不能为空";
 
+    String DRAFT_TITLE_CONTENT_AND_COVER = "标题、内容和封面";
+    String DRAFT_TITLE_AND_COVER = "标题和封面";
+    String DRAFT_TITLE_AND_CONTENT = "标题和内容";
     String DRAFT_CONTENT_AND_COVER = "内容和封面";
 
     String DRAFT_CONTENT = "内容";
 
     String DRAFT_COVER = "封面";
+    String DRAFT_TITLE = "标题";
 
     String DRAFT_CONTENT_IS_NULL = "文章封面不能为空";
 

epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__addAutoPublish.sql

@@ -1,2 +1,6 @@
 ALTER TABLE `epmet_gov_voice`.`article`
-ADD COLUMN `PUBLISH_WAY` varchar(16) NOT NULL DEFAULT 'autoAudit' COMMENT '发布方式 自动审核后发布：autoAudit;人工确认无误发布(不审核)：manualNoAudit' AFTER `TAGS`;
+ADD COLUMN `PUBLISH_WAY` varchar(16) NOT NULL DEFAULT 'autoAudit' COMMENT '发布方式 自动审核后发布：autoAudit;人工确认无误发布(不审核)：manualNoAudit' AFTER `TAGS`;
+ALTER TABLE `epmet_gov_voice`.`draft`
+ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`;
+ALTER TABLE `epmet_gov_voice`.`article`
+ADD COLUMN `TITLE_AUDIT_STATUS` varchar(32) NULL COMMENT '标题审核状态 通过:pass；失败:fail；审核中：auditing' AFTER `TITLE`;

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml

@@ -155,6 +155,7 @@
         SELECT
             d.id AS draft_id,
             d.TITLE,
+            d.TITLE_AUDIT_STATUS,
             d.PUBLISHER_NAME,
             d.PUBLISH_DATE,
             0 AS visit_record_count,
@@ -185,6 +186,15 @@
         update draft set DEL_FLAG='1' where id=#{draftId}
     </update>
     <update id="updateAuditStatusById">
-         update draft set STATUS_FLAG =#{statusFlag,jdbcType=VARCHAR} where id=#{draftId,jdbcType=VARCHAR}
+        update draft
+        <set>
+            <if test="titleAuditStatus != null and titleAuditStatus!= ''">
+                STATUS_FLAG =#{statusFlag,jdbcType=VARCHAR}
+            </if>
+            <if test="titleAuditStatus != null and titleAuditStatus!= ''">
+                TITLE_AUDIT_STATUS = #{titleAuditStatus,jdbcType=VARCHAR}
+            </if>
+        </set>
+        where id=#{draftId,jdbcType=VARCHAR}
     </update>
 </mapper>

epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-customize-server:
     container_name: oper-customize-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.23
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-customize-server:0.3.24
     ports:
       - "8089:8089"
     network_mode: host # 使用现有网络

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;

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 # 使用现有网络

epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.29
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.30
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络

epmet-module/resi-mine/resi-mine-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.30</version>
+    <version>0.3.31</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>

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 # 使用现有网络

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.55</version>
+    <version>0.3.56</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>

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);
 		}
 	}

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;
 
 	/**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiUserBaseInfoResultDTO.java

@@ -63,4 +63,14 @@ public class ResiUserBaseInfoResultDTO implements Serializable {
      * 楼栋单元
      */
     private String buildingAddress;
+
+    /**
+     * 昵称(目前来源于微信昵称，后续系统可支持用户有昵称)
+     */
+    private String nickname;
+
+    /**
+     * 头像（目前来源于微信，后续系统顾客支持上传头像）
+     */
+    private String headImgUrl;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -24,8 +24,8 @@ import java.util.List;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:09
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087")
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class, url = "localhost:8087")
-//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
 public interface EpmetUserOpenFeignClient {
 
     /**

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.84
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.87
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

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.81
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.86
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" 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">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.84</version>
+    <version>0.3.87</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

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);
     }
 

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<UserResiInfoEntity> {
 
 	/**
-	 * @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<UserResiInfoEntity> {
 	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<UserResiInfoDTO> selectResiInfoByMobile(String regMobile);
+	List<UserResiInfoDTO> selectResiInfoByMobile(@Param("regMobile") String regMobile, @Param("customerId") String customerId);
 
 	/**
-	 * @return java.util.List<com.epmet.dto.UserResiInfoDTO>
 	 * @param userIdList
+	 * @return java.util.List<com.epmet.dto.UserResiInfoDTO>
 	 * @Author yinzuomei
 	 * @Description 根据userId集合查询用户注册信息
 	 * @Date 2020/4/7 18:26
@@ -72,8 +72,8 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	List<UserResiInfoResultDTO> selectListUserResiInfoDTO(@Param("userIdList") List<String> userIdList);
 
 	/**
-	 * @Description  根据userId查询议题发起人
 	 * @param formDTO
+	 * @Description 根据userId查询议题发起人
 	 * @author zxc
 	 * @date 2020/5/11 11:18
 	 */

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -222,13 +222,15 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		if (null == roleList || roleList.size() == 0) {
 			return new Result<List<RoleInfoResultDTO>>().error(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
-		List<RoleInfoResultDTO> staffRoleList = roleList.stream().map(p -> {
+		List<RoleInfoResultDTO> staffRoleList = roleList.stream()
-			RoleInfoResultDTO staffRoleResultDTO = new RoleInfoResultDTO();
+				.filter(p -> !RoleKeyConstants.ROLE_KEY_ROOT_MANAGER.equals(p.getRoleKey()))
-			staffRoleResultDTO.setRoleId(p.getId());
+				.map(p -> {
-			staffRoleResultDTO.setRoleName(p.getRoleName());
+					RoleInfoResultDTO staffRoleResultDTO = new RoleInfoResultDTO();
-			staffRoleResultDTO.setFullTimeOnly(p.getFullTimeOnly());
+					staffRoleResultDTO.setRoleId(p.getId());
-			return staffRoleResultDTO;
+					staffRoleResultDTO.setRoleName(p.getRoleName());
-		}).collect(Collectors.toList());
+					staffRoleResultDTO.setFullTimeOnly(p.getFullTimeOnly());
+					return staffRoleResultDTO;
+				}).collect(Collectors.toList());
 		return new Result<List<RoleInfoResultDTO>>().ok(staffRoleList);
 	}
 

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java

@@ -194,8 +194,7 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
             return allData;
         }
         allData.forEach(info -> {
-            if(StringUtils.isBlank(info.getUserName())){
+            if(StringUtils.isNotBlank(info.getUserId())){
-                info.setUserName(ModuleConstant.EMPTY_STR);
                 UserBaseInfoResultDTO cache = userBaseInfoRedis.getUserInfo(info.getUserId());
                 if(null != cache) {
                     info.setRegisteredGrid(cache.getRegisteredGridName());

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<UserResiInfoDao, Us
 			userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
 			return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
 		}*/
-		//2:再次判断手机号是否可用
+		//2:再次判断手机号是否在客户下可用
-		if (!getResiInfoByMobile(userResiInfoDTO.getRegMobile())) {
+		if (!getResiInfoByMobile(userResiInfoDTO.getRegMobile(), userResiInfoDTO.getCustomerId())) {
 			//手机号验证失败则更新行为记录表数据 返回前台结果
 			userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
 			return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
@@ -221,15 +223,17 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		//1:更新居民注册访问记录表数据
 		userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO);
 		//2:判断手机号是否可用
-		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) {
+		//2020-07-29 根据要注册的网格获取客户Id
+		UserResiRegisterVisitDTO registerVisitDTO = userResiRegisterVisitService.get(verificationCodeFormDTO.getResiVisitId());
+		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile(), registerVisitDTO.getCustomerId())) {
 			return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
 		}
 		//3:调用短信服务 生成验证码发送短信
-		SendVerificationCodeFormDTO sendVerificationCodeFormDTO=new SendVerificationCodeFormDTO();
+		SendVerificationCodeFormDTO sendVerificationCodeFormDTO = new SendVerificationCodeFormDTO();
 		sendVerificationCodeFormDTO.setMobile(verificationCodeFormDTO.getMobile());
 		sendVerificationCodeFormDTO.setAliyunTemplateCode(SmsTemplateConstant.USER_REGISTER);
 		Result<SendVerificationCodeResultDTO> 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<UserResiInfoDao, Us
 		Result result = new Result();
 
 		//判断手机号是否可用
-		if (getResiInfoByMobile(userResiInfoDTO.getRegMobile())) {
+		if (getResiInfoByMobile(userResiInfoDTO.getRegMobile(), userResiInfoDTO.getCustomerId())) {
 			//数据存入居民注册表
 			saveUserResiInfo(userResiInfoDTO);
 			//居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
@@ -280,12 +284,17 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	 * 判断手机号是否可用-根据手机号查询居民注册信息(user_resi_info)表数据
 	 *
 	 * @param mobile
+	 * @param customerId
 	 * @return
 	 * @Author sun
 	 */
-	private Boolean getResiInfoByMobile(String mobile) {
+	private Boolean getResiInfoByMobile(String mobile, String customerId) {
+		if (StringUtils.isBlank(customerId)) {
+			customerId = UserUtil.getCurrentUser().getCustomerId();
+			log.info("getResiInfoByMobile UserUtil.getCustomerId:{}", customerId);
+		}
 		Boolean bl = true;
-		List<UserResiInfoDTO> list = userResiInfoDao.selectResiInfoByMobile(mobile);
+		List<UserResiInfoDTO> list = userResiInfoDao.selectResiInfoByMobile(mobile, customerId);
 		if (list.size() > 0) {
 			bl = false;
 		}

epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml

@@ -81,7 +81,9 @@
             MOBILE mobile,
             STREET street,
             DISTRICT district,
-            BUILDING_ADDRESS buildingAddress
+            BUILDING_ADDRESS buildingAddress,
+            NICKNAME nickname,
+            HEAD_IMG_URL headImgUrl
         FROM user_base_info
         WHERE DEL_FLAG = '0'
         AND USER_ID = #{userId}

epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@@ -98,8 +98,11 @@
         SELECT
         <include refid="sql"></include>
         FROM user_resi_info uri
-        WHERE uri.del_flag = '0'
+        LEFT JOIN user_customer uc ON uri.USER_ID = uc.USER_ID
-        AND uri.reg_mobile = #{regMobile}
+        WHERE
+        uri.DEL_FLAG = '0'
+        AND uri.REG_MOBILE = #{regMobile,jdbcType=VARCHAR}
+        AND uc.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
     </select>
 
     <!-- 根据userId集合查询用户注册信息   -->

epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml

@@ -103,6 +103,7 @@
             user_base_info base on wechat.USER_ID = base.USER_ID
         WHERE
             wechat.DEL_FLAG = '0'
+            AND (wechat.NICKNAME IS NOT NULL OR wechat.NICKNAME <![CDATA[ <> ]]> '')
             <foreach collection="userIds" item="item" open="AND (" separator=" OR " close=" )">
                 wechat.USER_ID = #{item}
             </foreach>