爱心互助-居民端

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActCaculateDistanceFormDTO.java

@@ -28,18 +28,18 @@ public class ResiActCaculateDistanceFormDTO implements Serializable {
     /**
      * 经度
      */
-    @NotBlank(message = "经度不能为空", groups = { ResiActBaseFormDTO.AddUserInternalGroup.class })
+    @NotBlank(message = "经度不能为空", groups = { AddUserInternalGroup.class })
     private Double longitude;
 
     /**
      * 纬度
      */
-    @NotBlank(message = "纬度不能为空", groups = { ResiActBaseFormDTO.AddUserInternalGroup.class })
+    @NotBlank(message = "纬度不能为空", groups = { AddUserInternalGroup.class })
     private Double latitude;
 
     /**
      * 用户id
      */
-    @NotBlank(message = "活动ID不能为空", groups = { ResiActBaseFormDTO.AddUserInternalGroup.class })
+    @NotBlank(message = "活动ID不能为空", groups = { AddUserInternalGroup.class })
     private String actId;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java

@@ -29,13 +29,13 @@ public class ResiActContentFormDTO implements Serializable {
     /**
      * 活动Id
      */
-    @NotBlank(message = "活动Id不能为空", groups = { ResiActBaseFormDTO.AddUserInternalGroup.class })
+    @NotBlank(message = "活动Id不能为空", groups = { AddUserInternalGroup.class })
     private String actId;
 
     /**
      * 页码，从1开始
      */
-    @Min(value = 1, message = "页码必须大于0", groups = { ResiActBaseFormDTO.AddUserInternalGroup.class })
+    @Min(value = 1, message = "页码必须大于0", groups = { AddUserInternalGroup.class })
     private Integer pageNo;
 
     /**

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActDetailFormDTO.java

@@ -28,7 +28,7 @@ public class ResiActDetailFormDTO implements Serializable {
     /**
      * 活动Id
      */
-    @NotBlank(message = "活动Id不能为空", groups = { ResiActBaseFormDTO.AddUserInternalGroup.class })
+    @NotBlank(message = "活动Id不能为空", groups = { AddUserInternalGroup.class })
     private String actId;
 
     /**

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiMyActFormDTO.java

@@ -20,7 +20,6 @@ package com.epmet.dto.form.resi;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java

@@ -52,6 +52,7 @@ public class ResiActListController {
      **/
     @PostMapping("list")
     public Result<List<ResiActInfoResultDTO>> listAct(@LoginUser TokenDto tokenDto, @RequestBody ResiActBaseFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto, ResiActBaseFormDTO.AddUserInternalGroup.class);
         return actInfoService.listAct(tokenDto, formDto);
     }
 
@@ -67,6 +68,7 @@ public class ResiActListController {
      **/
     @PostMapping("list/auditing")
     public Result<List<ResiMyActResultDTO>> listAuditing(@LoginUser TokenDto tokenDto, @RequestBody ResiMyActFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto, ResiMyActFormDTO.AddUserInternalGroup.class);
         return actInfoService.myActListAuditing(tokenDto, formDto);
     }
 
@@ -81,6 +83,7 @@ public class ResiActListController {
      **/
     @PostMapping("list/refused")
     public Result<List<ResiMyActResultDTO>> listRefused(@LoginUser TokenDto tokenDto, @RequestBody ResiMyActFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto, ResiMyActFormDTO.AddUserInternalGroup.class);
         return actInfoService.myActListRefused(tokenDto, formDto);
     }
 
@@ -95,6 +98,7 @@ public class ResiActListController {
      **/
     @PostMapping("list/passed")
     public Result<List<ResiMyActResultDTO>> listPassed(@LoginUser TokenDto tokenDto, @RequestBody ResiMyActFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto, ResiMyActFormDTO.AddUserInternalGroup.class);
         return actInfoService.myActListPassed(tokenDto, formDto);
     }
 
@@ -109,6 +113,7 @@ public class ResiActListController {
      **/
     @PostMapping("list/canceld")
     public Result<List<ResiMyActResultDTO>> listcanceld(@LoginUser TokenDto tokenDto, @RequestBody ResiMyActFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto, ResiMyActFormDTO.AddUserInternalGroup.class);
         return actInfoService.myActListCanceld(tokenDto, formDto);
     }
 
@@ -122,6 +127,7 @@ public class ResiActListController {
      **/
     @PostMapping("list/latestact")
     public Result<List<ResiLatestActResultDTO>> latestAct(@RequestBody ResiLatestActFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto, ResiLatestActFormDTO.AddUserInternalGroup.class);
         return actInfoService.latestAct(formDto);
     }
 
@@ -148,6 +154,7 @@ public class ResiActListController {
      **/
     @PostMapping("actlookback")
     public Result<List<ResiLookBackActResultDTO>> actLookBack(@RequestBody ResiActBaseFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto, ResiActBaseFormDTO.AddUserInternalGroup.class);
         return actInfoService.actLookBack(formDto);
     }
 
@@ -164,6 +171,7 @@ public class ResiActListController {
      **/
     @PostMapping("detail")
     public Result<ResiActDetailResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody ResiActDetailFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto, ResiActDetailFormDTO.AddUserInternalGroup.class);
         return actInfoService.actDetail(tokenDto, formDto);
     }
 
@@ -178,6 +186,7 @@ public class ResiActListController {
      **/
     @PostMapping("rejectdetail")
     public Result<ResiActRefusedDetailResultDTO> rejectDetail(@LoginUser TokenDto tokenDto, @RequestBody ResiActDetailFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto, ResiActDetailFormDTO.AddUserInternalGroup.class);
         return actInfoService.rejectDetail(tokenDto, formDto);
     }
 
@@ -191,6 +200,7 @@ public class ResiActListController {
      **/
     @PostMapping("summary/list")
     public Result<ResiActSummaryResultDTO> summaryList(@RequestBody ResiActContentFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto, ResiActContentFormDTO.AddUserInternalGroup.class);
         return actSummaryService.summaryList(formDto);
     }
 
@@ -220,7 +230,7 @@ public class ResiActListController {
      **/
     @PostMapping("cancelsignup")
     public Result cancelSignUp(@LoginUser TokenDto tokenDto, @RequestBody ResiActUserCancelSignUpFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, ResiActUserCancelSignUpFormDTO.AddUserInternalGroup.class, ResiActUserCancelSignUpFormDTO.AddUserShowGroup.class);
         return actUserRelationService.cancelSignUp(tokenDto, formDTO);
     }
 
@@ -235,7 +245,7 @@ public class ResiActListController {
      **/
     @PostMapping("checksigninaddress")
     public Result cancelSignUp(@RequestBody ResiActCaculateDistanceFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, ResiActCaculateDistanceFormDTO.AddUserInternalGroup.class);
         return actInfoService.checkSignInAddress(formDTO);
     }
 
@@ -251,7 +261,7 @@ public class ResiActListController {
      **/
     @PostMapping("leaderboard")
     public Result<List<ResiLeaderboardResultDTO>> leaderboard(@RequestBody ResiActBaseFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, ResiActBaseFormDTO.AddUserInternalGroup.class);
         return heartUserInfoService.leaderboard(formDTO);
     }
 
@@ -265,7 +275,7 @@ public class ResiActListController {
      **/
     @PostMapping("insertlive")
     public Result insertLive(@LoginUser TokenDto tokenDto, @RequestBody ResiActInsertLiveFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, ResiActInsertLiveFormDTO.AddUserInternalGroup.class, ResiActInsertLiveFormDTO.AddUserShowGroup.class);
         Result<String> result =  actLiveRecService.insertLive(tokenDto, formDTO);
         return new Result();
     }
@@ -280,7 +290,7 @@ public class ResiActListController {
      **/
     @PostMapping("signin")
     public Result actSignIn(@LoginUser TokenDto tokenDto, @RequestBody ResiActSignInFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, ResiActSignInFormDTO.AddUserInternalGroup.class, ResiActSignInFormDTO.AddUserShowGroup.class);
         return actSignInRecService.actSignIn(tokenDto, formDTO);
     }
 
@@ -295,6 +305,7 @@ public class ResiActListController {
      **/
     @PostMapping("registration")
     public Result 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/controller/ResiVolunteerController.java

@@ -46,7 +46,7 @@ public class ResiVolunteerController {
 
     @PostMapping("authenticate")
     public Result authenticate(@LoginUser TokenDto tokenDto, @RequestBody ResiVolunteerAuthenticateFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, ResiVolunteerAuthenticateFormDTO.AddUserInternalGroup.class, ResiVolunteerAuthenticateFormDTO.AddUserShowGroup.class);
         return volunteerInfoService.authenticate(tokenDto, formDTO);
     }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java

@@ -178,14 +178,14 @@ public interface ActUserRelationDao extends BaseDao<ActUserRelationEntity> {
 
     /**
      * 取消报名
-     * 根据用户id和活动id，修改 用户活动关系表
+     * 根据用户id和活动id，删除 用户活动关系表中，用户的报名记录
      *
      * @param entity
      * @return void
      * @Author zhangyong
      * @Date 14:39 2020-07-22
      **/
-    void cancelSignUp(ActUserRelationEntity entity);
+    void delSignUpRecord(ActUserRelationEntity entity);
 
     /**
      * 当前用户是否曾报名参加过该活动

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

@@ -73,6 +73,10 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
 
     @Override
     public Result<ResiActLiveRecResultDTO> liveRecList(Map<String, String> map) {
+        if (map.get("actId") == null){
+            logger.error("传参中没有活动ID");
+            throw new RenException("传参中没有活动ID");
+        }
         // 数据汇总
         ResiActLiveRecResultDTO resultDto = new ResiActLiveRecResultDTO();
         // 查询实况记录

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

@@ -55,6 +55,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -262,18 +263,19 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         entity.setActId(formDTO.getActId());
         entity.setUserId(formDTO.getUserId());
         entity.setStatus(ActConstant.ACT_USER_STATUS_AUDITING);
-        Integer operationCount = baseDao.selectCountByActIdAndUserId(entity.getActId(), entity.getUserId());
-        if (operationCount == NumConstant.ZERO){
-            // 用户第一次参加 这次的活动
-            // 5.插入用户活动关系表
-            baseDao.insert(entity);
+        // 审核开关：1报名人员需要人工审核(true)   0不需要(false)
+        if (actInfoDTO.getAuditSwitch()){
+            entity.setPassedType(ActConstant.PASSEDTYPE_MANUAL);
         } else {
-            // 取消报名后，重新报名参加活动。修改状态
-            // 5.修改用户活动关系表
-            entity.setCancelReason("");
-            entity.setCancelTime(null);
-            baseDao.cancelSignUp(entity);
+            entity.setPassedType(ActConstant.PASSEDTYPE_AUTO);
+            entity.setAuditTime(new Date());
         }
+        Integer operationCount = baseDao.selectCountByActIdAndUserId(formDTO.getActId(), formDTO.getUserId());
+        if (operationCount > NumConstant.ZERO){
+            // 用户如果不是第一次参加 这次的活动，先删除关系表中的数据，在插入
+            baseDao.delSignUpRecord(entity);
+        }
+        baseDao.insert(entity);
     }
 
     /**

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml

@@ -253,16 +253,10 @@
             AND aur.ACT_ID = #{actId}
     </select>
 
-    <update id="cancelSignUp" parameterType="com.epmet.entity.ActUserRelationEntity">
+    <update id="delSignUpRecord" parameterType="com.epmet.entity.ActUserRelationEntity">
         UPDATE act_user_relation
         SET
-        <if test="status != null and status.trim() != ''">
-            STATUS = #{status},
-        </if>
-        <if test="cancelReason != null">
-            CANCEL_TIME = #{cancelTime},
-            CANCEL_REASON = #{cancelReason},
-        </if>
+        DEL_FLAG = '1',
         <if test="userId != null and userId != ''">
             UPDATED_BY =  #{userId},
         </if>