Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -335,7 +335,7 @@ public interface DataStatisticalOpenFeignClient {
     /**
      * 事件上报
      * @Param formDTO
-     * @Return {@link Result<List<BaseDisputeProcessDTO>>}
+     * @Return {@link Result<List<EventInfoResultDTO>>}
      * @Author zhaoqifeng
      * @Date 2021/10/15 16:50
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java

@@ -20,7 +20,6 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
@@ -195,8 +194,8 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
             GridInfoDTO gridInfoDTO=gridMap.get(topicOriginInfoDTO.getGridId());
             if(null==gridInfoDTO){
                 log.warn("没有找到 gridId="+topicOriginInfoDTO.getGridId()+" 的基本信息");
-//                continue;
+                continue;
-                throw new RenException("gridInfoDTO is null gridId="+topicOriginInfoDTO.getGridId());
+                //throw new RenException("gridInfoDTO is null gridId="+topicOriginInfoDTO.getGridId());
             }
             // 一年的第几周
             String weekId = DateUtils.format(topicOriginInfoDTO.getOriginalBusinessTime(), DateUtils.DATE_PATTERN_YYYY).concat("W").concat(String.valueOf(DateUtils.getWeekOfYear(topicOriginInfoDTO.getOriginalBusinessTime())));

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ExternalCustomerController.java

@@ -1,5 +1,6 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -44,6 +45,7 @@ public class ExternalCustomerController {
      * @param formDTO
      * @return
      */
+    @NoRepeatSubmit
     @PostMapping("add")
     public Result<ExternalCustomerResultDTO> add(@RequestBody ExternalCustomerFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ExternalCustomerFormDTO.AddExternalCustomerGroup.class);
@@ -57,6 +59,7 @@ public class ExternalCustomerController {
      * @param formDTO
      * @return
      */
+    @NoRepeatSubmit
     @PostMapping("update")
     public Result<ExternalCustomerResultDTO> update(@RequestBody ExternalCustomerFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ExternalCustomerFormDTO.UpdateExternalCustomerGroup.class);

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

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -68,6 +69,7 @@ public class ActCustomizedController {
      * @description 保存自定义配置
      * @Date 2020/7/20 17:25
      **/
+    @NoRepeatSubmit
     @RequirePermission(requirePermission = RequirePermissionEnum.MORE_HEART_CUSTOMIZED_SAVE)
     @PostMapping("save")
     public Result saveConfigs(@RequestBody SaveActCustomizedFormDTO formDTO){

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/ResiPointRankListResultDTO.java

@@ -3,7 +3,6 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * @Description 居民端积分总排行、周排行、月排行接口返参DTO
@@ -15,6 +14,10 @@ import java.util.List;
 public class ResiPointRankListResultDTO implements Serializable {
     private static final long serialVersionUID = 685408245193506541L;
 
+    /**
+     * 用户Id
+     */
+    private String userId;
     /**
      * 当前用户昵称
      * */

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

@@ -6,7 +6,6 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.entity.PointVerificationStatisticalDailyEntity;
 import com.epmet.entity.UserPointStatisticalDailyEntity;
-import com.epmet.entity.UserPointTotalEntity;
 import com.epmet.service.PointVerificationStatisticalDailyService;
 import com.epmet.service.UserPointStatisticalDailyService;
 import com.epmet.service.UserPointTotalService;
@@ -62,10 +61,5 @@ public class TestController {
         pointVerificationStatisticalDailyService.testUnixKey(entity);
         return new Result();
     }
-    @PostMapping("testtotal")
-    public Result testTotal(@RequestBody UserPointTotalEntity entity){
-        userPointTotalService.testInsertOrUpdate(entity);
-        return new Result();
-    }
 }
 

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

@@ -18,17 +18,13 @@
 package com.epmet.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
-import com.epmet.commons.tools.page.PageData;
-import com.epmet.dto.UserPointTotalDTO;
 import com.epmet.dto.form.CommonUserFormDTO;
-import com.epmet.dto.form.ResiCommonUserIdFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
 import com.epmet.dto.result.ResiPointDetailResultDTO;
 import com.epmet.dto.result.ResiPointRankListResultDTO;
 import com.epmet.entity.UserPointTotalEntity;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 用户积分总计
@@ -38,66 +34,6 @@ import java.util.Map;
  */
 public interface UserPointTotalService extends BaseService<UserPointTotalEntity> {
 
-    /**
-     * 默认分页
-     *
-     * @param params
-     * @return PageData<UserPointTotalDTO>
-     * @author generator
-     * @date 2020-07-20
-     */
-    PageData<UserPointTotalDTO> page(Map<String, Object> params);
-
-    /**
-     * 默认查询
-     *
-     * @param params
-     * @return java.util.List<UserPointTotalDTO>
-     * @author generator
-     * @date 2020-07-20
-     */
-    List<UserPointTotalDTO> list(Map<String, Object> params);
-
-    /**
-     * 单条查询
-     *
-     * @param id
-     * @return UserPointTotalDTO
-     * @author generator
-     * @date 2020-07-20
-     */
-    UserPointTotalDTO get(String id);
-
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-07-20
-     */
-    void save(UserPointTotalDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2020-07-20
-     */
-    void update(UserPointTotalDTO dto);
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return void
-     * @author generator
-     * @date 2020-07-20
-     */
-    void delete(String[] ids);
-
     /**
      * @Description 获取指定居民的积分信息
      * @param param
@@ -125,8 +61,6 @@ public interface UserPointTotalService extends BaseService<UserPointTotalEntity>
     **/
     void insertOrUpdate(UserPointTotalEntity entity);
 
-    void testInsertOrUpdate(UserPointTotalEntity entity);
-
     /**
      * @Description 获取指定居民的积分信息 - 使用客户Id匹配，兼容多客户情况
      * @param customerUserParam

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

@@ -55,6 +55,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -148,7 +149,7 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         if(myResiInfoResult.success() && null != myResiInfoResult.getData() && !myResiInfoResult.getData().isEmpty()){
                if(StringUtils.isBlank(pointRankFormDTO.getCustomerId())) {
                    //缓存中的customerId是不准确的，前端一定会传customerId，所以不会执行此代码
-                   log.warn("com.epmet.service.impl.UserPointTotalServiceImpl.getPointRanking，传参缺失客户Id，参数：{}",pointRankFormDTO);
+                   log.warn("getPointRanking，传参缺失客户Id，参数：{}",pointRankFormDTO);
                    //缓存中陌生人游客也有对应的customerId
                    pointRankFormDTO.setCustomerId(myResiInfoResult.getData().get(NumConstant.ZERO).getCustomerId());
                 }
@@ -202,18 +203,22 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl<UserPo
         }
         List<String> userIds = rankList.stream().map(ResiPointRankResultDTO::getUserId).collect(Collectors.toList());
         //查询用户昵称
-        Result<List<UserBaseInfoResultDTO>> userInfo =
+        Result<List<UserBaseInfoResultDTO>> userInfo = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
-                epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        Map<String,UserBaseInfoResultDTO> userInfoMap = new HashMap<>();
-        boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty();
+       if (userInfo.success() && CollectionUtils.isNotEmpty(userInfo.getData())){
-
+           userInfoMap = userInfo.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, Function.identity(),(o1,o2)->o1));
-        for (int i = NumConstant.ZERO; i < rankList.size(); i++) {
+       }
-            ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o,ResiPointRankListResultDTO.class);
+        for (ResiPointRankResultDTO resiPointRankResultDTO : rankList) {
+            ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o, ResiPointRankListResultDTO.class);
             ResiPointRankingResultDTO target = new ResiPointRankingResultDTO();
-            target.setRanking(rankList.get(i).getRank());
+            target.setRanking(resiPointRankResultDTO.getRank());
-            target.setPoint(rankList.get(i).getTotalPoint());
+            target.setPoint(resiPointRankResultDTO.getTotalPoint());
-            if(userRequestCallback) {
+            target.setNickname(StrConstant.EPMETY_STR);
-                target.setNickname(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getNickname());
+            target.setHeadImgUrl(StrConstant.EPMETY_STR);
-                target.setHeadImgUrl(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getHeadImgUrl());
+            UserBaseInfoResultDTO infoResultDTO = userInfoMap.get(resiPointRankResultDTO.getUserId());
+            if (infoResultDTO != null) {
+                target.setNickname(infoResultDTO.getNickname());
+                target.setHeadImgUrl(infoResultDTO.getHeadImgUrl());
             }
             resultObj.setRankList(target);
             result.add(resultObj);

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

@@ -17,34 +17,27 @@
 
 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.page.PageData;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.UserPointTotalDao;
-import com.epmet.dto.UserPointTotalDTO;
 import com.epmet.dto.form.CommonUserFormDTO;
-import com.epmet.dto.form.ResiCommonUserIdFormDTO;
 import com.epmet.dto.form.ResiPointRankFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.UserPointTotalEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.service.UserPointTotalService;
-import com.epmet.utils.DimIdGenerator;
-import com.epmet.utils.ModuleConstant;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -57,62 +50,9 @@ import java.util.stream.Collectors;
 @Slf4j
 public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao, UserPointTotalEntity> implements UserPointTotalService {
 
-
     @Autowired
     EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
-    @Override
-    public PageData<UserPointTotalDTO> page(Map<String, Object> params) {
-        IPage<UserPointTotalEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, UserPointTotalDTO.class);
-    }
-
-    @Override
-    public List<UserPointTotalDTO> list(Map<String, Object> params) {
-        List<UserPointTotalEntity> entityList = baseDao.selectList(getWrapper(params));
-
-        return ConvertUtils.sourceToTarget(entityList, UserPointTotalDTO.class);
-    }
-
-    private QueryWrapper<UserPointTotalEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
-
-        QueryWrapper<UserPointTotalEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
-        return wrapper;
-    }
-
-    @Override
-    public UserPointTotalDTO get(String id) {
-        UserPointTotalEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, UserPointTotalDTO.class);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void save(UserPointTotalDTO dto) {
-        UserPointTotalEntity entity = ConvertUtils.sourceToTarget(dto, UserPointTotalEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(UserPointTotalDTO dto) {
-        UserPointTotalEntity entity = ConvertUtils.sourceToTarget(dto, UserPointTotalEntity.class);
-        updateById(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
-    }
-
     /**
      * @Description 获取指定居民的积分信息
      * @param param
@@ -145,8 +85,7 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
         //1.获取当前用户昵称以及当前用户所属客户Id
         List<String> userIdParam = new LinkedList<>();
         userIdParam.add(pointRankFormDTO.getUserId());
-        Result<List<UserBaseInfoResultDTO>> myResiInfoResult =
+        Result<List<UserBaseInfoResultDTO>> myResiInfoResult = epmetUserOpenFeignClient.queryUserBaseInfo(userIdParam);
-                epmetUserOpenFeignClient.queryUserBaseInfo(userIdParam);
         if(myResiInfoResult.success() && null != myResiInfoResult.getData() && !myResiInfoResult.getData().isEmpty()){
             if(StringUtils.isBlank(pointRankFormDTO.getCustomerId())) {
                 //缓存中的customerId是不准确的，前端一定会传customerId，所以不会执行此代码
@@ -204,19 +143,23 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
 
         List<String> userIds = rankList.stream().map(ResiPointRankResultDTO::getUserId).collect(Collectors.toList());
         //查询用户昵称
-        Result<List<UserBaseInfoResultDTO>> userInfo =
+        Result<List<UserBaseInfoResultDTO>> userInfo = epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
-                epmetUserOpenFeignClient.queryUserBaseInfo(userIds);
+        Map<String,UserBaseInfoResultDTO> userInfoMap = new HashMap<>();
-        boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty();
+        if (userInfo.success() && CollectionUtils.isNotEmpty(userInfo.getData())){
-
+            userInfoMap = userInfo.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, Function.identity(),(o1, o2)->o1));
-        for (int i = NumConstant.ZERO; i < rankList.size(); i++) {
+        }
-            ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o,ResiPointRankListResultDTO.class);
 
+        for (ResiPointRankResultDTO resiPointRankResultDTO : rankList) {
+            ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o, ResiPointRankListResultDTO.class);
             ResiPointRankingResultDTO target = new ResiPointRankingResultDTO();
-            target.setRanking(rankList.get(i).getRank());
+            target.setRanking(resiPointRankResultDTO.getRank());
-            target.setPoint(rankList.get(i).getTotalPoint());
+            target.setPoint(resiPointRankResultDTO.getTotalPoint());
-            if(userRequestCallback) {
+            target.setNickname(StrConstant.EPMETY_STR);
-                target.setNickname(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getNickname());
+            target.setHeadImgUrl(StrConstant.EPMETY_STR);
-                target.setHeadImgUrl(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getHeadImgUrl());
+            UserBaseInfoResultDTO infoResultDTO = userInfoMap.get(resiPointRankResultDTO.getUserId());
+            if (infoResultDTO != null) {
+                target.setNickname(infoResultDTO.getNickname());
+                target.setHeadImgUrl(infoResultDTO.getHeadImgUrl());
             }
             resultObj.setRankList(target);
             result.add(resultObj);
@@ -234,21 +177,6 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl<UserPointTotalDao
     @Override
     public void insertOrUpdate(UserPointTotalEntity entity) {
         baseDao.insertOrUpdate(entity);
-        /*
-        UserPointTotalEntity existed = baseDao.selectIfExisted(entity.getUserId());
-        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());
-            updateById(existed);
-        }else{
-            insert(entity);
-        }*/
-    }
-
-    @Override
-    public void testInsertOrUpdate(UserPointTotalEntity entity) {
-        baseDao.insertOrUpdate(entity);
     }
 
 

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

@@ -66,7 +66,7 @@
             point.total_point,
             @point := point.total_point
         FROM
-            ( SELECT * FROM user_point_total WHERE CUSTOMER_ID = #{customerId} ORDER BY total_point DESC ) point,
+            ( SELECT * FROM user_point_total WHERE CUSTOMER_ID = #{customerId} and del_flag = '0' ORDER BY total_point DESC ) point,
             ( SELECT @point := NULL, @rank := 1 ) a
 
             ) temp

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/PartyBranchManageController.java

@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -34,6 +35,7 @@ public class PartyBranchManageController {
      * @description 添加党支部
      * @Date 2020/6/17 12:47
      **/
+    @NoRepeatSubmit
     @PostMapping("add")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_PARTY_BRANCH_ADD)
     public Result<PartyBranchAddResultDTO> addPartyBranch(@RequestBody PartyBranchAddFormDTO formDTO) {

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueCategoryController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -127,6 +128,7 @@ public class IssueCategoryController {
      * @Description 议题：保存/修改分类
      * @Author sun
      **/
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result saveCategory(@LoginUser TokenDto tokenDto, @RequestBody IssueSaveCategoryFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueSuggestionController.java

@@ -17,6 +17,7 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.IssueSuggestionDTO;
@@ -66,6 +67,7 @@ public class IssueSuggestionController {
      * @description 保存居民端用户对议题的建议或意见
      * @Date 2020/11/18 13:15
      **/
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result<SaveIssueSuggestionResultDTO> saveIssueSuggestion(@RequestBody IssueSuggestionDTO dto) {
         SaveIssueSuggestionResultDTO resultDTO = issueSuggestionService.saveIssueSuggestion(dto);

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueTagsController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -102,6 +103,7 @@ public class IssueTagsController {
      * @author zxc
      * @date 2020/12/9 下午3:29
      */
+    @NoRepeatSubmit
     @PostMapping("add")
     public Result<AddTagResultDTO> addTag(@RequestBody AddTagFormDTO form, @LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(form, AddTagFormDTO.AddTag.class);
@@ -116,6 +118,7 @@ public class IssueTagsController {
      * @author zxc
      * @date 2020/12/10 上午9:37
      */
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result issueTagSave(@RequestBody IssueTagsSaveFormDTO form,@LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(form, IssueTagsSaveFormDTO.IssueTagsSaveForm.class);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerPartyBranchController.java

@@ -17,6 +17,7 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -65,6 +66,7 @@ public class CustomerPartyBranchController {
         return new Result<CustomerPartyBranchDTO>().ok(data);
     }
 
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result<String> save(@RequestBody CustomerPartyBranchDTO dto){
         //效验数据

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectCategoryController.java

@@ -18,8 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
-import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
@@ -118,6 +117,7 @@ public class ProjectCategoryController {
      * @Description 项目：保存/修改分类
      * @Author sun
      **/
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result saveCategory(@LoginUser TokenDto tokenDto, @RequestBody ProjectSaveCategoryFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTagsController.java

@@ -18,15 +18,15 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.ProjectTagsDTO;
 import com.epmet.dto.form.ProjectTagHookFormDTO;
 import com.epmet.excel.ProjectTagsExcel;
@@ -64,6 +64,7 @@ public class ProjectTagsController {
         return new Result<ProjectTagsDTO>().ok(data);
     }
 
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result save(@RequestBody ProjectTagHookFormDTO dto, @LoginUser TokenDto token){
         dto.setCustomerId(token.getCustomerId());

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideCategoryController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -143,6 +144,7 @@ public class GuideCategoryController {
      * @author yinzuomei
      * @date 2021/9/8 5:11 下午
      */
+    @NoRepeatSubmit
     @PostMapping("save")
     public Result<GuideCategoryDTO> save(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
         formDTO.setStaffId(tokenDto.getUserId());
@@ -160,6 +162,7 @@ public class GuideCategoryController {
      * @author yinzuomei
      * @date 2021/9/8 5:37 下午
      */
+    @NoRepeatSubmit
     @PostMapping("update")
     public Result<GuideCategoryDTO> update(@LoginUser TokenDto tokenDto,@RequestBody EditGuideCategoryFormDTO formDTO){
         formDTO.setStaffId(tokenDto.getUserId());

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/GuideController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.dto.form.PageFormDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -113,6 +114,7 @@ public class GuideController {
      * @Author zhaoqifeng
      * @Date 2021/9/7 14:13
      */
+    @NoRepeatSubmit
     @PostMapping("add")
     public Result guideAdd(@LoginUser TokenDto tokenDto, @RequestBody GuideAddFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java

@@ -19,6 +19,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -58,6 +59,7 @@ public class SpecialSubjectController {
      * @description 添加专题
      * @Date 2021/7/15 15:31
      **/
+    @NoRepeatSubmit
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_SPECIAL_PROJECT_ADD)
     @PostMapping("add")
     public Result<AddSpecialSubjectResultDTO> addSpecialSubject(@LoginUser TokenDto tokenDto, @RequestBody AddSpecialSubjectFormDTO formDTO) {

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java

@@ -18,6 +18,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
@@ -87,6 +88,7 @@ public class CustomerController {
 		return new Result<CustomerDTO>().ok(data);
 	}
 
+	@NoRepeatSubmit
 	@PostMapping("save")
 	public Result save(@RequestBody CustomerDTO dto) {
 		//效验数据
@@ -95,6 +97,7 @@ public class CustomerController {
 		return new Result();
 	}
 
+	@NoRepeatSubmit
 	@PutMapping("update")
 	public Result update(@RequestBody CustomerDTO dto) {
 		//效验数据
@@ -183,6 +186,7 @@ public class CustomerController {
 	 * @param form
 	 * @return
 	 */
+	@NoRepeatSubmit
 	@PostMapping("add")
 	public Result<Map<String, String>> addCustomer(@RequestBody CustomerFormDTO form) {
 		ValidatorUtils.validateEntity(form, CustomerFormDTO.AddCustomerGroup.class);

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java

@@ -50,6 +50,7 @@ public class BadgeController {
 	 * @param formDTO
 	 * @return com.epmet.commons.tools.utils.Result
 	 */
+	@NoRepeatSubmit
 	@PostMapping("add")
 	public Result add(@LoginUser TokenDto tokenDto, @RequestBody AddBadgeFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO);