积分埋点 接口注解完善

esua-epdc/epdc-commons/epdc-commons-points-tools/src/main/java/com/elink/esua/epdc/pointcommons/tools/feign/PointsCommonFeignClient.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @author songyunpeng
  * @date 2020/04/28
  */
-@FeignClient(name = ServiceConstant.EPDC_POINTS_SERVER, fallback = PointsCommonFeignClientFallback.class, url = "http://127.0.0.1:9070")
+@FeignClient(name = ServiceConstant.EPDC_POINTS_SERVER, fallback = PointsCommonFeignClientFallback.class)
 public interface PointsCommonFeignClient {
 
     /**

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
+import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.epdc.form.*;
@@ -12,6 +13,7 @@ import com.elink.esua.epdc.dto.form.*;
 import com.elink.esua.epdc.dto.result.EpdcAppRegisterCallbackDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO;
 import com.elink.esua.epdc.dto.result.EpdcCompleteUserInfoDTO;
+import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior;
 import com.elink.esua.epdc.service.AppUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -215,7 +217,7 @@ public class ApiAppUserController {
     }
 
     /**
-     * 用户完善个人信息-保存
+     * 居民完善个人信息-保存
      *
      * @param tokenDto
      * @param formDto
@@ -223,8 +225,25 @@ public class ApiAppUserController {
      * @author work@yujt.net.cn
      * @date 2019/10/26 13:41
      */
-    @PostMapping("user/completeInfo")
+    @PostMapping("user/completeResidentInfo")
-    public Result<EpdcAppAuthorizationDTO> completeUserInfo(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormDTO formDto) {
+    @RecordUserBehavior(behavior = BehaviorEnum.PERFECT_RESIDENT_INFO,referenceId = "#{tokenDto.getUserId}",userId = "#{tokenDto.getUserId}")
+    public Result<EpdcAppAuthorizationDTO> completeResidentInfo(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return appUserService.completeUserInfo(tokenDto, formDto);
+    }
+
+    /**
+     * 党员完善个人信息-保存
+     *
+     * @param tokenDto
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO>
+     * @author work@yujt.net.cn
+     * @date 2019/10/26 13:41
+     */
+    @PostMapping("user/completePartyInfo")
+    @RecordUserBehavior(behavior = BehaviorEnum.PERFECT_PARTY_INFO,referenceId = "#{tokenDto.getUserId}",userId = "#{tokenDto.getUserId}")
+    public Result<EpdcAppAuthorizationDTO> completePartyInfo(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteUserInfoFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return appUserService.completeUserInfo(tokenDto, formDto);
     }

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

@@ -113,6 +113,7 @@ public class ApiGroupController {
      * @since 2019/10/22 15:33
      */
     @PostMapping("modifyIntroduction")
+    @RecordUserBehavior(behavior = BehaviorEnum.GROUP_MODIFY_INFO,referenceId = "#{formDto.getId}",userId = "#{userDetail.getUserId}")
     public Result modifyIntroduction(@LoginUser TokenDto userDetail, @RequestBody GroupIntroductionFormDTO formDto) {
         return groupService.modifyIntroduction(userDetail, formDto);
     }
@@ -127,6 +128,7 @@ public class ApiGroupController {
      * @since 2019/10/22 17:25
      */
     @PostMapping("modifyAvatar")
+    @RecordUserBehavior(behavior = BehaviorEnum.GROUP_MODIFY_INFO,referenceId = "#{formDto.getId}",userId = "#{userDetail.getUserId}")
     public Result modifyAvatar(@LoginUser TokenDto userDetail, @RequestBody GroupModifyAvatarFormDTO formDto) {
         return groupService.modifyAvatar(userDetail, formDto);
     }
@@ -225,6 +227,7 @@ public class ApiGroupController {
      * @since 2019/11/11 14:00
      */
     @PostMapping("applyForGroup")
+    @RecordUserBehavior(behavior = BehaviorEnum.GROUP_JOIN_APPLICATION,referenceId = "#{formDto.getGroupId}",userId = "#{userDetail.getUserId}")
     public Result applyForGroup(@LoginUser TokenDto userDetail, @RequestBody GroupApplyFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return groupService.applyForGroup(userDetail, formDto);

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

@@ -42,6 +42,7 @@ public class ApiIssueController {
      * @Date: 2019/9/8 15:36
      */
     @PostMapping("submit")
+    @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_PUBLISH,referenceId = "#{formDto.getId}",userId = "#{userDetail.getUserId}")
     public Result submitEvent(@LoginUser TokenDto userDetail, @RequestBody EpdcEventSubmitFormDTO formDto) {
         return issueService.saveEvent(userDetail, formDto);
     }
@@ -139,6 +140,7 @@ public class ApiIssueController {
      * @Date: 2019/9/9 11:16
      */
     @GetMapping("detail/{issueId}")
+    @RecordUserBehavior(behavior = BehaviorEnum.GROUP_TOPIC_TO_EVENTS,referenceId = "#{issueId}",userId = "#{userDetail.getUserId}")
     public Result<IssueDetailResultDTO> issueDetail(@LoginUser TokenDto userDetail, @PathVariable String issueId) {
         return issueService.getIssueDetail(userDetail, issueId);
     }

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
+import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.form.EvaluationFormDTO;
 import com.elink.esua.epdc.dto.item.form.ItemFormDTO;
@@ -10,6 +11,7 @@ import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
 import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
+import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior;
 import com.elink.esua.epdc.service.ItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -48,12 +50,14 @@ public class ApiItemController {
      * @Date: 2019/9/10 20:42
      */
     @GetMapping("detail/{itemId}")
+    @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_BROWSE,referenceId = "#{itemId}",userId = "#{userDetail.getUserId}")
     public Result<ItemDetailResultDTO> itemDetail(@LoginUser TokenDto userDetail, @PathVariable String itemId) {
         return itemService.getItemDetail(userDetail, itemId);
     }
 
 
     @PostMapping("evaluation")
+    @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_EVALUATION,referenceId = "#{evaluationFormDTO.getItemId}",userId = "#{userDetail.getUserId}")
     public Result evaluation(@LoginUser TokenDto userDetail, @RequestBody EvaluationFormDTO evaluationFormDTO) {
         return itemService.evaluation(userDetail,evaluationFormDTO);
     }

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

@@ -137,6 +137,7 @@ public class ApiNewsController {
      *
      */
     @PostMapping("news/browse")
+    @RecordUserBehavior(behavior = BehaviorEnum.NEWS_BROWSE, referenceId = "#{newsBrowseFromDTO.getNewsId}", userId = "#{userDetail.getUserId}")
     public Result modifyNewsBrowse(@LoginUser TokenDto userDetail,@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO) {
         ValidatorUtils.validateEntity(newsBrowseFromDTO);
         return newsService.modifyNewsBrowse(userDetail,newsBrowseFromDTO);

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

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
+import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.dto.group.result.TopicAuditRecordResultDTO;
@@ -11,6 +12,7 @@ import com.elink.esua.epdc.dto.topic.form.TopicCloseFormDTO;
 import com.elink.esua.epdc.dto.topic.form.TopicSubmitFormDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
+import com.elink.esua.epdc.pointcommons.tools.annotation.RecordUserBehavior;
 import com.elink.esua.epdc.service.TopicService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -42,6 +44,7 @@ public class ApiTopicController {
      * @since 2019/11/6 14:46
      */
     @PostMapping("submit")
+    @RecordUserBehavior(behavior = BehaviorEnum.GROUP_TOPIC_PUBLISH,referenceId = "#{formDto.getId}",userId = "#{userDetail.getUserId}")
     public Result submit(@LoginUser TokenDto userDetail, @RequestBody TopicSubmitFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return topicService.saveTopic(userDetail, formDto);
@@ -87,6 +90,7 @@ public class ApiTopicController {
      * @since 2019/11/7 15:37
      */
     @GetMapping("detail/{id}")
+    @RecordUserBehavior(behavior = BehaviorEnum.GROUP_BROWSE,referenceId = "#{id}",userId = "#{userDetail.getUserId}")
     public Result<TopicDetailResultDTO> detail(@LoginUser TokenDto userDetail, @PathVariable("id") String id) {
         return topicService.getTopicDetailById(userDetail, id);
     }
@@ -130,6 +134,7 @@ public class ApiTopicController {
      * @since 2019/11/8 10:37
      */
     @PostMapping("changeToIssue")
+    @RecordUserBehavior(behavior = BehaviorEnum.GROUP_TOPIC_TO_EVENTS,referenceId = "#{formDto.getId}",userId = "#{userDetail.getUserId}")
     public Result changeToIssue(@LoginUser TokenDto userDetail, @RequestBody TopicChangeToIssueFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return topicService.changeToIssue(userDetail, formDto);

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

@@ -89,7 +89,7 @@ public class ApiWorkItemController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     @PostMapping("response")
-    @RecordUserBehavior(behavior = BehaviorEnum.ISSUE_RESPONSE,referenceId = "#{dto.getId}",userId = "#{dto.getUserId}")
+    @RecordUserBehavior(behavior = BehaviorEnum.PROJECT_RESPONSE,referenceId = "#{dto.getId}",userId = "#{dto.getUserId}")
     public Result response(@RequestBody ItemHandleSubmitFormDTO dto) {
         return workItemService.handleSubmit(dto);
     }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/GroupServiceImpl.java

@@ -71,7 +71,11 @@ public class GroupServiceImpl implements GroupService {
         groupUserFormDTO.setState(GroupUserStateEnum.GROUP_USER_STATE_EXAMINATION_PASSED.getValue());
         formDto.setGroupUserFormDTO(groupUserFormDTO);
 
-        return groupFeignClient.createGroup(formDto);
+        Result result =  groupFeignClient.createGroup(formDto);
+        if(result.success()){
+            formDto.setId(String.valueOf(result.getData()));
+        }
+        return result;
     }
 
     @Override

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java

@@ -89,7 +89,12 @@ public class IssueServiceImpl implements IssueService {
         formDto.setIsPartyMember(userDetail.getPartyFlag());
         formDto.setMobile(userDetail.getMobile());
 
-        return issueFeignClient.submitEvent(formDto);
+        //事件ID返参赋值
+        Result result = issueFeignClient.submitEvent(formDto);
+        if(result.success()){
+            formDto.setId(String.valueOf(result.getData()));
+        }
+        return result;
     }
 
     @Override

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/TopicServiceImpl.java

@@ -62,7 +62,11 @@ public class TopicServiceImpl implements TopicService {
         formDto.setMobile(userDetail.getMobile());
         formDto.setState(TopicStateEnum.TOPIC_STATE_IN_CONVERSATION.getValue());
 
-        return topicFeignClient.submit(formDto);
+        Result result =  topicFeignClient.submit(formDto);
+        if(result.success()){
+            formDto.setId(String.valueOf(result.getData()));
+        }
+        return result;
     }
 
     @Override

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/form/EpdcEventSubmitFormDTO.java

@@ -16,6 +16,12 @@ import java.util.List;
 public class EpdcEventSubmitFormDTO implements Serializable {
     private static final long serialVersionUID = -1869446375416414676L;
 
+
+    /**
+     * 事件ID
+     */
+    private String id;
+
     /**
      * 事件内容
      */

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcAppEventsController.java

@@ -8,6 +8,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.events.form.EpdcEventSubmitFormDTO;
 import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
 import com.elink.esua.epdc.dto.issue.IssueDTO;
+import com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity;
 import com.elink.esua.epdc.modules.events.service.EpdcEventsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -36,8 +37,10 @@ public class EpdcAppEventsController {
     public Result submitEvent(@RequestBody EpdcEventSubmitFormDTO formDto) {
         //效验数据
         ValidatorUtils.validateEntity(formDto);
-        epdcEventsService.saveEvent(formDto);
+        EpdcEventsEntity epdcEventsEntity = epdcEventsService.saveEvent(formDto);
-        return new Result();
+        Result result = new Result();
+        result.setData(epdcEventsEntity.getId());
+        return result;
     }
 
     /**

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/EpdcEventsEntity.java

@@ -43,6 +43,10 @@ import java.util.Date;
 public class EpdcEventsEntity extends BaseEpdcEntity {
 	private static final long serialVersionUID = 1L;
 
+    /**
+     * 事件ID
+     */
+    private String id;
     /**
      * 用户ID
      */

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java

@@ -19,6 +19,12 @@ import java.util.List;
 public class TopicSubmitFormDTO implements Serializable {
     private static final long serialVersionUID = 7888315361241643792L;
 
+
+    /**
+     * 话题ID  - 返参
+     */
+    private String id;
+
     /**
      * 话题内容
      */

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/group/service/impl/GroupServiceImpl.java

@@ -163,10 +163,11 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
                 userGroupDTO.setGroupId(entity.getId());
                 userGroupService.save(userGroupDTO);
             }
-            //返回社区ID
-            formDto.setId(entity.getId());
         }
-        return new Result();
+        //修改 返回社区ID  积分埋点使用
+        Result result = new Result();
+        result.setData(entity.getId());
+        return result;
     }
 
     @Override

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/entity/TopicEntity.java

@@ -39,6 +39,14 @@ public class TopicEntity extends BaseEpdcEntity {
 
 	private static final long serialVersionUID = 1L;
 
+
+
+    /**
+     * 话题ID
+     */
+    private String id;
+
+
     /**
      * 用户ID
      */

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/java/com.elink.esua.epdc/modules/topic/service/impl/TopicServiceImpl.java

@@ -192,8 +192,9 @@ public class TopicServiceImpl extends BaseServiceImpl<TopicDao, TopicEntity> imp
             }
 
             groupTopicUserReadService.insertBatch(readEntities);
-
+            Result result = new Result();
-            return new Result();
+            result.setData(entity.getId());
+            return result;
         }
         return new Result().error();
     }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppNewsController.java

@@ -83,23 +83,7 @@ public class EpdcAppNewsController {
     }
 
     /***
-     * @Description 点赞
+     * @Description 点赞或踩
-     * @Author qushutong
-     * @Date 2019/9/7 14:15
-     * @Param []
-     * @Return com.elink.esua.epdc.commons.tools.utils.Result
-     * @Exception
-     *
-     */
-    @PostMapping("statementSupport")
-    @RecordUserBehavior(behavior = BehaviorEnum.NEWS_SUPPORT, referenceId = "#{newsStatementFromDTO.getNewsId}", userId = "#{newsStatementFromDTO.getUserId}")
-    public Result upDateStatementSupport(@RequestBody EpdcNewsStatementFromDTO newsStatementFromDTO) {
-        ValidatorUtils.validateEntity(newsStatementFromDTO);
-        return newsService.modifyStatement(newsStatementFromDTO);
-    }
-
-    /***
-     * @Description 点踩
      * @Author qushutong
      * @Date 2019/9/7 14:15
      * @Param []
@@ -108,7 +92,6 @@ public class EpdcAppNewsController {
      *
      */
     @PostMapping("statement")
-    @RecordUserBehavior(behavior = BehaviorEnum.NEWS_OPPOSITION, referenceId = "#{newsStatementFromDTO.getNewsId}", userId = "#{newsStatementFromDTO.getUserId}")
     public Result upDateStatement(@RequestBody EpdcNewsStatementFromDTO newsStatementFromDTO) {
         ValidatorUtils.validateEntity(newsStatementFromDTO);
         return newsService.modifyStatement(newsStatementFromDTO);
@@ -124,7 +107,6 @@ public class EpdcAppNewsController {
      *
      */
     @PostMapping("browse")
-    @RecordUserBehavior(behavior = BehaviorEnum.NEWS_BROWSE, referenceId = "#{newsBrowseFromDTO.getNewsId}", userId = "#{newsBrowseFromDTO.getUserId}")
     public Result modifyNewsBrowse(@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO) {
         ValidatorUtils.validateEntity(newsBrowseFromDTO);
         return newsService.modifyNewsBrowse(newsBrowseFromDTO);