Browse Source

创建项目

523096025 1 năm trước cách đây
mục cha
commit
6c007e90cc

+ 5 - 0
src/main/java/com/huimv/wine/entity/vo/WsEvent.java

@@ -4,6 +4,11 @@ import lombok.Data;
 
 @Data
 public class WsEvent {
+    public WsEvent(String event, Object data) {
+        this.event = event;
+        this.data = data;
+    }
+
     private  String event;
     private  Object data;
  }

+ 4 - 0
src/main/java/com/huimv/wine/mapper/AdvertiseMapper.java

@@ -3,6 +3,8 @@ package com.huimv.wine.mapper;
 import com.huimv.wine.entity.Advertise;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 广告表 Mapper 接口
@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface AdvertiseMapper extends BaseMapper<Advertise> {
 
+    List<Advertise> listAll();
+
 }

+ 3 - 0
src/main/java/com/huimv/wine/mapper/ParamsMapper.java

@@ -3,6 +3,8 @@ package com.huimv.wine.mapper;
 import com.huimv.wine.entity.Params;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 系统参数 Mapper 接口
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ParamsMapper extends BaseMapper<Params> {
 
+    List<Params> listAll();
 }

+ 2 - 0
src/main/java/com/huimv/wine/mapper/WineMapper.java

@@ -2,6 +2,7 @@ package com.huimv.wine.mapper;
 
 import com.huimv.wine.entity.Wine;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface WineMapper extends BaseMapper<Wine> {
 
+    Wine selectWineById(@Param(value = "id")Integer id);
 }

+ 0 - 1
src/main/java/com/huimv/wine/utils/WebsocketWorkerUtil.java

@@ -48,5 +48,4 @@ public class WebsocketWorkerUtil {
   }
 
 
-
 }

+ 29 - 12
src/main/java/com/huimv/wine/ws/SellerController.java

@@ -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));
 
     }
 

+ 3 - 0
src/main/resources/com/huimv/wine/mapper/AdvertiseMapper.xml

@@ -12,5 +12,8 @@
         <result column="duration" property="duration" />
         <result column="describe" property="describe" />
     </resultMap>
+    <select id="listAll" resultType="com.huimv.wine.entity.Advertise">
+        SELECT `id`,`order`,`time`,`src`,`type`,`duration`,`describe` FROM `advertise` ORDER BY `order`
+    </select>
 
 </mapper>

+ 3 - 0
src/main/resources/com/huimv/wine/mapper/ParamsMapper.xml

@@ -9,5 +9,8 @@
         <result column="key" property="key" />
         <result column="value" property="value" />
     </resultMap>
+    <select id="listAll" resultType="com.huimv.wine.entity.Params">
+SELECT `id`,`key`,`value`,`describe` FROM `params`
+</select>
 
 </mapper>

+ 3 - 0
src/main/resources/com/huimv/wine/mapper/WineMapper.xml

@@ -16,5 +16,8 @@
         <result column="income" property="income" />
         <result column="deleted" property="deleted" />
     </resultMap>
+    <select id="selectWineById" resultType="com.huimv.wine.entity.Wine">
+        SELECT `name`,`price`,`degree`,`density`,`picture`,`describe`,`time`,`order`,`income`,`deleted` FROM `wine` WHERE `id`=#{id}
+    </select>
 
 </mapper>