工作端 居民认证接口加积分注解

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/enums/BehaviorEnum.java

@@ -30,6 +30,10 @@ public enum BehaviorEnum {
      * 居民审核通过
      */
     RESIDENT_AUDIT_PASS("resident_audit_pass"),
+    /**
+     * 居民审核不通过
+     */
+     RESIDENT_AUDIT_NO_PASS("resident_audit_no_pass"),
 
     /**
      * 新闻浏览

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.common.token.dto.WorkUserAuthorizationDTO;
 import com.elink.esua.epdc.common.token.dto.WorkUserLoginDTO;
+import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -11,6 +12,7 @@ import com.elink.esua.epdc.dto.epdc.result.*;
 import com.elink.esua.epdc.dto.form.EpdcWorkAppUserMaTokenFormDTO;
 import com.elink.esua.epdc.dto.form.WorkAppMenuStatisticsFormDTO;
 import com.elink.esua.epdc.dto.result.WorkAppMenuStatisticsResultDTO;
+import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior;
 import com.elink.esua.epdc.service.WorkUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -93,6 +95,33 @@ public class ApiWorkUserController {
         return workUserService.authenticateResident(formDTO);
     }
 
+
+    /**
+     * 认证用户（用户信息审核）  - -通过
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("swagger/authenticateResidentPass")
+    @RecordUserBehavior(behavior = BehaviorEnum.RESIDENT_AUDIT_PASS,referenceId = "#{formDTO.getUserId}",userId = "#{formDTO.getUserId}")
+    public Result authenticateResidentPass(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return workUserService.authenticateResident(formDTO);
+    }
+
+
+    /**
+     * 认证用户（用户信息审核） - 不通过
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("swagger/authenticateResidentNoPass")
+    @RecordUserBehavior(behavior = BehaviorEnum.RESIDENT_AUDIT_NO_PASS,referenceId = "#{formDTO.getUserId}",userId = "#{formDTO.getUserId}")
+    public Result authenticateResidentNoPass(@RequestBody EpdcAppAuthenticateResidentFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return workUserService.authenticateResident(formDTO);
+    }
     /***
      * 用户列表
      * @param workUserFromDto

esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java

@@ -115,7 +115,8 @@ public class PointsModifyConsumer implements RocketMQListener<MessageExt> {
         pointsLogsFormDTO.setRuleCode(pointsRuleResultDTO.getRuleCode());
         //1.1如果规则里动作次数上限不为0则需要判断该动作是否超过次数上限
         if (!OPERATION_LIMIT_NUM.equals(pointsRuleResultDTO.getLimitNum())) {
-            //此处通过规则编码获取日志信息（用于针对 表态（指多个工作）只记录一次分数）
+            //此处通过规则编码获取日志信息
+            // （用于针对 同一个项目（同一个是关键：意思就是这里的业务ID必须是一样的，否则即使一个记分配置多个动作，也不生效）表态多次 只记录一次分数）
             List<PointsLogsResultDTO> pointsLogsResultDTs = pointsLogsService.getLogsByBehaviorCodeAndUserIdAndReferenceId(pointsLogsFormDTO);
             //如果大于或者等于上限 代表不能再进行操作
             if (pointsLogsResultDTs != null && pointsLogsResultDTs.size() >= Integer.parseInt(pointsRuleResultDTO.getLimitNum())) {

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java

@@ -120,6 +120,23 @@ public class UserController {
 
         return new Result();
     }
+
+    /**
+     * 审核  - 不通过
+     *
+     * @param dto
+     * @return
+     */
+    @PostMapping("auditNoPass")
+    @RecordUserBehavior(behavior = BehaviorEnum.RESIDENT_AUDIT_NO_PASS,referenceId = "#{dto.getId}",userId = "#{dto.getId}")
+    public Result auditNoPass(@RequestBody UserDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+
+        userService.audit(dto);
+
+        return new Result();
+    }
     @DeleteMapping
     public Result delete(@RequestBody String[] ids) {
         //效验数据