完善功能

Author: danbai225

.gitignore

@@ -29,4 +29,7 @@ rebel.xml
 build/
 
 ### VS Code ###
-.vscode/
+.vscode/
+/.mvn
+.mvn
+/ys.iml

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>com.danbai</groupId>
     <artifactId>ys</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.0</version>
     <name>ys</name>
     <description>Demo project for Spring Boot</description>
     <properties>
@@ -92,6 +92,44 @@
             <artifactId>commons-codec</artifactId>
             <version>1.11</version>
         </dependency>
+        <!-- swagger工具包 -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-annotations</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>io.swagger</groupId>
+                    <artifactId>swagger-models</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--解决进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.5.21</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/io.springfox/springfox-swagger-ui -->
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>28.1-jre</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/com/danbai/ys/async/AsyncDmAllSend.java

@@ -14,7 +14,7 @@
 public class AsyncDmAllSend {
     /**
      * 群发自定义消息
-     * */
+     */
     @Async
     public void sendInfo(String message) throws IOException {
         for (TvDmSocket item : TvDmSocket.webSocketSet) {
@@ -25,10 +25,11 @@ public void sendInfo(String message) throws IOException {
             }
         }
     }
+
     @Async
-    public void sendInfo(String message,String dmid) throws IOException {
+    public void sendInfo(String message, String dmid) throws IOException {
         for (TvDmSocket item : TvDmSocket.webSocketSet) {
-            if(item.getDmid().equals(dmid)){
+            if (item.getDmid().equals(dmid)) {
                 try {
                     item.sendMessage(message);
                 } catch (IOException e) {
@@ -37,10 +38,11 @@ public void sendInfo(String message,String dmid) throws IOException {
             }
         }
     }
+
     @Async
-    public void sendInfoNothis(String message,String dmid,TvDmSocket t) throws IOException {
+    public void sendInfoNothis(String message, String dmid, TvDmSocket t) throws IOException {
         for (TvDmSocket item : TvDmSocket.webSocketSet) {
-            if(item.getDmid().equals(dmid)&&item!=t){
+            if (item.getDmid().equals(dmid) && item != t) {
                 try {
                     item.sendMessage(message);
                 } catch (IOException e) {

src/main/java/com/danbai/ys/async/CinemaSocketAsync.java

@@ -11,17 +11,30 @@
 
 @Component
 public class CinemaSocketAsync {
+    /**
+     * 发送房间消息
+     *
+     * @param id
+     * @param msg
+     */
     @Async
-    public  void sendRoomMsg(int id,String msg){
-        CinemaSocket.ROOM_POOL.get(id).getSockets().forEach(sid->{
+    public void sendRoomMsg(int id, String msg) {
+        CinemaSocket.ROOM_POOL.get(id).getSockets().forEach(sid -> {
             CinemaSocket.POOL.get(sid).sendMessage(msg);
         });
     }
+
+    /**
+     * 发送房间消息跳过房主
+     *
+     * @param id
+     * @param msg
+     */
     @Async
-    public  void sendRoomMsgPassAuthor(int id,String msg){
+    public void sendRoomMsgPassAuthor(int id, String msg) {
         String authorId = CinemaSocket.ROOM_POOL.get(id).getAuthorId();
-        CinemaSocket.ROOM_POOL.get(id).getSockets().forEach(sid->{
-            if(!sid.equals(authorId)){
+        CinemaSocket.ROOM_POOL.get(id).getSockets().forEach(sid -> {
+            if (!sid.equals(authorId)) {
                 CinemaSocket.POOL.get(sid).sendMessage(msg);
             }
         });

src/main/java/com/danbai/ys/async/Dmas.java

@@ -9,6 +9,7 @@
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
+
 import static java.lang.System.currentTimeMillis;
 
 /**
@@ -20,6 +21,12 @@ public class Dmas {
     @Autowired
     MongoTemplate mongoTemplate;
 
+    /**
+     * 保存弹幕
+     *
+     * @param url
+     * @param player
+     */
     @Async
     public void xzbcdm(String url, String player) {
         String json = HtmlUtils.getHtmlContentNp(url);

src/main/java/com/danbai/ys/config/ScheduledConfig.java

@@ -12,7 +12,7 @@
 @Configuration
 public class ScheduledConfig {
     @Bean
-    public TaskScheduler taskScheduler(){
+    public TaskScheduler taskScheduler() {
         ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
         taskScheduler.setPoolSize(20);
         taskScheduler.initialize();

src/main/java/com/danbai/ys/config/Swagger2Config.java

@@ -0,0 +1,44 @@
+package com.danbai.ys.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * @program: dbys
+ * @description: Swagger2Config
+ * @author: DanBai
+ * @create: 2020-06-28 14:56
+ **/
+@Configuration
+@EnableSwagger2
+public class Swagger2Config {
+    @Bean
+    Docket docket() {
+        return new Docket(DocumentationType.SWAGGER_2)
+                .apiInfo(apiInfo())
+                .select()
+                .apis(RequestHandlerSelectors.basePackage("com.danbai.ys.controller"))
+                .paths(PathSelectors.any())
+                .build();
+    }
+
+    private ApiInfo apiInfo() {
+        return new ApiInfoBuilder()
+                .title("淡白影视API文档")
+                .description("淡白影视的API接口文档")
+                .termsOfServiceUrl("https://dbys.vip")
+                .version("1.0")
+                .contact(new Contact("淡白",
+                        "https://p00q.cn/",
+                        "db225@qq.com"))
+                .build();
+    }
+}

src/main/java/com/danbai/ys/controller/AdminController.java

@@ -3,14 +3,11 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.danbai.ys.entity.Acces;
-import com.danbai.ys.entity.Config;
-import com.danbai.ys.entity.Ysb;
-import com.danbai.ys.service.impl.AdminServiceImpl;
-import com.danbai.ys.service.impl.StatisticalImpl;
-import com.danbai.ys.service.impl.UserServiceImpl;
-import com.danbai.ys.service.impl.YsServiceImpl;
+import com.danbai.ys.entity.*;
+import com.danbai.ys.service.impl.*;
 import com.github.pagehelper.PageInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Controller;
@@ -28,6 +25,7 @@
  * @date 2019/10/13
  */
 @Controller
+@Api(tags = "管理api")
 public class AdminController {
     @Autowired
     RedisTemplate redisTemplate;
@@ -39,13 +37,19 @@ public class AdminController {
     StatisticalImpl statistical;
     @Autowired
     AdminServiceImpl adminService;
+    @Autowired
+    DmServiceImpl dmService;
+    @Autowired
+    CommImpl comm;
 
     @RequestMapping(value = "/admin", produces = "text/plain;charset=UTF-8", method = RequestMethod.GET)
-    String admin(Model model) {
+    @ApiOperation(value = "管理视图框架首页")
+    String admin() {
         return "admin/index";
     }
 
     @RequestMapping(value = "/admin/index_v1", produces = "text/plain;charset=UTF-8", method = RequestMethod.GET)
+    @ApiOperation(value = "管理视图首页")
     String adminIndex(Model model) {
         model.addAttribute("yssize", ysService.contYs());
         model.addAttribute("usersize", userService.contUser());
@@ -64,12 +68,38 @@ String adminIndex(Model model) {
     }
 
     @RequestMapping(value = "/admin/ystable", produces = "text/plain;charset=UTF-8", method = RequestMethod.GET)
-    String adminYstable(Model model) {
+    @ApiOperation(value = "影视表视图")
+    String adminYstable() {
         return "admin/ystable";
     }
 
+    @RequestMapping(value = "/admin/dmtable", produces = "text/plain;charset=UTF-8", method = RequestMethod.GET)
+    @ApiOperation(value = "弹幕表视图")
+    String adminDmtable() {
+        return "admin/dmtable";
+    }
+
+    @RequestMapping(value = "/admin/feedback", produces = "text/plain;charset=UTF-8", method = RequestMethod.GET)
+    @ApiOperation(value = "反馈处理视图")
+    String adminFeedback(Model model) {
+        List<Feedback> allFeedback = comm.getAllFeedback();
+        List tList = new ArrayList();
+        List fList = new ArrayList();
+        allFeedback.forEach(b -> {
+            if (b.getDispose()) {
+                tList.add(b);
+            } else {
+                fList.add(b);
+            }
+            model.addAttribute("tlist", tList);
+            model.addAttribute("flist", fList);
+        });
+        return "admin/fb";
+    }
+
     @RequestMapping(value = "/admin/getysb", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     @ResponseBody
+    @ApiOperation(value = "获取影视表api")
     String adminGetysb(@RequestParam("rows") Integer rows, @RequestParam("page") Integer page, String searchString,
                        String searchField) {
         JSONObject re = new JSONObject();
@@ -84,7 +114,7 @@ String adminGetysb(@RequestParam("rows") Integer rows, @RequestParam("page") Int
             JSONArray array = JSONArray.parseArray(JSON.toJSONString(p.getList()));
             re.put("rows", array);
             re.put("page", p.getPageNum());
-            re.put("total", p.getPageSize());
+            re.put("total", p.getPages());
             re.put("records", ysService.contYs());
 
         } else {
@@ -107,6 +137,7 @@ String adminGetysb(@RequestParam("rows") Integer rows, @RequestParam("page") Int
 
     @RequestMapping(value = "/admin/ysedit", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
     @ResponseBody
+    @ApiOperation(value = "影视编辑api")
     String adminYsedit(Ysb ysb, @RequestParam(value = "oper", required = false) String oper) {
         JSONObject re = new JSONObject();
         //noinspection AlibabaSwitchStatement,AlibabaSwitchStatement
@@ -126,11 +157,77 @@ String adminYsedit(Ysb ysb, @RequestParam(value = "oper", required = false) Stri
     }
 
     @RequestMapping(value = "/admin/config", produces = "text/plain;charset=UTF-8", method = RequestMethod.GET)
+    @ApiOperation(value = "配置视图")
     String adminConfig(Model model) {
         List<Config> config = adminService.getConfig();
         for (Config c : config) {
             model.addAttribute(c.getItem(), c.getValue());
         }
         return "admin/config";
     }
+
+    @RequestMapping(value = "/admin/getdmb", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "获取弹幕表api")
+    String adminGetDmb(@RequestParam("rows") Integer rows, @RequestParam("page") Integer page, String searchString,
+                       String searchField) {
+        JSONObject re = new JSONObject();
+        if (searchString == null) {
+            searchString = "";
+        }
+        if (searchField == null) {
+            searchField = "";
+        }
+        PageResult<Dan> dmList = null;
+        if ("".equals(searchString) && "".equals(searchField)) {
+            dmList = dmService.getDmList(rows, page);
+        } else {
+            switch (searchField) {
+                case "id":
+                    dmList = dmService.getDmListById(searchString, rows, page);
+                    break;
+                case "author":
+                    dmList = dmService.getDmListByYsUsername(searchString, rows, page);
+                    break;
+                case "player":
+                    dmList = dmService.getDmListByYsJi(searchString, rows, page);
+                    break;
+                default:
+                    dmList = dmService.getDmList(rows, page);
+            }
+        }
+        JSONArray array = JSONArray.parseArray(JSON.toJSONString(dmList.getList()));
+        re.put("rows", array);
+        re.put("page", page);
+        re.put("total", dmList.getPages());
+        re.put("records", dmList.getTotal());
+        return re.toJSONString();
+    }
+
+    @RequestMapping(value = "/admin/dmedit", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "弹幕编辑api")
+    String adminDmedit(Dan dan, @RequestParam(value = "oper", required = false) String oper) {
+        JSONObject re = new JSONObject();
+        switch (oper) {
+            case "add":
+                dmService.addDm(dan);
+                break;
+            case "edit":
+                dmService.updateDm(dan);
+                break;
+            case "del":
+                dmService.delDm(dan);
+                break;
+            default:
+        }
+        return re.toJSONString();
+    }
+
+    @RequestMapping(value = "/admin/okfb", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "完成反馈处理")
+    void adminGetDmb(Integer id) {
+        comm.okFeedback(id);
+    }
 }