添加调用认证token

release-service/src/main/java/com/mmc/csf/release/auth/TokenCheckHandleInterceptor.java

@@ -2,6 +2,7 @@ package com.mmc.csf.release.auth;
 
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.common.util.web.ResultEnum;
+import com.mmc.csf.release.constant.TokenConstant;
 import com.mmc.csf.release.util.PathUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,8 +35,7 @@ public class TokenCheckHandleInterceptor implements HandlerInterceptor {
         if (!shouldFilter(requestURI)){
             return true;
         }
-        if (request.getServerName().equals("iuav.mmcuav.cn") || request.getServerName().equals("test.iuav.mmcuav.cn")){
-            String token = request.getHeader("token");
+        String token = request.getHeader(TokenConstant.TOKEN);
         if (StringUtils.isBlank(token)){
             exceptionProcess(response);
             return false;
@@ -45,8 +45,21 @@ public class TokenCheckHandleInterceptor implements HandlerInterceptor {
             exceptionProcess(response);
             return false;
         }
-            return true;
-        }
+//        return true;
+//
+//        if (request.getServerName().equals("iuav.mmcuav.cn") || request.getServerName().equals("test.iuav.mmcuav.cn")){
+//            String token = request.getHeader("token");
+//            if (StringUtils.isBlank(token)){
+//                exceptionProcess(response);
+//                return false;
+//            }
+//            String tokenJson = stringRedisTemplate.opsForValue().get(token);
+//            if (StringUtils.isBlank(tokenJson)){
+//                exceptionProcess(response);
+//                return false;
+//            }
+//            return true;
+//        }
         return true;
     }
 

release-service/src/main/java/com/mmc/csf/release/constant/TokenConstant.java

+package com.mmc.csf.release.constant;
+
+/**
+ * @author: zj
+ * @Date: 2023/5/31 20:07
+ */
+public class TokenConstant {
+    public static final String TOKEN = "token";
+}

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

@@ -55,21 +55,21 @@ public class DynamicController extends BaseController {
     @ApiOperation(value = "根据动态查看评论")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CommentAndReplyVO.class)})
     @GetMapping("/byDynamic")
-    public ResultBody getCommentsByDynamic(@RequestParam Integer dynamicId) {
-        return ResultBody.success(dynamicService.getCommentAndReply(dynamicId));
+    public ResultBody getCommentsByDynamic(@RequestParam Integer dynamicId, HttpServletRequest request) {
+        return ResultBody.success(dynamicService.getCommentAndReply(dynamicId, request));
     }
 
     @ApiOperation(value = "动态详情")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicVO.class)})
     @GetMapping("/dynamicDetails")
     public ResultBody dynamicDetails(@RequestParam Integer dynamicId,HttpServletRequest request) {
-        return dynamicService.dynamicDetails(dynamicId,this.getUserLoginInfoFromRedis(request).getUserAccountId());
+        return dynamicService.dynamicDetails(dynamicId,this.getUserLoginInfoFromRedis(request).getUserAccountId(), request);
     }
 
     @ApiOperation(value = "动态列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicVO.class)})
     @GetMapping("/dynamicList")
     public ResultBody dynamicList(@RequestParam Integer pageNo, @RequestParam Integer pageSize,HttpServletRequest request) {
-        return ResultBody.success(dynamicService.dynamicList(pageNo, pageSize, this.getUserLoginInfoFromRedis(request).getUserAccountId()));
+        return ResultBody.success(dynamicService.dynamicList(pageNo, pageSize, this.getUserLoginInfoFromRedis(request).getUserAccountId(), request));
     }
 }

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

@@ -13,6 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author: zj
  * @Date: 2023/5/19 11:34
@@ -27,8 +29,8 @@ public class IndustryCaseController {
     @ApiOperation(value = "案例列表")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = IndustryCaseVO.class) })
     @PostMapping("listCasePage")
-    public ResultBody listCasePage(@Validated(value = {Page.class})@RequestBody IndustryCaseQO industryCaseQO){
-        return industryCaseService.listCasePage(industryCaseQO);
+    public ResultBody listCasePage(@Validated(value = {Page.class})@RequestBody IndustryCaseQO industryCaseQO, HttpServletRequest request){
+        return industryCaseService.listCasePage(industryCaseQO, request);
     }
 
     @ApiOperation(value = "案例详情")

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

@@ -14,6 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author: zj
  * @Date: 2023/5/19 10:42
@@ -28,8 +30,8 @@ public class IndustryNewsController {
     @ApiOperation(value = "新闻列表")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = IndustryNewsVO.class) })
     @PostMapping("listNewsPage")
-    public ResultBody listNewsPage(@Validated(value = {Page.class})@RequestBody IndustryCaseQO industryCaseQO){
-        return industryNewsService.listNewsPage(industryCaseQO);
+    public ResultBody listNewsPage(@Validated(value = {Page.class})@RequestBody IndustryCaseQO industryCaseQO, HttpServletRequest request){
+        return industryNewsService.listNewsPage(industryCaseQO, request);
     }
 
     @ApiOperation(value = "新闻详情")

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

@@ -42,14 +42,14 @@ public class RequirementsController extends BaseController{
     @PostMapping("publish")
     public ResultBody publish(@Validated(value = {Insert.class})@RequestBody RequirementsInfoVO requirementsInfoVO, HttpServletRequest request){
         requirementsInfoVO.setUserAccountId(this.getUserLoginInfoFromRedis(request).getUserAccountId());
-        return requirementsService.publish(requirementsInfoVO);
+        return requirementsService.publish(requirementsInfoVO, request);
     }
 
     @ApiOperation(value = "需求发布列表")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = RequirementsInfoVO.class) })
     @PostMapping("listPublishPage")
-    public ResultBody listPublishPage(@Validated(value = {Page.class})@RequestBody IndustryCaseQO industryCaseQO){
-        return requirementsService.listPublishPage(industryCaseQO);
+    public ResultBody listPublishPage(@Validated(value = {Page.class})@RequestBody IndustryCaseQO industryCaseQO, HttpServletRequest request){
+        return requirementsService.listPublishPage(industryCaseQO, request);
     }
 
     @ApiOperation(value = "需求已解决")

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

@@ -95,7 +95,7 @@ public class TenderController extends BaseController{
     @PostMapping(value = "apply")
     public ResultBody addTenderApply(@Validated(value = {Create.class})@RequestBody TenderApplyVO tenderApplyVO, HttpServletRequest request){
         tenderApplyVO.setUserAccountId(this.getUserLoginInfoFromRedis(request).getUserAccountId());
-        return tenderService.addTenderApply(tenderApplyVO);
+        return tenderService.addTenderApply(tenderApplyVO, request);
     }
 
     @ApiOperation(value = "用户反馈列表-分页", hidden = true)
@@ -127,7 +127,7 @@ public class TenderController extends BaseController{
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppTenderInfoDTO.class)})
     @PostMapping(value = "listNewTenderInfo")
     public ResultBody listNewTenderInfo(@Validated(value = {Page.class})@RequestBody IndustryCaseQO industryCaseQO, HttpServletRequest request){
-        return tenderService.listNewTenderInfo(industryCaseQO, this.getUserLoginInfoFromRedis(request));
+        return tenderService.listNewTenderInfo(industryCaseQO, this.getUserLoginInfoFromRedis(request), request);
     }
 
 }

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

@@ -22,7 +22,7 @@ public interface UserAppApi {
      * @return
      */
     @RequestMapping(value = "/userapp/user-account/feignGetUserSimpleInfo", method = RequestMethod.GET)
-    public UserAccountSimpleDTO feignGetUserSimpleInfo(@RequestParam Integer userAccountId);
+    public UserAccountSimpleDTO feignGetUserSimpleInfo(@RequestParam Integer userAccountId, @RequestHeader("token") String token);
 
     /**
      * 根据地区信息查询用户id
@@ -32,7 +32,7 @@ public interface UserAppApi {
      * @return
      */
     @GetMapping("/userapp/user-account/feignListUserAccountIds")
-    List<Integer> feignListUserAccountIds(@RequestParam Integer provinceCode, @RequestParam Integer cityCode, @RequestParam Integer districtCode);
+    List<Integer> feignListUserAccountIds(@RequestParam Integer provinceCode, @RequestParam Integer cityCode, @RequestParam Integer districtCode, @RequestHeader(value = "token", required = false) String token);
 
 
     /**
@@ -42,5 +42,5 @@ public interface UserAppApi {
      * @return {@link List}<{@link UserAccountSimpleDTO}>
      */
     @PostMapping("/userapp/back-user/feignListBAccountPage")
-    List<UserAccountSimpleDTO> feignListBAccountPage(@ApiParam(value = "账号查询QO", required = true)  @RequestBody BUserAccountQO bUserAccountQO);
+    List<UserAccountSimpleDTO> feignListBAccountPage(@ApiParam(value = "账号查询QO", required = true)  @RequestBody BUserAccountQO bUserAccountQO, @RequestHeader("token") String token);
 }

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

@@ -14,19 +14,19 @@ import java.util.List;
 @Slf4j
 public class UserAppApiHystrix implements UserAppApi {
     @Override
-    public UserAccountSimpleDTO feignGetUserSimpleInfo(Integer userAccountId) {
+    public UserAccountSimpleDTO feignGetUserSimpleInfo(Integer userAccountId, String token) {
         log.error("熔断：feignGetUserSimpleInfo：{}", userAccountId);
         return null;
     }
 
     @Override
-    public List<Integer> feignListUserAccountIds(Integer provinceCode, Integer cityCode, Integer districtCode) {
+    public List<Integer> feignListUserAccountIds(Integer provinceCode, Integer cityCode, Integer districtCode, String token) {
         log.error("熔断：feignListUserAccountIds：{}， {}， {}", provinceCode, cityCode, districtCode);
         return null;
     }
 
     @Override
-    public List<UserAccountSimpleDTO> feignListBAccountPage(BUserAccountQO bUserAccountQO) {
+    public List<UserAccountSimpleDTO> feignListBAccountPage(BUserAccountQO bUserAccountQO, String token) {
         log.error("熔断：feignListBAccountPage：{}", bUserAccountQO);
         return null;
     }

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

@@ -6,6 +6,7 @@ import com.mmc.csf.release.forum.vo.CommentAndReplyVO;
 import com.mmc.csf.release.forum.vo.CommentVO;
 import com.mmc.csf.release.forum.vo.DynamicVO;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -51,9 +52,10 @@ public interface DynamicService {
      * 根据动态查看评论
      *
      * @param dynamicId 动态id
+     * @param request
      * @return {@link List}<{@link CommentVO}>
      */
-    List<CommentAndReplyVO> getCommentAndReply(Integer dynamicId);
+    List<CommentAndReplyVO> getCommentAndReply(Integer dynamicId, HttpServletRequest request);
 
     /**
      * 动态列表
@@ -61,9 +63,10 @@ public interface DynamicService {
      * @param pageNo   页面
      * @param pageSize 页面大小
      * @param userId
+     * @param request
      * @return {@link List}<{@link DynamicVO}>
      */
-    PageResult dynamicList(Integer pageNo, Integer pageSize, Integer userId);
+    PageResult dynamicList(Integer pageNo, Integer pageSize, Integer userId, HttpServletRequest request);
 
     /**
      * 动态细节
@@ -72,5 +75,5 @@ public interface DynamicService {
      * @param userId    用户id
      * @return {@link ResultBody}
      */
-    ResultBody dynamicDetails(Integer dynamicId, Integer userId);
+    ResultBody dynamicDetails(Integer dynamicId, Integer userId, HttpServletRequest request);
 }

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

@@ -3,6 +3,8 @@ package com.mmc.csf.release.service;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author: zj
  * @Date: 2023/5/19 13:40
@@ -11,9 +13,10 @@ public interface IndustryCaseService {
     /**
      * 案例列表
      * @param industryCaseQO
+     * @param request
      * @return
      */
-    ResultBody listCasePage(IndustryCaseQO industryCaseQO);
+    ResultBody listCasePage(IndustryCaseQO industryCaseQO, HttpServletRequest request);
 
     /**
      * 案例详情

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

@@ -3,6 +3,8 @@ package com.mmc.csf.release.service;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author: zj
  * @Date: 2023/5/19 13:40
@@ -11,9 +13,10 @@ public interface IndustryNewsService {
     /**
      * 新闻列表
      * @param industryCaseQO
+     * @param request
      * @return
      */
-    ResultBody listNewsPage(IndustryCaseQO industryCaseQO);
+    ResultBody listNewsPage(IndustryCaseQO industryCaseQO, HttpServletRequest request);
 
     /**
      * 新闻详情

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

@@ -4,6 +4,8 @@ import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.vo.RequirementsInfoVO;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * @author: zj
  * @Date: 2023/5/18 14:29
@@ -18,9 +20,10 @@ public interface RequirementsService {
     /**
      * 需求发布
      * @param requirementsInfoVO
+     * @param request
      * @return
      */
-    ResultBody publish(RequirementsInfoVO requirementsInfoVO);
+    ResultBody publish(RequirementsInfoVO requirementsInfoVO, HttpServletRequest request);
 
     /**
      * 解决需求
@@ -33,7 +36,8 @@ public interface RequirementsService {
     /**
      * 需求发布列表
      * @param industryCaseQO
+     * @param request
      * @return
      */
-    ResultBody listPublishPage(IndustryCaseQO industryCaseQO);
+    ResultBody listPublishPage(IndustryCaseQO industryCaseQO, HttpServletRequest request);
 }

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

@@ -7,6 +7,7 @@ import com.mmc.csf.infomation.vo.TenderNewsVO;
 import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -29,7 +30,7 @@ public interface TenderService {
 
     ResultBody updateTenderInfo(Integer id, String tenderContent, BigDecimal tenderPrice);
 
-    ResultBody addTenderApply(TenderApplyVO tenderApplyVO);
+    ResultBody addTenderApply(TenderApplyVO tenderApplyVO, HttpServletRequest request);
 
     ResultBody listTenderApply(Integer pageNo, Integer pageSize, Integer tenderNewsId, Integer tenderInfoId, String keyword);
 
@@ -38,5 +39,5 @@ public interface TenderService {
     ResultBody listTenderInfoAppLatest(Integer pageNo, Integer pageSize, Integer userAccountId);
 
     ResultBody listNewTenderInfo(IndustryCaseQO industryCaseQO,
-                                 LoginSuccessDTO loginSuccessDTO);
+                                 LoginSuccessDTO loginSuccessDTO, HttpServletRequest request);
 }

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

@@ -4,6 +4,7 @@ import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
 import com.mmc.csf.release.auth.qo.BUserAccountQO;
+import com.mmc.csf.release.constant.TokenConstant;
 import com.mmc.csf.release.dao.CommentDAO;
 import com.mmc.csf.release.dao.DynamicDAO;
 import com.mmc.csf.release.dao.LikeDAO;
@@ -19,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -99,11 +101,11 @@ public class DynamicServiceImpl implements DynamicService {
     }
 
     @Override
-    public List<CommentAndReplyVO> getCommentAndReply(Integer dynamicId) {
+    public List<CommentAndReplyVO> getCommentAndReply(Integer dynamicId, HttpServletRequest request) {
         // 获取评论列表
         List<CommentAndReplyVO> commentList = commentDAO.selectCommentList(dynamicId);
         commentList = commentList.stream().peek(d -> {
-            UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(d.getUserId());
+            UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(d.getUserId(), request.getHeader(TokenConstant.TOKEN));
             UserBaseInfoVO userBaseInfoVO = new UserBaseInfoVO();
             userBaseInfoVO.setId(d.getUserId());
             userBaseInfoVO.setNickName(userAccountSimpleDTO.getNickName());
@@ -130,7 +132,7 @@ public class DynamicServiceImpl implements DynamicService {
     }
 
     @Override
-    public PageResult dynamicList(Integer pageNo, Integer pageSize, Integer userId) {
+    public PageResult dynamicList(Integer pageNo, Integer pageSize, Integer userId, HttpServletRequest request) {
         int count = dynamicDAO.countDynamicList();
         if (count == 0) {
             return PageResult.buildPage(pageNo, pageSize, 0);
@@ -150,7 +152,7 @@ public class DynamicServiceImpl implements DynamicService {
         BUserAccountQO bUserAccountQO = new BUserAccountQO();
         bUserAccountQO.setUserIds(userIdList);
         // 解决bug
-        List<UserAccountSimpleDTO> userAccountSimpleDTOS = userAppApi.feignListBAccountPage(bUserAccountQO);
+        List<UserAccountSimpleDTO> userAccountSimpleDTOS = userAppApi.feignListBAccountPage(bUserAccountQO, request.getHeader(TokenConstant.TOKEN));
         Map<Integer, UserAccountSimpleDTO> userAccountInfoMap = userAccountSimpleDTOS.stream().collect(Collectors.toMap(UserAccountSimpleDTO::getId, Function.identity()));
         //获取liked信息
         List<ForumDynamicDO> forumDynamicDOS = likeDAO.selectLiked(userId, ids);
@@ -191,7 +193,7 @@ public class DynamicServiceImpl implements DynamicService {
     }
 
     @Override
-    public ResultBody dynamicDetails(Integer dynamicId, Integer userId) {
+    public ResultBody dynamicDetails(Integer dynamicId, Integer userId, HttpServletRequest request) {
         // 判断此动态是否还存在
         ForumDynamicDO dynamicInfo = dynamicDAO.getDynamicInfo(dynamicId);
         if (dynamicInfo == null) {
@@ -210,7 +212,7 @@ public class DynamicServiceImpl implements DynamicService {
         DynamicVO dynamicVO = dynamicInfo.buildDynamicVO();
         // 设置是否点赞
         boolean liked = likeDAO.isLiked(userId, dynamicId);
-        UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(dynamicInfo.getUserId());
+        UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(dynamicInfo.getUserId(), request.getHeader(TokenConstant.TOKEN));
         UserBaseInfoVO userBaseInfoVO = new UserBaseInfoVO();
         userBaseInfoVO.setNickName(userAccountSimpleDTO.getNickName());
         userBaseInfoVO.setUserImg(userAccountSimpleDTO.getUserImg());
@@ -218,7 +220,7 @@ public class DynamicServiceImpl implements DynamicService {
         dynamicVO.setUserBaseInfo(userBaseInfoVO);
         dynamicVO.setLikes(liked);
         // 设置评论信息
-        dynamicVO.setCommentAndReplyVO(this.getCommentAndReply(dynamicId));
+        dynamicVO.setCommentAndReplyVO(this.getCommentAndReply(dynamicId, request));
         dynamicVO.setMediaVO(mediaVO);
         return ResultBody.success(dynamicVO);
     }

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

@@ -4,15 +4,15 @@ import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.vo.IndustryCaseVO;
-import com.mmc.csf.infomation.vo.IndustryNewsVO;
+import com.mmc.csf.release.constant.TokenConstant;
 import com.mmc.csf.release.dao.IndustryCaseDao;
 import com.mmc.csf.release.entity.IndustryCaseDO;
-import com.mmc.csf.release.entity.IndustryNewsDO;
 import com.mmc.csf.release.feign.UserAppApi;
 import com.mmc.csf.release.service.IndustryCaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -29,9 +29,11 @@ public class IndustryCaseServiceImpl implements IndustryCaseService {
     private UserAppApi userAppApi;
 
     @Override
-    public ResultBody listCasePage(IndustryCaseQO industryCaseQO) {
+    public ResultBody listCasePage(IndustryCaseQO industryCaseQO, HttpServletRequest request) {
         //查询对应地区的用户
-        List<Integer> userIds = userAppApi.feignListUserAccountIds(industryCaseQO.getProvinceCode(), industryCaseQO.getCityCode(), industryCaseQO.getDistrictCode());
+        //查询对应地区的用户， 默认查广东
+        industryCaseQO.setProvinceCode(industryCaseQO.getProvinceCode() == null  ? 440000 : industryCaseQO.getProvinceCode());
+        List<Integer> userIds = userAppApi.feignListUserAccountIds(industryCaseQO.getProvinceCode(), industryCaseQO.getCityCode(), industryCaseQO.getDistrictCode(), request.getHeader(TokenConstant.TOKEN));
         industryCaseQO.setUserIds(userIds);
         int count = industryCaseDao.countListCasePage(industryCaseQO);
         if (count == 0) {

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

@@ -4,6 +4,7 @@ import com.mmc.csf.common.util.page.PageResult;
 import com.mmc.csf.common.util.web.ResultBody;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.vo.IndustryNewsVO;
+import com.mmc.csf.release.constant.TokenConstant;
 import com.mmc.csf.release.dao.IndustryNewsDao;
 import com.mmc.csf.release.entity.IndustryNewsDO;
 import com.mmc.csf.release.feign.UserAppApi;
@@ -11,6 +12,7 @@ import com.mmc.csf.release.service.IndustryNewsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -27,9 +29,11 @@ public class IndustryNewsServiceImpl implements IndustryNewsService {
     private UserAppApi userAppApi;
 
     @Override
-    public ResultBody listNewsPage(IndustryCaseQO industryCaseQO) {
+    public ResultBody listNewsPage(IndustryCaseQO industryCaseQO, HttpServletRequest request) {
         //查询对应地区的用户
-        List<Integer> userIds = userAppApi.feignListUserAccountIds(industryCaseQO.getProvinceCode(), industryCaseQO.getCityCode(), industryCaseQO.getDistrictCode());
+        //查询对应地区的用户， 默认查广东
+        industryCaseQO.setProvinceCode(industryCaseQO.getProvinceCode() == null  ? 440000 : industryCaseQO.getProvinceCode());
+        List<Integer> userIds = userAppApi.feignListUserAccountIds(industryCaseQO.getProvinceCode(), industryCaseQO.getCityCode(), industryCaseQO.getDistrictCode(), request.getHeader(TokenConstant.TOKEN));
         industryCaseQO.setUserIds(userIds);
         int count = industryNewsDao.countListNewsPage(industryCaseQO);
         if (count == 0) {

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

 package com.mmc.csf.release.service.impl;
 
-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.common.util.web.ResultEnum;
-import com.mmc.csf.infomation.dto.UserAccountSimpleDTO;
 import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.vo.RequirementsInfoVO;
 import com.mmc.csf.infomation.vo.RequirementsTypeVO;
+import com.mmc.csf.release.constant.TokenConstant;
 import com.mmc.csf.release.dao.RequirementsDao;
 import com.mmc.csf.release.entity.RequirementsInfoDO;
 import com.mmc.csf.release.entity.RequirementsTypeDO;
@@ -18,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -46,7 +45,7 @@ public class RequirementsServiceImpl implements RequirementsService {
     }
 
     @Override
-    public ResultBody publish(RequirementsInfoVO requirementsInfoVO) {
+    public ResultBody publish(RequirementsInfoVO requirementsInfoVO, HttpServletRequest request) {
         //是否完成认证
 //        UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(requirementsInfoVO.getUserAccountId());
 //        if (userAccountSimpleDTO == null || !userAccountSimpleDTO.getCompanyAuthStatus().toString().equals("1")){
@@ -68,9 +67,11 @@ public class RequirementsServiceImpl implements RequirementsService {
     }
 
     @Override
-    public ResultBody listPublishPage(IndustryCaseQO industryCaseQO) {
+    public ResultBody listPublishPage(IndustryCaseQO industryCaseQO, HttpServletRequest request) {
         //查询对应地区的用户
-        List<Integer> userIds = userAppApi.feignListUserAccountIds(industryCaseQO.getProvinceCode(), industryCaseQO.getCityCode(), industryCaseQO.getDistrictCode());
+        //查询对应地区的用户， 默认查广东
+        industryCaseQO.setProvinceCode(industryCaseQO.getProvinceCode() == null  ? 440000 : industryCaseQO.getProvinceCode());
+        List<Integer> userIds = userAppApi.feignListUserAccountIds(industryCaseQO.getProvinceCode(), industryCaseQO.getCityCode(), industryCaseQO.getDistrictCode(), request.getHeader(TokenConstant.TOKEN));
         industryCaseQO.setUserIds(userIds);
         int count = requirementsDao.countListPublishPage(industryCaseQO);
         if (count == 0) {

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

@@ -8,6 +8,7 @@ import com.mmc.csf.infomation.qo.IndustryCaseQO;
 import com.mmc.csf.infomation.vo.TenderApplyVO;
 import com.mmc.csf.infomation.vo.TenderNewsVO;
 import com.mmc.csf.release.auth.dto.LoginSuccessDTO;
+import com.mmc.csf.release.constant.TokenConstant;
 import com.mmc.csf.release.dao.TenderDao;
 import com.mmc.csf.release.entity.TenderApplyDO;
 import com.mmc.csf.release.entity.TenderInfoDO;
@@ -21,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -190,13 +192,13 @@ public class TenderServiceImpl implements TenderService {
     }
 
     @Override
-    public ResultBody addTenderApply(TenderApplyVO tenderApplyVO) {
+    public ResultBody addTenderApply(TenderApplyVO tenderApplyVO, HttpServletRequest request) {
         //判断之前有没有申请
         TenderApplyDO beforeTenderApplyDO = tenderDao.getTenderApplyByUId(tenderApplyVO.getUserAccountId(), tenderApplyVO.getTenderInfoId());
         if(beforeTenderApplyDO != null){
             return ResultBody.error(ResultEnum.HAS_BEEN_APPLY_ERROR);
         }
-        UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(tenderApplyVO.getUserAccountId());
+        UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(tenderApplyVO.getUserAccountId(), request.getHeader(TokenConstant.TOKEN));
         TenderApplyDO tenderApplyDO = new TenderApplyDO(tenderApplyVO);
         tenderApplyDO.setNickName(userAccountSimpleDTO.getNickName());
         tenderApplyDO.setUserName(userAccountSimpleDTO.getUserName());
@@ -274,10 +276,10 @@ public class TenderServiceImpl implements TenderService {
 
     @Override
     public ResultBody listNewTenderInfo(IndustryCaseQO industryCaseQO,
-                                        LoginSuccessDTO loginSuccessDTO) {
+                                        LoginSuccessDTO loginSuccessDTO, HttpServletRequest request) {
         //查询对应地区的用户， 默认查广东
         industryCaseQO.setProvinceCode(industryCaseQO.getProvinceCode() == null  ? 440000 : industryCaseQO.getProvinceCode());
-        List<Integer> userIds = userAppApi.feignListUserAccountIds(industryCaseQO.getProvinceCode() , industryCaseQO.getCityCode(), industryCaseQO.getDistrictCode());
+        List<Integer> userIds = userAppApi.feignListUserAccountIds(industryCaseQO.getProvinceCode() , industryCaseQO.getCityCode(), industryCaseQO.getDistrictCode(), request.getHeader(TokenConstant.TOKEN));
         industryCaseQO.setUserIds(userIds);
         int count = tenderDao.countNewListTenderInfo(industryCaseQO);
         if (count == 0) {