接口修改

Author: danbai225

src/main/java/com/danbai/ys/controller/restful/v1/App.java

@@ -21,7 +21,11 @@ public class App {
     @Autowired
     RedisTemplate redisTemplate;
     @GetMapping("/update")
-    public BaseResult thisUser() {
+    public BaseResult update() {
         return ResultUtil.success(JSONObject.parseObject((String) redisTemplate.opsForValue().get("appupdate"), UpdateInfo.class));
     }
+    @GetMapping("/update-flutter")
+    public JSONObject flutter() {
+        return JSONObject.parseObject((String) redisTemplate.opsForValue().get("flutterAPPUpdate"));
+    }
 }

src/main/java/com/danbai/ys/controller/restful/v1/Ys.java

@@ -1,13 +1,19 @@
 package com.danbai.ys.controller.restful.v1;
 
-import com.danbai.ys.entity.BaseResult;
+import com.alibaba.fastjson.JSON;
+import com.danbai.ys.entity.*;
+import com.danbai.ys.entity.User;
+import com.danbai.ys.service.UserService;
+import com.danbai.ys.service.YsService;
 import com.danbai.ys.service.impl.YsServiceImpl;
 import com.danbai.ys.utils.ResultUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.HashMap;
+import java.util.Map;
 
 
 /**
@@ -21,7 +27,8 @@
 public class Ys {
     @Autowired
     YsServiceImpl ysService;
-
+    @Autowired
+    UserService userService;
     /**
      * 获取所有影视
      *
@@ -69,4 +76,28 @@ public BaseResult type(String type1, String type2, String region, String year, S
         }
         return ResultUtil.success(ysService.getByType(type1, type2, region, year, sort, page));
     }
+    @PostMapping("/ys/time")
+    public void time(VideoTime videoTime, Token token) {
+        if(userService.checkToken(token)){
+            ysService.addYsTime(videoTime);
+        }
+    }
+    @GetMapping("/ysAndLs")
+    public BaseResult getys(int id,Token token){
+        Map<String, Object> map = new HashMap<>(5);
+        Ysb ys = ysService.selectYsById(id);
+        map.put("ys", ys);
+        if(userService.checkToken(token)){
+                HashMap ysLs = ysService.getYsLs(token.getUsername(), id);
+                if (ysLs != null) {
+                    map.put("gkls", ysLs);
+                    VideoTime videoTime = new VideoTime();
+                    videoTime.setUsername(token.getUsername());
+                    videoTime.setYsid(id);
+                    videoTime.setYsjiname((String) ysLs.get("jiname"));
+                    map.put("time", ysService.getYsTime(videoTime));
+                }
+        }
+        return ResultUtil.success(map);
+    }
 }

src/main/java/com/danbai/ys/websocket/CinemaSocketManagement.java

@@ -173,7 +173,7 @@ public static void roomInfo(String socketId) {
         JSONArray users = new JSONArray();
         room.getSockets().forEach(id -> {
             JSONObject user = new JSONObject();
-            user.put("id", id);
+            user.put("id", Integer.parseInt(id,16));
             user.put("username", CinemaSocket.POOL.get(id).getUsername());
             users.add(user);
         });
@@ -186,7 +186,7 @@ public static void sendChat(String socketId,String msg){
         CinemaRoom room = CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId());
         JSONObject sendMsg = new JSONObject();
         sendMsg.put("type","sendChat");
-        sendMsg.put("id",socketId);
+        sendMsg.put("id",Integer.parseInt(socketId,16));
         sendMsg.put("roomId",room.getId());
         sendMsg.put("username",cinemaSocket.getUsername());
         sendMsg.put("msg",msg);
@@ -218,7 +218,7 @@ public static void transfer(String socketId,String transferId){
         CinemaSocket cinemaSocket = CinemaSocket.POOL.get(socketId);
         CinemaRoom room = CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId());
         if(room.getAuthorId().equals(socketId)){
-            CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId()).setAuthorId(transferId);
+            CinemaSocket.ROOM_POOL.get(cinemaSocket.getRoomId()).setAuthorId(Integer.toHexString(Integer.valueOf(transferId)));
         }
     }
 }