暂降事件

2023-09-06 14:21:47 +08:00
parent 61a9a99e47
commit 61ebd8830e
25 changed files with 478 additions and 64 deletions
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/feedback/FeedBackChatController.java
+++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/feedback/FeedBackChatController.java
@@ -53,7 +53,7 @@ public class FeedBackChatController extends BaseController {
    }
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/updateChatStatus")
-    @ApiOperation("更新反馈聊天状态")
+    @ApiOperation("非反馈人员点击发送处理中消息")
    @ApiImplicitParam(name = "CsFeedbackChatCheckParm", value = "新增反馈聊天参数", required = true)
    public HttpResult<Boolean> updateChatStatus(@RequestBody@Validated CsFeedbackChatCheckParm CsFeedbackChatCheckParm){
        String methodDescribe = getMethodDescribe("updateChatStatus");
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackChatServiceImpl.java
+++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackChatServiceImpl.java
@@ -3,15 +3,21 @@ package com.njcn.cssystem.service.impl;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.cssystem.mapper.CsFeedbackChatMapper;
+import com.njcn.cssystem.pojo.param.CsFeedbackAuditParm;
 import com.njcn.cssystem.pojo.param.CsFeedbackChatAddParm;
 import com.njcn.cssystem.pojo.param.CsFeedbackChatCheckParm;
 import com.njcn.cssystem.pojo.po.CsFeedbackChatPO;
+import com.njcn.cssystem.pojo.po.CsFeedbackPO;
 import com.njcn.cssystem.service.CsFeedbackChatService;
+import com.njcn.cssystem.service.CsFeedbackService;
 import com.njcn.web.utils.RequestUtil;
+import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

+import java.util.Objects;
+
 /**
 * 
 * Description:
@@ -22,8 +28,11 @@ import org.springframework.transaction.annotation.Transactional;
 * @version V1.0.0
 */
@Service
+@RequiredArgsConstructor
 public class CsFeedbackChatServiceImpl extends ServiceImpl<CsFeedbackChatMapper, CsFeedbackChatPO> implements CsFeedbackChatService {

+
+    private final CsFeedbackService csFeedbackService;
    @Override
    @Transactional(rollbackFor = {Exception.class})
    public Boolean AddFeedbackChat(CsFeedbackChatAddParm csFeedbackAddParm) {
@@ -40,14 +49,25 @@ public class CsFeedbackChatServiceImpl extends ServiceImpl<CsFeedbackChatMapper,
    @Transactional(rollbackFor = {Exception.class})
    public Boolean updateChatStatus(CsFeedbackChatCheckParm csFeedbackChatCheckParm) {
        UpdateWrapper<CsFeedbackChatPO> updateWrapper = new UpdateWrapper<> ();
+        String userIndex = RequestUtil.getUserIndex();
+        CsFeedbackPO one = csFeedbackService.lambdaQuery().eq(CsFeedbackPO::getId, csFeedbackChatCheckParm.getId()).one();
+            /*如何非创建人添加一条聊天记录“反馈已收到，处理中”*/
+        if ((!Objects.equals(one.getCreateBy(),userIndex))&&Objects.equals(one.getStatus(),"1")) {

+            CsFeedbackChatPO csFeedbackChatPO = new CsFeedbackChatPO ();
+            csFeedbackChatPO.setUserId(RequestUtil.getUserIndex());
+            csFeedbackChatPO.setId(csFeedbackChatCheckParm.getId());
+            csFeedbackChatPO.setChatContent("反馈已收到，处理中");
+            csFeedbackChatPO.setChatStatus ("0");
+            csFeedbackChatPO.setStatus ("1");
+            this.save (csFeedbackChatPO);
+            CsFeedbackAuditParm csFeedbackAuditParm = new CsFeedbackAuditParm();
+            csFeedbackAuditParm.setId(csFeedbackChatCheckParm.getId());
+            csFeedbackAuditParm.setStatus("2");
+            csFeedbackService.auditFeedBack(csFeedbackAuditParm);

-        updateWrapper.clear ();
-        updateWrapper.eq ("id",csFeedbackChatCheckParm.getId ()).
-                ne ("user_id",RequestUtil.getUserIndex()).
-                set ("chat_status","1").
-                eq ("status", "1");
-        boolean update = this.update (updateWrapper);
-        return update;
+        }
+
+        return true;
    }
 }
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java
+++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.csdevice.api.RoleEngineerDevFeignClient;
+import com.njcn.cssystem.mapper.CsFeedbackChatMapper;
 import com.njcn.cssystem.mapper.CsFeedbackMapper;
 import com.njcn.cssystem.pojo.param.CsFeedbackAddParm;
 import com.njcn.cssystem.pojo.param.CsFeedbackAuditParm;
@@ -47,7 +48,7 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb

    private final FileStorageUtil fileStorageUtil;
    private final CsFilePathService csFilePathService;
-    private final CsFeedbackChatService csFeedbackChatService;
+    private final CsFeedbackChatMapper csFeedbackChatMapper;
    private final UserFeignClient userFeignClient;
    private final RoleEngineerDevFeignClient roleEngineerDevFeignClient;
    @Override
@@ -96,13 +97,13 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
        List<CsFeedbackVO> collect = csFeedbackPOPage.getRecords ( ).stream ( ).map (temp -> {
            CsFeedbackVO csFeedbackVO = new CsFeedbackVO ( );
            BeanUtils.copyProperties (temp, csFeedbackVO);
-            csFeedbackChatPOQueryWrapper.clear ();
-            csFeedbackChatPOQueryWrapper.eq ("id",temp.getId ()).
-                    ne ("user_id",temp.getUserId ()).
-                    eq ("chat_status","0").
-                    eq ("status", "1");
-            int count = csFeedbackChatService.count (csFeedbackChatPOQueryWrapper );
-            csFeedbackVO.setChatCount (count);
+//            csFeedbackChatPOQueryWrapper.clear ();
+//            csFeedbackChatPOQueryWrapper.eq ("id",temp.getId ()).
+//                    ne ("user_id",temp.getUserId ()).
+//                    eq ("chat_status","0").
+//                    eq ("status", "1");
+//            int count = csFeedbackChatService.count (csFeedbackChatPOQueryWrapper );
+//            csFeedbackVO.setChatCount (count);
            return csFeedbackVO;
        }).collect (Collectors.toList ( ));
        returnpage.setRecords (collect);
@@ -123,7 +124,7 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
        csFeedbackDetailVO.setImageUrls (collect);
        QueryWrapper<CsFeedbackChatPO> csFeedbackChatPOQueryWrapper = new QueryWrapper();
        csFeedbackChatPOQueryWrapper.eq ("id", id).eq ("status", "1").orderByDesc ("create_time");
-        List<CsFeedbackChatPO> list1 = csFeedbackChatService.list (csFeedbackChatPOQueryWrapper);
+        List<CsFeedbackChatPO> list1 = csFeedbackChatMapper.selectList (csFeedbackChatPOQueryWrapper);

        List<String> collect1 = list1.stream().map(CsFeedbackChatPO::getUserId).distinct().collect(Collectors.toList());
        Map<String, String> collect2;