活动修改

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

@@ -4,6 +4,8 @@ import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
+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.utils.Result;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.service.ActInfoService;
@@ -33,7 +35,8 @@ public class ApiAppActInfoController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("list")
-    public Result<List<ActInfoAppResultDTO>> listItems(ActInfoAppFormDTO formDto) {
+    public Result<List<ActInfoAppResultDTO>> listItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) {
+        formDto.setUserId(tokenDto.getUserId());
         return actInfoService.listItems(formDto);
     }
     /**
@@ -44,7 +47,8 @@ public class ApiAppActInfoController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("signupList")
-    public Result<List<ActInfoAppResultDTO>> signupListItems(ActInfoAppFormDTO formDto) {
+    public Result<List<ActInfoAppResultDTO>> signupListItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) {
+        formDto.setUserId(tokenDto.getUserId());
         return actInfoService.signupListItems(formDto);
     }
 
@@ -56,8 +60,11 @@ public class ApiAppActInfoController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("detail/{id}")
-    public Result<ActInfoDetailAppResultDTO> detail(@PathVariable String id) {
+    public Result<ActInfoDetailAppResultDTO> detail(@PathVariable String id, @LoginUser TokenDto tokenDto) {
-        return actInfoService.getDetail(id);
+        ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
+        formDto.setId(id);
+        formDto.setUserId(tokenDto.getUserId());
+        return actInfoService.getDetail(formDto);
     }
 
     /**
@@ -68,8 +75,11 @@ public class ApiAppActInfoController {
      * @Date: 2019/11/19 16:34
      */
     @GetMapping("rejectDetail/{id}")
-    public Result<ActInfoDetailAppResultDTO> rejectDetail(@PathVariable String id) {
+    public Result<ActInfoDetailAppResultDTO> rejectDetail(@PathVariable String id, @LoginUser TokenDto tokenDto) {
-        return actInfoService.getRejectDetail(id);
+        ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
+        formDto.setId(id);
+        formDto.setUserId(tokenDto.getUserId());
+        return actInfoService.getRejectDetail(formDto);
     }
 
     /**

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java

@@ -4,6 +4,8 @@ import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
+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.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.FeignRequestInterceptor;
@@ -56,11 +58,11 @@ public interface ActInfoFeignClient {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:42
      */
-    @GetMapping(value = "heart/appactinfo/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "heart/appactinfo/detail", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ActInfoDetailAppResultDTO> getDetail(@PathVariable String id);
+    Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto);
 
-    @GetMapping(value = "heart/appactinfo/rejectdetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "heart/appactinfo/rejectdetail", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<ActInfoDetailAppResultDTO> getRejectDetail(@PathVariable String id);
+    Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto);
 
     @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id);

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java

@@ -34,12 +34,12 @@ public class ActInfoFeignClientFallback implements ActInfoFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "signupListItems", formDto);
     }
     @Override
-    public Result<ActInfoDetailAppResultDTO> getDetail(@PathVariable String id) {
+    public Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getDetail", id);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getDetail", formDto);
     }
     @Override
-    public Result<ActInfoDetailAppResultDTO> getRejectDetail(@PathVariable String id) {
+    public Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getRejectDetail", id);
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getRejectDetail", formDto);
     }
     @Override
     public Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id) {

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

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.result.*;
 
@@ -40,9 +41,9 @@ public interface ActInfoService {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:34
      */
-    Result<ActInfoDetailAppResultDTO> getDetail(String itemId);
+    Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto);
 
-    Result<ActInfoDetailAppResultDTO> getRejectDetail(String itemId);
+    Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto);
 
     Result<ActInfoDetailAppResultDTO> getCancelDetail(String itemId);
 

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

@@ -4,6 +4,7 @@ import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
 import com.elink.esua.epdc.dto.item.form.*;
@@ -40,12 +41,12 @@ public class ActInfoServiceImpl implements ActInfoService {
     }
 
     @Override
-    public Result<ActInfoDetailAppResultDTO> getDetail(String itemId) {
+    public Result<ActInfoDetailAppResultDTO> getDetail(ActInfoAppFormDTO formDto) {
-        return actInfoFeignClient.getDetail(itemId);
+        return actInfoFeignClient.getDetail(formDto);
     }
     @Override
-    public Result<ActInfoDetailAppResultDTO> getRejectDetail(String itemId) {
+    public Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto) {
-        return actInfoFeignClient.getRejectDetail(itemId);
+        return actInfoFeignClient.getRejectDetail(formDto);
     }
     @Override
     public Result<ActInfoDetailAppResultDTO> getCancelDetail(String itemId) {

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoAppFormDTO.java

@@ -42,7 +42,7 @@ public class ActInfoAppFormDTO implements Serializable {
     @Min(value = 1, message = "页码必须大于0")
     private int pageIndex;
 
-    private Long userId;
+    private String userId;
 
     private String id;
     /**

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml

@@ -66,6 +66,12 @@
             <groupId>com.alibaba.boot</groupId>
             <artifactId>nacos-config-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc</groupId>
+            <artifactId>epdc-common-clienttoken</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java

@@ -22,6 +22,8 @@ import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.activity.result.AppActInfoDTO;
+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.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
@@ -87,9 +89,9 @@ public class AppActInfoController {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:46
      */
-    @GetMapping("detail/{id}")
+    @GetMapping("detail")
-    public Result<ActInfoDetailAppResultDTO> getDetail(@PathVariable String id) {
+    public Result<ActInfoDetailAppResultDTO> getDetail(@RequestBody ActInfoAppFormDTO formDto) {
-        return this.actInfoService.getDetailByApp(id);
+        return this.actInfoService.getDetailByApp(formDto);
     }
 
     /**
@@ -99,9 +101,9 @@ public class AppActInfoController {
      * @Author: lipengfei
      * @Date: 2019/11/19 16:46
      */
-    @GetMapping("rejectdetail/{id}")
+    @GetMapping("rejectdetail")
-    public Result<ActInfoDetailAppResultDTO> getRejectDetail(@PathVariable String id) {
+    public Result<ActInfoDetailAppResultDTO> getRejectDetail(@RequestBody ActInfoAppFormDTO formDto) {
-        return this.actInfoService.getRejectDetailByApp(id);
+        return this.actInfoService.getRejectDetailByApp(formDto);
     }
     /**
      * 项目详情--工作端

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.activity.form.ActInfoFormDTO;
 import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoResultDTO;
+import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -95,7 +96,7 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/10 20:54
      */
-    Result<ActInfoDetailAppResultDTO> getDetailByApp(String id);
+    Result<ActInfoDetailAppResultDTO> getDetailByApp(ActInfoAppFormDTO formDto);
     /**
      * 移动端-项目详情
      * @Params: [formDto]
@@ -103,7 +104,7 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
      * @Author: liuchuang
      * @Date: 2019/9/10 20:54
      */
-    Result<ActInfoDetailAppResultDTO> getRejectDetailByApp(String id);
+    Result<ActInfoDetailAppResultDTO> getRejectDetailByApp(ActInfoAppFormDTO formDto);
 
     /**
      * 移动端-项目详情

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java

@@ -162,8 +162,6 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     @Override
     public Result<List<ActInfoAppResultDTO>> signupListItemsByApp(ActInfoAppFormDTO formDto) {
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
-        formDto.setUserId(SecurityUser.getUserId());
-
         formDto.setPageIndex(pageIndex);
         List<ActInfoAppResultDTO> data = baseDao.signupListItemsByApp(formDto);
         return new Result<List<ActInfoAppResultDTO>>().ok(data);
@@ -178,8 +176,6 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     @Override
     public Result<List<ActInfoAppResultDTO>> listItemsByApp(ActInfoAppFormDTO formDto) {
         int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
-        formDto.setUserId(SecurityUser.getUserId());
-
         formDto.setPageIndex(pageIndex);
         List<ActInfoAppResultDTO> data = baseDao.listItemsByApp(formDto);
         return new Result<List<ActInfoAppResultDTO>>().ok(data);
@@ -208,10 +204,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
     @Override
-    public Result<ActInfoDetailAppResultDTO> getDetailByApp(String id) {
+    public Result<ActInfoDetailAppResultDTO> getDetailByApp(ActInfoAppFormDTO formDto) {
-        ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
+
-        formDto.setId(id);
-        formDto.setUserId(SecurityUser.getUserId());
         Date currentTime = new Date();
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String dateString = formatter.format(currentTime);
@@ -220,11 +214,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         return new Result<ActInfoDetailAppResultDTO>().ok(resultDTO);
     }
     @Override
-    public Result<ActInfoDetailAppResultDTO> getRejectDetailByApp(String id) {
+    public Result<ActInfoDetailAppResultDTO> getRejectDetailByApp(ActInfoAppFormDTO formDto) {
-        ActInfoAppFormDTO formDto = new ActInfoAppFormDTO();
-        formDto.setId(id);
-        formDto.setUserId(SecurityUser.getUserId());
-
         ActInfoDetailAppResultDTO resultDTO = baseDao.getRejectDetailByApp(formDto);
         return new Result<ActInfoDetailAppResultDTO>().ok(resultDTO);
     }