Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!282 调整客户消息展示

Browse Source 
Merge pull request !282 from 德仔/develop
This commit is contained in:
德仔
2021-06-08 18:27:15 +08:00
committed by Gitee
parent ae605581fd 02e5110d2c
commit 57942a652f
13 changed files with 332 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java
View File

@ -71,18 +71,26 @@ public class SysCustomer extends BaseEntity
/** 主营养师 */
@Excel(name = "主营养师")
private String dietitianName;
private Long mainDietitian;
/** 营养师助理 */
@Excel(name = "营养师助理")
private String assDietitianName;
private Long assistantDietitian;
/** 售后营养师 */
@Excel(name = "售后营养师")
private String afterDietitianName;
private Long afterDietitian;
/** 销售人员 */
@Excel(name = "销售人员")
private String salesName;
private Long salesman;
/** 负责人 */

4
stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysServicesTopicMapper.java
View File

@ -7,6 +7,8 @@ import java.util.List;
public interface SysServicesTopicMapper {
List<SysServicesTopic> selectSysServicesTopicByUserIdAndRole(SysServicesTopic topic);
List<SysServicesTopic> selectCustomerListByUserIdAndRole(SysServicesTopic topic);
int insertSysServicesTopic(SysServicesTopic topic);
int insertSysServicesTopicStatus(List<SysServicesTopic> topics);
@ -20,4 +22,6 @@ public interface SysServicesTopicMapper {
List<SysServicesTopic> selectSysServicesTopicSessionByTopicId(String topicId);
List<SysServicesTopic> selectUnreadTopicCount(List<SysServicesTopic> topics);
List<SysServicesTopic> selectTopicListByUid(SysServicesTopic topic);
}

2
stdiet-custom/src/main/java/com/stdiet/custom/server/WebSocketServer.java
View File

@ -27,7 +27,7 @@ public class WebSocketServer {
//private static ConcurrentHashMap<String,WebSocketServer> websocketList = new ConcurrentHashMap<>();
// 与某个客户端的连接会话，需要通过它来给客户端发送数据
private Session session;
// 接收sid
// 接收sidw
private String sid = "";
public static CopyOnWriteArraySet<WebSocketServer> getWebSocketSet() {

4
stdiet-custom/src/main/java/com/stdiet/custom/service/ISysServicesTopicService.java
View File

@ -8,6 +8,8 @@ public interface ISysServicesTopicService {
List<SysServicesTopic> selectSysServicesTopicByUserIdAndRole(SysServicesTopic topic);
List<SysServicesTopic> selectCustomerListByUserIdAndRole(SysServicesTopic topic);
SysServicesTopic insertSysServicesTopic(SysServicesTopic topic);
int updateSysServicesTopicStatus(SysServicesTopic topic);
@ -19,4 +21,6 @@ public interface ISysServicesTopicService {
List<SysServicesTopic> selectSysServicesTopicSessionByTopicId(String topicId);
List<SysServicesTopic> selectUnreadTopicCount(List<SysServicesTopic> topic);
List<SysServicesTopic> selectTopicListByUid(SysServicesTopic topic);
}

9
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysServicesTopicServiceImp.java
View File

@ -30,6 +30,10 @@ public class SysServicesTopicServiceImp implements ISysServicesTopicService {
return servicesTopicMapper.selectSysServicesTopicByUserIdAndRole(topic);
}
@Override
public List<SysServicesTopic> selectCustomerListByUserIdAndRole(SysServicesTopic topic) {
return servicesTopicMapper.selectCustomerListByUserIdAndRole(topic);
}
@Override
public SysServicesTopic insertSysServicesTopic(SysServicesTopic topic) {
@ -187,4 +191,9 @@ public class SysServicesTopicServiceImp implements ISysServicesTopicService {
public List<SysServicesTopic> selectUnreadTopicCount(List<SysServicesTopic> statusList) {
return servicesTopicMapper.selectUnreadTopicCount(statusList);
}
@Override
public List<SysServicesTopic> selectTopicListByUid(SysServicesTopic topic) {
return servicesTopicMapper.selectTopicListByUid(topic);
}
}