From 993712afb4a21fdeb3befc1a18e72c9f466394f4 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Mon, 28 Aug 2023 16:17:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RoleEngineerDevServiceImpl.java | 4 +-- .../pojo/param/CsFeedbackAddParm.java | 2 ++ .../pojo/param/CsFeedbackAuditParm.java | 32 +++++++++++++++++++ .../pojo/param/CsFeedbackQueryParm.java | 2 +- .../njcn/cssystem/pojo/po/CsFeedbackPO.java | 3 ++ cs-system/cs-system-boot/pom.xml | 7 ++++ .../feedback/FeedBackController.java | 11 +++++++ .../cssystem/service/CsFeedbackService.java | 3 ++ .../service/impl/CsFeedbackServiceImpl.java | 18 +++++++++-- 9 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackAuditParm.java diff --git 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 index 8eeea89..f9282b8 100644 --- 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 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 csMarketDataQueryWrapper = new QueryWrapper<>(); csMarketDataQueryWrapper.eq("user_id", userIndex); List csMarketData = csMarketDataMapper.selectList(csMarketDataQueryWrapper); diff --git 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 index c750e6a..9f493ca 100644 --- 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; + /** * 问题类型(字典数据) */ diff --git 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 new file mode 100644 index 0000000..1e79e01 --- /dev/null +++ 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; +} \ No newline at end of file diff --git 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 index 6ae3a86..f6ed84d 100644 --- 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; /** * 问题类型(字典数据) */ diff --git 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 index 492778e..9db5618 100644 --- 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; + /** * 问题状态(字典数据) */ diff --git a/cs-system/cs-system-boot/pom.xml b/cs-system/cs-system-boot/pom.xml index dd4bd84..9b7c9d2 100644 --- a/cs-system/cs-system-boot/pom.xml +++ b/cs-system/cs-system-boot/pom.xml @@ -67,6 +67,13 @@ compile + + com.njcn + cs-device-api + 1.0.0 + compile + + diff --git 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 index c870a41..6cac724 100644 --- 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 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("查询反馈列表") diff --git 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 index c1d0282..72ca0e2 100644 --- 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{ * @Date: 2023/4/7 */ CsFeedbackDetailVO queryFeedBackDetail(String id); + + Boolean auditFeedBack(CsFeedbackAuditParm csFeedbackAuditParm); } diff --git 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 index 4504c85..2cd09c8 100644 --- 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 queryFeedBackPage(CsFeedbackQueryParm csFeedbackQueryParm) { Page page = new Page<> (csFeedbackQueryParm.getPageNum ( ), csFeedbackQueryParm.getPageSize ( )); Page returnpage = new Page<> (csFeedbackQueryParm.getPageNum ( ), csFeedbackQueryParm.getPageSize ( )); - + List data = roleEngineerDevFeignClient.getRoleengineer().getData(); + if(CollectionUtils.isEmpty(data)){ + return returnpage; + } QueryWrapper 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 csFeedbackPOPage = this.getBaseMapper ( ).selectPage (page, queryWrapper); QueryWrapper csFeedbackChatPOQueryWrapper = new QueryWrapper<> (); @@ -135,4 +141,10 @@ public class CsFeedbackServiceImpl extends ServiceImpl