Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/gambit/qo/AllReviewQO.java

@@ -33,7 +33,7 @@ public class AllReviewQO {
     @ApiModelProperty(value = "动态id",example = "1")
     private String dynamicId;
 
-    @ApiModelProperty(value = "用户id",example = "1",hidden = true)
+    @ApiModelProperty(value = "用户id",example = "1",required = false)
     private Integer userAccountId;
 
     /**

csf-common/csf-common-model/src/main/java/com/mmc/csf/user/vo/ChangeUserPointVO.java

+package com.mmc.csf.user.vo;
+
+import com.mmc.csf.release.model.group.Update;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author: zj
+ * @Date: 2023/10/17 17:24
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChangeUserPointVO implements Serializable {
+    private static final long serialVersionUID = -1481188328848093579L;
+
+    @ApiModelProperty(value = "用户id", example = "1")
+    @NotNull(message = "用户id不能为空", groups = {Update.class})
+    private Integer userAccountId;
+
+    @ApiModelProperty(value = "变动类型", example = "1")
+    private Integer changeType;
+
+    @ApiModelProperty(value = "变动积分, 正加负减", example = "1")
+    @NotNull(message = "变动积分不能为空", groups = {Update.class})
+    private Integer changePoint;
+}
\ No newline at end of file

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 67da19414a5bc7ee95e8551e8e3382f3b3220bab
+  newTag: 15944a2bdd1db10ac3313d10575119f6d3a75a8a

release-service/src/main/java/com/mmc/csf/release/controller/BackstageForumController.java

@@ -23,7 +23,7 @@ import io.swagger.annotations.ApiResponses;
 @Api(tags = {"后台-论坛管理-模块"})
 @RestController
 @RequestMapping("/backstage/forum")
-public class BackstageForumController {
+public class BackstageForumController extends BaseController{
 
     @Autowired
     BackstageForumService backstageForumService;
@@ -60,7 +60,7 @@ public class BackstageForumController {
     @ApiOperation(value = "审核动态")
     @GetMapping("/checkDynamic")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
-    public ResultBody checkDynamic(@RequestParam Integer dynamicId, @RequestParam Boolean status) {
-        return backstageForumService.checkDynamic(dynamicId, status);
+    public ResultBody checkDynamic(@RequestParam Integer dynamicId, @RequestParam Boolean status, HttpServletRequest request) {
+        return backstageForumService.checkDynamic(dynamicId, status, this.getUserLoginInfoFromRedis(request).getToken());
     }
 }

release-service/src/main/java/com/mmc/csf/release/controller/DynamicController.java

@@ -15,6 +15,8 @@ import com.mmc.csf.release.gambit.qo.PostingLeaderboardQO;
 import com.mmc.csf.release.gambit.vo.ForumGambitVO;
 import com.mmc.csf.release.service.DynamicService;
 import io.swagger.annotations.*;
+import lombok.extern.log4j.Log4j;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -25,6 +27,7 @@ import java.util.List;
  * @Author LW
  * @date 2023/5/15 10:29 概要：动态信息控制层
  */
+@Slf4j
 @Api(tags = {"web-小程序-论坛社区-模块"})
 @RestController
 @RequestMapping("/dynamic")
@@ -71,12 +74,18 @@ public class DynamicController extends BaseController {
          return dynamicService.deleteComment(id);
      }
  */
+
     @ApiOperation(value = "动态详情")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicVO.class)})
     @GetMapping("/dynamicDetails")
-    public ResultBody<DynamicVO> dynamicDetails(@RequestParam Integer dynamicId, HttpServletRequest request) {
-        return dynamicService.dynamicDetails(
-                dynamicId, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request);
+    public ResultBody<DynamicVO> dynamicDetails(@RequestParam Integer dynamicId, HttpServletRequest request,
+                                                @RequestParam(required = false) Integer userAccountId) {
+        if (userAccountId==null){
+            Integer userAccountId1 = this.getUserLoginInfoFromRedis(request).getUserAccountId();
+           userAccountId=userAccountId1;
+
+        }
+        return dynamicService.dynamicDetails(dynamicId, userAccountId, request);
     }
 
     @ApiOperation(value = "动态 列表")

release-service/src/main/java/com/mmc/csf/release/controller/GambitController.java

@@ -10,6 +10,7 @@ import com.mmc.csf.release.gambit.vo.ForumGambitVO;
 import com.mmc.csf.release.service.gambit.GambitService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -106,9 +107,14 @@ public class GambitController extends BaseController{
 
     @ApiOperation(value = "动态对应的所有评论")
     @PostMapping("/allCommentList")
-    public ResultBody<ForumReviewDO> allCommentList(HttpServletRequest request, @RequestBody AllReviewQO allReviewQO){
-        Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
-        allReviewQO.setUserAccountId(userAccountId);
+    public ResultBody<ForumReviewDO> allCommentList(HttpServletRequest request, @RequestBody  AllReviewQO allReviewQO){
+
+        Integer userAccountId = allReviewQO.getUserAccountId();
+        if (userAccountId==null){
+            Integer userAccountId2 = this.getUserLoginInfoFromRedis(request).getUserAccountId();
+            allReviewQO.setUserAccountId(userAccountId2);
+        }
+        allReviewQO.setUserAccountId(allReviewQO.getUserAccountId());
         return ResultBody.success(gambitService.allCommentList(allReviewQO));
     }
 
@@ -153,7 +159,7 @@ public class GambitController extends BaseController{
     @GetMapping("/userMessage")
     public ResultBody<ForumCountDO> userMessage(HttpServletRequest request, @ApiParam(value = "userAccountId") @RequestParam Integer userAccountId){
         Integer userId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
-        return gambitService.userMessage(userAccountId,userId);
+        return gambitService.userMessage(userAccountId,userId,request);
     }
 
 

release-service/src/main/java/com/mmc/csf/release/entity/forum/ForumCountDO.java

@@ -48,6 +48,11 @@ public class ForumCountDO implements Serializable {
     @ApiModelProperty(value = "实名认证的用户信息")
     private UserAccountMessageVo userAccountMessageVo;
 
+    @ApiModelProperty(value = "是否是飞手")
+    private Boolean  pilotStatus;
+
+    @ApiModelProperty(value = "飞手id")
+    private Integer pilotId;
 
 
 }

release-service/src/main/java/com/mmc/csf/release/feign/UserAppApi.java

 package com.mmc.csf.release.feign;
 
 
+import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.dto.PilotCertificationInteriorDTO;
 import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
 import com.mmc.csf.release.auth.qo.BUserAccountQO;
 import com.mmc.csf.release.auth.qo.UserAccountQO;
 import com.mmc.csf.release.feign.hystrix.UserAppApiHystrix;
+import com.mmc.csf.user.vo.ChangeUserPointVO;
 import io.swagger.annotations.ApiParam;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -70,4 +72,6 @@ public interface UserAppApi {
     @GetMapping(value = "/userapp/pilot/interiorDetailPilot")
     public PilotCertificationInteriorDTO feignInteriorDetailPilot(@RequestParam(required = true) Integer userAccountId);
 
+    @PostMapping("/userapp/userPoint/change")
+    public ResultBody changeUserPoint(@RequestBody ChangeUserPointVO changePoint, @RequestHeader("token") String token);
 }

release-service/src/main/java/com/mmc/csf/release/feign/hystrix/UserAppApiHystrix.java

 package com.mmc.csf.release.feign.hystrix;
 
+import com.alibaba.fastjson.JSONObject;
+import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.common.util.web.ResultEnum;
 import com.mmc.csf.infomation.dto.PilotCertificationInteriorDTO;
 import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
 import com.mmc.csf.release.auth.qo.BUserAccountQO;
 import com.mmc.csf.release.auth.qo.UserAccountQO;
 import com.mmc.csf.release.feign.UserAppApi;
+import com.mmc.csf.user.vo.ChangeUserPointVO;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
@@ -44,4 +48,10 @@ public class UserAppApiHystrix implements UserAppApi {
         log.error("熔断：feignInteriorDetailPilot：{}", userAccountId);
         return null;
     }
+
+    @Override
+    public ResultBody changeUserPoint(ChangeUserPointVO changePoint, String token) {
+        log.error("发放积分 熔断：changeUserPoint：{}", JSONObject.toJSON(changePoint));
+        return ResultBody.error(ResultEnum.OPERATION_SYS_ERROR);
+    }
 }

release-service/src/main/java/com/mmc/csf/release/service/BackstageForumService.java

@@ -19,6 +19,6 @@ public interface BackstageForumService {
 
     ResultBody likeUserInfo(Integer dynamicId, HttpServletRequest request);
 
-    ResultBody checkDynamic(Integer dynamicId, Boolean status);
+    ResultBody checkDynamic(Integer dynamicId, Boolean status, String token);
 
 }

release-service/src/main/java/com/mmc/csf/release/service/gambit/GambitService.java

@@ -43,5 +43,5 @@ public interface GambitService {
 
     PageResult myFansList(UserTopicDynamicsQO userTopicDynamicsQO);
 
-    ResultBody userMessage(Integer userAccountId,Integer userId);
+    ResultBody userMessage(Integer userAccountId,Integer userId,HttpServletRequest request);
 }

release-service/src/main/java/com/mmc/csf/release/service/gambit/impl/GambitServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
+import com.mmc.csf.infomation.dto.PilotCertificationInteriorDTO;
 import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
 import com.mmc.csf.release.auth.qo.UserAccountQO;
 import com.mmc.csf.release.constant.TokenConstant;
@@ -440,7 +441,7 @@ public class GambitServiceImpl implements GambitService {
     }
 
     @Override
-    public ResultBody userMessage(Integer userAccountId,Integer userId) {
+    public ResultBody userMessage(Integer userAccountId,Integer userId,HttpServletRequest request) {
       ForumCountDO forumCountDO= gambitDao.userMessage(userAccountId);
       if (forumCountDO==null){
           gambitDao.insertCount(userAccountId);
@@ -456,6 +457,14 @@ public class GambitServiceImpl implements GambitService {
         if (i1!=0){
             forumCountDO.setStatus(true);
         }
+        PilotCertificationInteriorDTO pilotCertificationInteriorDTO = feignInteriorDetailPilot(userAccountId, request);
+        if (pilotCertificationInteriorDTO!=null){
+            forumCountDO.setPilotStatus(true);
+            forumCountDO.setPilotId(pilotCertificationInteriorDTO.getId());
+        }
+        if (pilotCertificationInteriorDTO==null){
+            forumCountDO.setPilotStatus(false);
+        }
         return ResultBody.success(forumCountDO);
     }
 
@@ -522,4 +531,15 @@ public class GambitServiceImpl implements GambitService {
         return userAccountVO;
     }
 
+
+    public PilotCertificationInteriorDTO feignInteriorDetailPilot(Integer userAccountId, HttpServletRequest request) {
+        String token = request.getHeader("token");
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.add("token", token);
+        HttpEntity<String> entity = new HttpEntity<>(JSONObject.toJSONString(userAccountId), headers);
+        ResponseEntity<PilotCertificationInteriorDTO> exchange1 = restTemplate.exchange(userApp + "/userapp/pilot/interiorDetailPilot?userAccountId=" + userAccountId, HttpMethod.GET, entity, PilotCertificationInteriorDTO.class);
+        PilotCertificationInteriorDTO body = exchange1.getBody();
+        return body;
+    }
 }

release-service/src/main/java/com/mmc/csf/release/service/impl/BackstageForumServiceImpl.java

@@ -32,6 +32,7 @@ import com.mmc.csf.release.forum.dto.DynamicInfoDTO;
 import com.mmc.csf.release.forum.qo.DynamicQO;
 import com.mmc.csf.release.forum.vo.UserBaseInfoVO;
 import com.mmc.csf.release.service.BackstageForumService;
+import com.mmc.csf.user.vo.ChangeUserPointVO;
 
 /**
  * @Author LW
@@ -182,7 +183,7 @@ public class BackstageForumServiceImpl implements BackstageForumService {
 
 
     @Override
-    public ResultBody checkDynamic(Integer dynamicId, Boolean status) {
+    public ResultBody checkDynamic(Integer dynamicId, Boolean status, String token) {
         if (status) {
             //审核通过
             dynamicDao.updateCheckDynamic(dynamicId, 1);
@@ -202,6 +203,13 @@ public class BackstageForumServiceImpl implements BackstageForumService {
                 long count = ga.stream().filter(u -> u.getGambitId().equals(gambitDO.getId())).count();
                 dynamicDao.updateDiscussionCount(gambitDO.getId(),count);
             }
+            ForumDynamicDO dynamicDO = dynamicDao.getDynamicInfoById(dynamicId);
+            // 论坛通过发积分，暂时先发5积分
+            ChangeUserPointVO changePoint = new ChangeUserPointVO();
+            changePoint.setUserAccountId(dynamicDO.getUserAccountId());
+            changePoint.setChangeType(3);
+            changePoint.setChangePoint(5);
+            userAppApi.changeUserPoint(changePoint, token);
         } else {
             dynamicDao.updateCheckDynamic(dynamicId, 2);
             List<DynamicGambitDO> gambitDOList=  gambitDao.selectGambitDynamic(dynamicId);

release-service/src/main/java/com/mmc/csf/release/service/impl/DynamicServiceImpl.java

@@ -26,7 +26,6 @@ import com.mmc.csf.release.dao.DynamicDao;
 import com.mmc.csf.release.dao.LikeDAO;
 import com.mmc.csf.release.dao.gambit.GambitDao;
 import com.mmc.csf.release.entity.forum.*;
-import com.mmc.csf.release.entity.forum.ForumReviewDO;
 import com.mmc.csf.release.entity.gambit.ForumAttentionDO;
 import com.mmc.csf.release.entity.gambit.ForumGambitDO;
 import com.mmc.csf.release.feign.UserAppApi;
@@ -37,6 +36,7 @@ import com.mmc.csf.release.gambit.qo.ForumGambitQO;
 import com.mmc.csf.release.gambit.qo.PostingLeaderboardQO;
 import com.mmc.csf.release.service.DynamicService;
 import com.mmc.csf.release.service.WxApiService;
+import com.mmc.csf.user.vo.ChangeUserPointVO;
 import com.mmc.csf.user.vo.UserAccountVO;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.*;
@@ -152,6 +152,12 @@ public class DynamicServiceImpl implements DynamicService {
                         }
                     }
                 }
+                // 论坛通过发积分，暂时先发5积分
+                ChangeUserPointVO changePoint = new ChangeUserPointVO();
+                changePoint.setUserAccountId(userAccountId);
+                changePoint.setChangeType(3);
+                changePoint.setChangePoint(5);
+                userAppApi.changeUserPoint(changePoint, request.getHeader(TokenConstant.TOKEN));
             } else {
                 forumDynamicDO.setCheckStatus(2);
                 dynamicDao.insertDynamic(forumDynamicDO);

release-service/src/main/resources/not-check.yml

@@ -42,3 +42,5 @@ data-filter:
     - /release/curriculum/getCurriculumCount
     - /release/report/getReleaseReportData
     - /release/dynamic/getPilot
+    - /release/dynamic/dynamicDetails
+    - /release/gambit/allCommentList