From 4e90dfa1cf22bb08b772309980e620f687fcf115 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 4 Aug 2022 13:25:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=205?= =?UTF-8?q?6828=20=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=8C=E9=80=89=E6=8B=A9=E9=A1=B9=E7=9B=AE=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA10=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarStandProjectLibraryController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 1abb263f..00375a93 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -74,7 +74,7 @@ public class SarStandProjectLibraryController extends BaseController MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProjectWorkFlow(Page,PageSize,sarDto); Map map = new HashMap(); map.put("Maintenance",MaintenanceList); From 67c4a1afd958f4cca64f4f785812803f5187e053 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 4 Aug 2022 16:10:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20=205?= =?UTF-8?q?6904=20=E9=97=AE=E7=AD=94=E5=BA=93-=E8=AE=A2=E9=98=85=20?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=BC=82=E5=B8=B8=20api/lawss/Subscription/i?= =?UTF-8?q?nsertSubscription=20=E8=BF=99=E4=B8=AA=E6=8E=A5=E5=8F=A3=20,=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E5=8F=96=E6=B6=88=E8=AE=A2=E9=98=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AskQuestionsController.java | 24 +++++++++++--- .../controller/SubscriptionController.java | 32 +++++++++++++++---- .../slrs/StandardQA/entity/AskQuestions.java | 3 ++ .../slrs/StandardQA/entity/Subscription.java | 4 +++ 4 files changed, 51 insertions(+), 12 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java index 9a5ecd01..6ef0837a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/AskQuestionsController.java @@ -2,12 +2,11 @@ package com.adc.da.slrs.StandardQA.controller; import com.adc.da.base.web.BaseController; import com.adc.da.slrs.StandardQA.dao.AskQuestionsDao; -import com.adc.da.slrs.StandardQA.entity.AskQuestions; -import com.adc.da.slrs.StandardQA.entity.AskQuestionsPage; -import com.adc.da.slrs.StandardQA.entity.AskUser; -import com.adc.da.slrs.StandardQA.entity.Reply; +import com.adc.da.slrs.StandardQA.entity.*; import com.adc.da.slrs.StandardQA.service.Impl.AskQuestionsServiceImpl; import com.adc.da.slrs.StandardQA.service.Impl.AskUserServiceImpl; +import com.adc.da.slrs.StandardQA.service.Impl.SubscriptionServiceImpl; +import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; @@ -45,6 +44,9 @@ public class AskQuestionsController extends BaseController { @Autowired private AskUserServiceImpl askUserService; + @Autowired + private SubscriptionServiceImpl subscriptionService; + @GetMapping("/getAskQuestionsPage") public ResponseMessage> getAskQuestionsPage(AskQuestionsPage askQuestions){ IPage iPage = new Page<>(); @@ -58,7 +60,19 @@ public class AskQuestionsController extends BaseController { @PostMapping("/list") public ResponseMessage> getAskQuestionslistPage(@RequestBody AskQuestionsPage askQuestions){ - return Result.success(askQuestionsService.listPage(askQuestions)); + IPage iPage = askQuestionsService.listPage(askQuestions); + if(!iPage.getRecords().isEmpty()){ + iPage.getRecords().forEach(questions -> { + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("ASK_ID",questions.getId()); + queryWrapper.eq("USID", LoginUserUtil.getUserId()); + List list = subscriptionService.list(queryWrapper); + if(!list.isEmpty()){ + questions.setSubState(list.get(0).getSubState()); + } + }); + } + return Result.success(iPage); } /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SubscriptionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SubscriptionController.java index f8a6ec16..f300887b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SubscriptionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/controller/SubscriptionController.java @@ -7,6 +7,7 @@ import com.adc.da.slrs.StandardQA.service.Impl.SubscriptionServiceImpl; import com.adc.da.util.http.ResponseMessage; import com.adc.da.util.http.Result; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @Author: qk * @Date: 2022/6/7 0007 11:18 @@ -31,14 +34,29 @@ public class SubscriptionController extends BaseController { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq("ASK_ID",subscription.getAskId()); queryWrapper.eq("USID",subscription.getUsId()); - int number = subscriptionService.count(queryWrapper); - if(number>0){ - return Result.success("200","此问题已订阅",null); - } - if(subscriptionService.save(subscription)){ - return Result.success("200","订阅成功",null); + List list = subscriptionService.list(queryWrapper); + if(!list.isEmpty()){ + UpdateWrapper updateWrapper = new UpdateWrapper(); + updateWrapper.eq("ASK_ID",subscription.getAskId()); + updateWrapper.eq("USID",subscription.getUsId()); + updateWrapper.set("SUB_STATE",subscription.getSubState()); + if(subscriptionService.update(updateWrapper)){ + if("y".equals(subscription.getSubState())){ + return Result.success("200","订阅成功",null); + }else { + return Result.success("200","取消订阅成功",null); + } + + }else { + return Result.success("-1","订阅失败",null); + } }else { - return Result.success("-1","订阅失败",null); + subscription.setSubState("y"); + if(subscriptionService.save(subscription)){ + return Result.success("200","订阅成功",null); + }else { + return Result.success("-1","订阅失败",null); + } } } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestions.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestions.java index 84cf8afc..0f8c9755 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestions.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/AskQuestions.java @@ -101,4 +101,7 @@ public class AskQuestions extends BaseEntity { @TableField(exist = false) private String subscription; + @TableField(exist = false) + private String subState; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Subscription.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Subscription.java index 47c1169e..5e46f3bf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Subscription.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/StandardQA/entity/Subscription.java @@ -28,4 +28,8 @@ public class Subscription extends BaseEntity { @TableField("USID") @ApiModelProperty(value = "用户ID") private String usId; + + @TableField("SUB_STATE") + @ApiModelProperty(value = "订阅状态 默认 n 未订阅 y 已订阅") + private String subState; }