Merge branch 'develop_migration' into 'develop_master'

Develop migration

See merge request LiuChao/foton-slrs-system-rest!568

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.*;
-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.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<AskQuestions> {
     @Autowired
     private AskUserServiceImpl askUserService;
 
+    @Autowired
+    private SubscriptionServiceImpl subscriptionService;
+
     @GetMapping("/getAskQuestionsPage")
     public ResponseMessage<IPage<AskQuestions>> getAskQuestionsPage(AskQuestionsPage askQuestions){
         IPage<AskQuestions> iPage = new Page<>();
@@ -58,7 +60,19 @@ public class AskQuestionsController extends BaseController<AskQuestions> {
 
     @PostMapping("/list")
     public ResponseMessage<IPage<AskQuestions>> getAskQuestionslistPage(@RequestBody AskQuestionsPage askQuestions){
-        return Result.success(askQuestionsService.listPage(askQuestions));
+        IPage<AskQuestions> 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<Subscription> list = subscriptionService.list(queryWrapper);
+                if(!list.isEmpty()){
+                    questions.setSubState(list.get(0).getSubState());
+                }
+            });
+        }
+        return Result.success(iPage);
     }
 
     /**

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<Subscription> {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("ASK_ID",subscription.getAskId());
         queryWrapper.eq("USID",subscription.getUsId());
-        int number = subscriptionService.count(queryWrapper);
+        List<Subscription> list = subscriptionService.list(queryWrapper);
-        if(number>0){
+        if(!list.isEmpty()){
-            return Result.success("200","此问题已订阅",null);
+            UpdateWrapper updateWrapper = new UpdateWrapper();
-        }
+            updateWrapper.eq("ASK_ID",subscription.getAskId());
-        if(subscriptionService.save(subscription)){
+            updateWrapper.eq("USID",subscription.getUsId());
-            return Result.success("200","订阅成功",null);
+            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);
+            }
         }
     }
 }

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;
+
 }

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;
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java

@@ -74,7 +74,7 @@ public class SarStandProjectLibraryController extends BaseController<SarStandPro
 
     @GetMapping("/queryProjectWorkFlow")
     @ApiOperation("车型/项目库-！！！")
-    public ResponseMessage queryMaintenanceProjectWorkFlow(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize,SarStandProjectLibraryDto sarDto) {
+    public ResponseMessage queryMaintenanceProjectWorkFlow(int Page, int PageSize,SarStandProjectLibraryDto sarDto) {
         IPage<SarStandProjectLibrary> MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProjectWorkFlow(Page,PageSize,sarDto);
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("Maintenance",MaintenanceList);