代码提交

2023-08-28 16:17:47 +08:00
parent 18ea80ab50
commit 993712afb4
9 changed files with 76 additions and 6 deletions
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RoleEngineerDevServiceImpl.java
@@ -119,7 +119,7 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService {

        List<String> collect = new ArrayList<>();
        if(
-                Objects.equals(role,AppRoleEnum.APP_VIP_USER.getCode())){
+                Objects.equals(role,AppRoleEnum.APP_VIP_USER.getCode())||Objects.equals(role, AppRoleEnum.ENGINEERING_USER.getCode())){
            csDeviceUserPOQueryWrapper.clear();
            csDeviceUserPOQueryWrapper.eq("status","1").and(wq -> {
                wq.eq("primary_user_id", userIndex)
@@ -134,7 +134,7 @@ public class RoleEngineerDevServiceImpl implements RoleEngineerDevService {
            return collect1;

        }
-        else if ( Objects.equals(role,AppRoleEnum.MARKET_USER.getCode())||Objects.equals(role, AppRoleEnum.ENGINEERING_USER.getCode())) {
+        else if ( Objects.equals(role,AppRoleEnum.MARKET_USER.getCode())) {
            QueryWrapper<CsMarketData> csMarketDataQueryWrapper = new QueryWrapper<>();
            csMarketDataQueryWrapper.eq("user_id", userIndex);
            List<CsMarketData> csMarketData = csMarketDataMapper.selectList(csMarketDataQueryWrapper);
--- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackAddParm.java
+++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackAddParm.java
@@ -41,6 +41,8 @@ public class CsFeedbackAddParm {
 //    @NotBlank(message="用户id不能为空！")
    private String userId;

+    private String engineeringId;
+
    /**
     * 问题类型(字典数据)
     */
--- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackAuditParm.java
+++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackAuditParm.java
@@ -0,0 +1,32 @@
+package com.njcn.cssystem.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * Description:
+ * 接口文档访问地址：http://serverIP:port/swagger-ui.html
+ * Date: 2023/4/6  11:39【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+
+@Data
+public class CsFeedbackAuditParm {
+
+
+    @ApiModelProperty(value = "反馈id")
+    @NotNull(message = "反馈id不能为空！")
+    private String id;
+
+    @ApiModelProperty(value = "问题状态")
+    @NotNull(message = "问题状态不能为空！")
+    private String status;
+}
--- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java
+++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java
@@ -34,7 +34,7 @@ public class CsFeedbackQueryParm {
 //    @ApiModelProperty(value = "用户id")
 //    @NotNull(message="用户id不能为空！")
 //    private String userId;
-
+//    private String engineeringId;
    /**
     * 问题类型(字典数据)
     */
--- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackPO.java
+++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsFeedbackPO.java
@@ -52,6 +52,9 @@ public class CsFeedbackPO extends BaseEntity {
    @TableField(value = "type")
    private String type;

+    @TableField(value = "engineering_id")
+    private String engineeringId;
+
    /**
     * 问题状态(字典数据)
     */
--- a/cs-system/cs-system-boot/pom.xml
+++ b/cs-system/cs-system-boot/pom.xml
@@ -67,6 +67,13 @@
          <scope>compile</scope>
      </dependency>

+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>cs-device-api</artifactId>
+      <version>1.0.0</version>
+      <scope>compile</scope>
+    </dependency>
+
  </dependencies>

  <build>
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/feedback/FeedBackController.java
+++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/feedback/FeedBackController.java
@@ -8,6 +8,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.cssystem.pojo.param.CsFeedbackAddParm;
+import com.njcn.cssystem.pojo.param.CsFeedbackAuditParm;
 import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm;
 import com.njcn.cssystem.pojo.vo.CsFeedbackDetailVO;
 import com.njcn.cssystem.pojo.vo.CsFeedbackVO;
@@ -50,6 +51,16 @@ public class FeedBackController extends BaseController {
        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
    }

+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/auditFeedBack")
+    @ApiOperation("更新反馈")
+    public HttpResult<Boolean> auditFeedBack(@Validated CsFeedbackAuditParm csFeedbackAuditParm){
+        String methodDescribe = getMethodDescribe("auditFeedBack");
+
+        Boolean flag = csFeedbackService.auditFeedBack(csFeedbackAuditParm);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
    @PostMapping("/queryFeedBackPage")
    @ApiOperation("查询反馈列表")
--- a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/CsFeedbackService.java
+++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/CsFeedbackService.java
@@ -3,6 +3,7 @@ package com.njcn.cssystem.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.cssystem.pojo.param.CsFeedbackAddParm;
+import com.njcn.cssystem.pojo.param.CsFeedbackAuditParm;
 import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm;
 import com.njcn.cssystem.pojo.po.CsFeedbackPO;
 import com.njcn.cssystem.pojo.vo.CsFeedbackDetailVO;
@@ -44,4 +45,6 @@ public interface CsFeedbackService extends IService<CsFeedbackPO>{
    * @Date: 2023/4/7 
    */ 
    CsFeedbackDetailVO queryFeedBackDetail(String id);
+
+    Boolean auditFeedBack(CsFeedbackAuditParm csFeedbackAuditParm);
 }
--- 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
@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.CsFeedbackMapper;
 import com.njcn.cssystem.pojo.param.CsFeedbackAddParm;
+import com.njcn.cssystem.pojo.param.CsFeedbackAuditParm;
 import com.njcn.cssystem.pojo.param.CsFeedbackQueryParm;
 import com.njcn.cssystem.pojo.po.CsFeedbackChatPO;
 import com.njcn.cssystem.pojo.po.CsFeedbackPO;
@@ -47,7 +49,7 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
    private final CsFilePathService csFilePathService;
    private final CsFeedbackChatService csFeedbackChatService;
    private final UserFeignClient userFeignClient;
-
+    private final RoleEngineerDevFeignClient roleEngineerDevFeignClient;
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean addFeedBack(CsFeedbackAddParm csFeedbackAddParm) {
@@ -80,10 +82,14 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
    public IPage<CsFeedbackVO> queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm) {
        Page<CsFeedbackPO> page = new Page<> (csFeedbackQueryParm.getPageNum ( ), csFeedbackQueryParm.getPageSize ( ));
        Page<CsFeedbackVO> returnpage = new Page<> (csFeedbackQueryParm.getPageNum ( ), csFeedbackQueryParm.getPageSize ( ));
-
+        List<String> data = roleEngineerDevFeignClient.getRoleengineer().getData();
+        if(CollectionUtils.isEmpty(data)){
+           return returnpage;
+        }
        QueryWrapper<CsFeedbackPO> queryWrapper = new QueryWrapper<> ();
-        queryWrapper.eq ("user_id",RequestUtil.getUserIndex()).
+        queryWrapper.
                eq (StringUtils.isNotBlank (csFeedbackQueryParm.getType ()),"type",csFeedbackQueryParm.getType ()).
+                in("engineering_id",data).
                eq (StringUtils.isNotBlank (csFeedbackQueryParm.getStatus ()),"status",csFeedbackQueryParm.getStatus ()).orderByDesc("create_time");
        Page<CsFeedbackPO> csFeedbackPOPage = this.getBaseMapper ( ).selectPage (page, queryWrapper);
        QueryWrapper<CsFeedbackChatPO> csFeedbackChatPOQueryWrapper = new QueryWrapper<> ();
@@ -135,4 +141,10 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
            csFeedbackDetailVO.setCsFeedbackChatPOList (list1);
        return csFeedbackDetailVO;
    }
+
+    @Override
+    public Boolean auditFeedBack(CsFeedbackAuditParm csFeedbackAuditParm) {
+        boolean update = this.lambdaUpdate().eq(CsFeedbackPO::getId, csFeedbackAuditParm.getId()).set(CsFeedbackPO::getStatus, csFeedbackAuditParm.getStatus()).update();
+        return update;
+    }
 }