Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source 
修改
This commit is contained in:
huangzj
2023-08-16 20:02:29 +08:00
parent ee43dce699
commit fff05e4867
18 changed files with 93 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackAddParm.java
View File

@@ -38,7 +38,7 @@ public class CsFeedbackAddParm {
* 用户id
*/
@ApiModelProperty(value = "用户id")
@NotBlank(message="用户id不能为空！")
// @NotBlank(message="用户id不能为空！")
private String userId;
/**

2
cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackChatAddParm.java
View File

@@ -21,7 +21,7 @@ public class CsFeedbackChatAddParm {
private String id;
@ApiModelProperty(value = "用户id")
@NotNull(message="用户id不能为空！")
// @NotNull(message="用户id不能为空！")
private String userId;
/**
* 消息内容

2
cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackChatCheckParm.java
View File

@@ -24,7 +24,7 @@ public class CsFeedbackChatCheckParm {
private String id;
@ApiModelProperty(value = "用户id")
@NotNull(message="用户id不能为空！")
// @NotNull(message="用户id不能为空！")
private String userId;

12
cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/CsFeedbackQueryParm.java
View File

@@ -28,12 +28,12 @@ public class CsFeedbackQueryParm {
@NotNull(message="显示条数不能为空！")
@ApiModelProperty(value = "显示条数",name = "pageSize",dataType ="Integer",required = true)
private Integer pageSize;
/**
* 用户id
*/
@ApiModelProperty(value = "用户id")
@NotNull(message="用户id不能为空！")
private String userId;
// /**
// * 用户id
// */
// @ApiModelProperty(value = "用户id")
// @NotNull(message="用户id不能为空！")
// private String userId;
/**
* 问题类型(字典数据)

4
cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackChatServiceImpl.java
View File

@@ -7,6 +7,7 @@ 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.service.CsFeedbackChatService;
import com.njcn.web.utils.RequestUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -28,6 +29,7 @@ public class CsFeedbackChatServiceImpl extends ServiceImpl<CsFeedbackChatMapper,
public Boolean AddFeedbackChat(CsFeedbackChatAddParm csFeedbackAddParm) {
CsFeedbackChatPO csFeedbackChatPO = new CsFeedbackChatPO ();
BeanUtils.copyProperties (csFeedbackAddParm, csFeedbackChatPO);
csFeedbackChatPO.setUserId(RequestUtil.getUserIndex());
csFeedbackChatPO.setChatStatus ("0");
csFeedbackChatPO.setStatus ("1");
boolean save = this.save (csFeedbackChatPO);
@@ -42,7 +44,7 @@ public class CsFeedbackChatServiceImpl extends ServiceImpl<CsFeedbackChatMapper,
updateWrapper.clear ();
updateWrapper.eq ("id",csFeedbackChatCheckParm.getId ()).
ne ("user_id",csFeedbackChatCheckParm.getUserId ()).
ne ("user_id",RequestUtil.getUserIndex()).
set ("chat_status","1").
eq ("status", "1");
boolean update = this.update (updateWrapper);

4
cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/CsFeedbackServiceImpl.java
View File

@@ -17,6 +17,7 @@ import com.njcn.cssystem.service.CsFeedbackService;
import com.njcn.cssystem.service.CsFilePathService;
import com.njcn.oss.constant.OssPath;
import com.njcn.oss.utils.FileStorageUtil;
import com.njcn.web.utils.RequestUtil;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -49,6 +50,7 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
public Boolean addFeedBack(CsFeedbackAddParm csFeedbackAddParm) {
CsFeedbackPO csFeedbackPO = new CsFeedbackPO ();
BeanUtils.copyProperties (csFeedbackAddParm, csFeedbackPO);
csFeedbackPO.setUserId(RequestUtil.getUserIndex());
csFeedbackPO.setStatus ("1");
boolean save = this.save (csFeedbackPO);
boolean flag= true;
@@ -77,7 +79,7 @@ public class CsFeedbackServiceImpl extends ServiceImpl<CsFeedbackMapper, CsFeedb
Page<CsFeedbackVO> returnpage = new Page<> (csFeedbackQueryParm.getPageNum ( ), csFeedbackQueryParm.getPageSize ( ));
QueryWrapper<CsFeedbackPO> queryWrapper = new QueryWrapper<> ();
queryWrapper.eq ("user_id",csFeedbackQueryParm.getUserId ()).
queryWrapper.eq ("user_id",RequestUtil.getUserIndex()).
eq (StringUtils.isNotBlank (csFeedbackQueryParm.getType ()),"type",csFeedbackQueryParm.getType ()).
eq (StringUtils.isNotBlank (csFeedbackQueryParm.getStatus ()),"status",csFeedbackQueryParm.getStatus ());
Page<CsFeedbackPO> csFeedbackPOPage = this.getBaseMapper ( ).selectPage (page, queryWrapper);