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

Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

Browse Source
This commit is contained in:
xiezhijun
2021-06-08 18:52:27 +08:00
parent 0115dfa36f 57942a652f
commit 06a7323a65
17 changed files with 657 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysServiceTopicController.java
View File

@ -20,10 +20,16 @@ public class SysServiceTopicController extends BaseController {
@GetMapping("/list")
public TableDataInfo list(SysServicesTopic topic) {
startPage();
return getDataTable(servicesTopicService.selectSysServicesTopicByUserIdAndRole(topic));
return getDataTable(servicesTopicService.selectTopicListByUid(topic));
}
@GetMapping("/customers")
public TableDataInfo customers(SysServicesTopic topic) {
startPage();
return getDataTable(servicesTopicService.selectCustomerListByUserIdAndRole(topic));
}
// @PutMapping("/update/status")
// public AjaxResult status(@RequestBody SysServicesQuestion sysServicesQuestion) {
// return toAjax(sysServicesQuestionService.updateSysServicesQuestionStatus(sysServicesQuestion));

26
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WebSocketController.java
View File

@ -2,8 +2,8 @@ package com.stdiet.web.controller.custom;
import com.alibaba.fastjson.JSONObject;
import com.stdiet.common.core.controller.BaseController;
import com.stdiet.custom.utils.WsUtils;
import com.stdiet.custom.server.WebSocketServer;
import com.stdiet.custom.utils.WsUtils;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Controller;
@ -38,16 +38,16 @@ public class WebSocketController extends BaseController {
}
// @Scheduled(fixedRate = 30000)
// public void boardCast() {
// try {
// JSONObject heartBeat = new JSONObject();
// heartBeat.put("type", WsUtils.WS_TYPE_HEART_BEAT);
// heartBeat.put("msg", "ping");
//
// WebSocketServer.sendInfo(heartBeat.toJSONString(), null);
// } catch (IOException e) {
// e.printStackTrace();
// }
// }
@Scheduled(fixedRate = 1800000)
public void boardCast() {
try {
JSONObject heartBeat = new JSONObject();
heartBeat.put("type", WsUtils.WS_TYPE_SYSTEM_MESSAGE_CLEAN);
heartBeat.put("msg", "clean");
WebSocketServer.sendInfo(heartBeat.toJSONString(), null);
} catch (IOException e) {
e.printStackTrace();
}
}
}