|
@@ -1,10 +1,14 @@
|
|
|
package com.huimv.wine.ws;
|
|
|
|
|
|
import com.fasterxml.jackson.databind.util.BeanUtil;
|
|
|
+import com.huimv.wine.entity.Advertise;
|
|
|
import com.huimv.wine.entity.Device;
|
|
|
+import com.huimv.wine.entity.Params;
|
|
|
import com.huimv.wine.entity.Wine;
|
|
|
import com.huimv.wine.entity.vo.WsEvent;
|
|
|
+import com.huimv.wine.mapper.AdvertiseMapper;
|
|
|
import com.huimv.wine.mapper.DeviceMapper;
|
|
|
+import com.huimv.wine.mapper.ParamsMapper;
|
|
|
import com.huimv.wine.mapper.WineMapper;
|
|
|
import com.huimv.wine.utils.SpringContextUtil;
|
|
|
import com.huimv.wine.utils.WebsocketSellerUtil;
|
|
@@ -16,7 +20,9 @@ import javax.websocket.*;
|
|
|
import javax.websocket.server.PathParam;
|
|
|
import javax.websocket.server.ServerEndpoint;
|
|
|
import java.io.IOException;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
+import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* websocket接口处理类
|
|
@@ -34,8 +40,6 @@ public class SellerController extends TextWebSocketHandler {
|
|
|
|
|
|
//需要用这种方式注入
|
|
|
DeviceMapper deviceMapper = SpringContextUtil.getBean(DeviceMapper.class);
|
|
|
- WineMapper wineMapper = SpringContextUtil.getBean(WineMapper.class);
|
|
|
-
|
|
|
Device device = deviceMapper.getByDeviceId(seq);
|
|
|
if (ObjectUtils.isEmpty(device)){
|
|
|
device = new Device();
|
|
@@ -45,10 +49,9 @@ public class SellerController extends TextWebSocketHandler {
|
|
|
device.setLast(new Date());
|
|
|
deviceMapper.updateDeviceById(device);
|
|
|
}
|
|
|
-
|
|
|
- // 添加到session的映射关系中
|
|
|
WebsocketSellerUtil.addSession(seq, session);
|
|
|
- infoOfDevice(wineMapper,device,session,deviceMapper);
|
|
|
+ //初始化
|
|
|
+ infoOfDevice(device,session,deviceMapper);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -72,7 +75,7 @@ public class SellerController extends TextWebSocketHandler {
|
|
|
//下发数据
|
|
|
// asyncRemote.sendText(message);
|
|
|
|
|
|
- WebsocketSellerUtil.sendMessage(session,message);
|
|
|
+// WebsocketSellerUtil.sendMessage(session,message);
|
|
|
// 直接广播
|
|
|
|
|
|
}
|
|
@@ -93,13 +96,27 @@ public class SellerController extends TextWebSocketHandler {
|
|
|
throwable.printStackTrace();
|
|
|
}
|
|
|
|
|
|
- public void infoOfDevice(WineMapper wineMapper,Device device,Session session, DeviceMapper deviceMapper) {
|
|
|
-
|
|
|
-// Wine wine = wineMapper.selectById(device.getWine1());
|
|
|
-// wineMapper.selectById( device.getWine2());
|
|
|
-// wineMapper.selectById( device.getWine3());
|
|
|
-// wineMapper.selectById( device.getWine4());
|
|
|
+ public void infoOfDevice(Device device,Session session, DeviceMapper deviceMapper) {
|
|
|
|
|
|
+ WineMapper wineMapper = SpringContextUtil.getBean(WineMapper.class);
|
|
|
+ AdvertiseMapper advertiseMapper = SpringContextUtil.getBean(AdvertiseMapper.class);
|
|
|
+ ParamsMapper paramsMapper = SpringContextUtil.getBean(ParamsMapper.class);
|
|
|
+
|
|
|
+ //初始化酒列表
|
|
|
+ List<Wine> wineList = new ArrayList<Wine>();
|
|
|
+ wineList.add(wineMapper.selectWineById(device.getWine1()));
|
|
|
+ wineList.add(wineMapper.selectWineById(device.getWine2()));
|
|
|
+ wineList.add(wineMapper.selectWineById(device.getWine3()));
|
|
|
+ wineList.add(wineMapper.selectWineById(device.getWine4()));
|
|
|
+ WebsocketSellerUtil.sendMessage(session,new WsEvent("wineResult",wineList));
|
|
|
+
|
|
|
+ //初始化广告列表
|
|
|
+ List<Advertise> advertiseList = advertiseMapper.listAll();
|
|
|
+ WebsocketSellerUtil.sendMessage(session,new WsEvent("advResult",advertiseList));
|
|
|
+
|
|
|
+ //初始化配置
|
|
|
+ List<Params> paramsList = paramsMapper.listAll();
|
|
|
+ WebsocketSellerUtil.sendMessage(session,new WsEvent("runParamResult",paramsList));
|
|
|
|
|
|
}
|
|
|
|