Compare commits

..

No commits in common. "6b4643e4c0bae60ed53b51ad6bed1a8475ec3a4c" and "6ace36545959c51f82f25f87ad17589871c9a4e7" have entirely different histories.

2 changed files with 9 additions and 11 deletions

View File

@ -50,7 +50,7 @@ public class BusiCategoryServiceImpl extends ServiceImpl<BusiCategoryMapper, Bus
if (!StringUtils.isEmpty(category.getCatgName())) { if (!StringUtils.isEmpty(category.getCatgName())) {
lambdaQueryWrapper.like(BusiCategory::getCatgName, category.getCatgName()); lambdaQueryWrapper.like(BusiCategory::getCatgName, category.getCatgName());
} }
lambdaQueryWrapper.orderByAsc(BusiCategory::getSort); lambdaQueryWrapper.orderByDesc(BusiCategory::getSort);
List<BusiCategory> list = list(lambdaQueryWrapper); List<BusiCategory> list = list(lambdaQueryWrapper);
return buildCategoryTree(list); return buildCategoryTree(list);
} }

View File

@ -1,7 +1,7 @@
const websocket = { const websocket = {
state: { state: {
socket:null, websock:null,
message:[], message:[],
count:"0", count:"0",
notice:[] notice:[]
@ -10,12 +10,11 @@ const websocket = {
mutations: { mutations: {
WEBSOCKET_INIT(state,url){ WEBSOCKET_INIT(state,url){
console.log(url); console.log(url);
state.socket = new WebSocket(url); state.websock = new WebSocket(url);
state.socket.onopen=function () { state.websock.onopen=function () {
console.log("WebSocket连接成功"); console.log("WebSocket连接成功");
}; };
state.socket.onmessage = function (e) { state.websock.onmessage = function (e) {
console.log(e,'接受到消息')
if (e.data.startsWith("C")) { if (e.data.startsWith("C")) {
state.count = e.data; state.count = e.data;
@ -25,24 +24,23 @@ const websocket = {
console.log(state.notice); console.log(state.notice);
} }
else { else {
console.log(e.data,'消息内容')
state.message.push(JSON.parse(e.data)); state.message.push(JSON.parse(e.data));
// console.log(state.message); // console.log(state.message);
} }
}; };
state.socket.onerror= function () { state.websock.onerror= function () {
console.log("WebSocket连接发生错误"); console.log("WebSocket连接发生错误");
}; };
state.socket.onclose = function (e) { state.websock.onclose = function (e) {
console.log("connection closed (" + e.code + ")"); console.log("connection closed (" + e.code + ")");
}; };
}, },
WEBSOCKET_SEND(state,msg){ WEBSOCKET_SEND(state,msg){
state.socket.send(msg); state.websock.send(msg);
}, },
WEBSOCKET_CLOSE(state){ WEBSOCKET_CLOSE(state){
state.socket.close(); state.websock.close();
} }
}, },