增加接口

Author: danbai225

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

@@ -2,11 +2,16 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.danbai.ys.entity.BaseResult;
+import com.danbai.ys.entity.Feedback;
 import com.danbai.ys.entity.UpdateInfo;
+
+import com.danbai.ys.service.impl.AdminServiceImpl;
+import com.danbai.ys.service.impl.CommImpl;
 import com.danbai.ys.utils.ResultUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,6 +25,10 @@
 public class App {
     @Autowired
     RedisTemplate redisTemplate;
+    @Autowired
+    AdminServiceImpl adminService;
+    @Autowired
+    CommImpl comm;
     @GetMapping("/update")
     public BaseResult update() {
         return ResultUtil.success(JSONObject.parseObject((String) redisTemplate.opsForValue().get("appupdate"), UpdateInfo.class));
@@ -28,4 +37,14 @@ public BaseResult update() {
     public JSONObject flutter() {
         return JSONObject.parseObject((String) redisTemplate.opsForValue().get("flutterAPPUpdate"));
     }
+    @GetMapping("/gg")
+    public BaseResult gg() {
+        return ResultUtil.success(adminService.getConfig("appGG"));
+    }
+    @PostMapping("/feedback")
+    public BaseResult feedback(Feedback feedback){
+        feedback.setDispose(false);
+        comm.addFeedback(feedback);
+        return ResultUtil.successOk();
+    }
 }

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

@@ -45,9 +45,13 @@ public BaseResult thisUser(HttpServletRequest request,Token token) {
      * @return BaseResult
      */
     @GetMapping("/user/gkls")
-    public BaseResult thisUserGkls(HttpServletRequest request,Token token) {
+    public BaseResult thisUserGkls(HttpServletRequest request,Token token,boolean sole) {
         if (userService.checkToken(token)){
-            return ResultUtil.success(ysService.getGkls(token.getUsername()));
+            if(sole){
+                return ResultUtil.success(ysService.getGklsSole(token.getUsername()));
+            }else {
+                return ResultUtil.success(ysService.getGkls(token.getUsername()));
+            }
         }
         com.danbai.ys.entity.User user = (com.danbai.ys.entity.User) request.getSession().getAttribute("user");
         if (user != null) {
@@ -60,7 +64,7 @@ public BaseResult token(com.danbai.ys.entity.User user){
         return ResultUtil.success(userService.login(user));
     }
     @DeleteMapping("/token")
-    public BaseResult login(Token token){
+    public BaseResult exit(Token token){
         userService.deleteToken(token.getUsername());
         return ResultUtil.successOk();
     }

src/main/java/com/danbai/ys/entity/Feedback.java

@@ -0,0 +1,88 @@
+package com.danbai.ys.entity;
+
+import java.util.Date;
+import javax.persistence.*;
+
+public class Feedback {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    private Integer type;//1bug反馈   2求片
+
+    private Date time;
+
+    private Boolean dispose;
+
+    private String content;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * @return type
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    /**
+     * @param type
+     */
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    /**
+     * @return time
+     */
+    public Date getTime() {
+        return time;
+    }
+
+    /**
+     * @param time
+     */
+    public void setTime(Date time) {
+        this.time = time;
+    }
+
+    /**
+     * @return dispose
+     */
+    public Boolean getDispose() {
+        return dispose;
+    }
+
+    /**
+     * @param dispose
+     */
+    public void setDispose(Boolean dispose) {
+        this.dispose = dispose;
+    }
+
+    /**
+     * @return content
+     */
+    public String getContent() {
+        return content;
+    }
+
+    /**
+     * @param content
+     */
+    public void setContent(String content) {
+        this.content = content;
+    }
+}

src/main/java/com/danbai/ys/mapper/FeedbackMapper.java

@@ -0,0 +1,9 @@
+package com.danbai.ys.mapper;
+
+import com.danbai.ys.entity.Feedback;
+import com.danbai.ys.utils.MyMapper;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface FeedbackMapper extends MyMapper<Feedback> {
+}

src/main/java/com/danbai/ys/service/Comm.java

@@ -1,5 +1,7 @@
 package com.danbai.ys.service;
 
+import com.danbai.ys.entity.Feedback;
+
 import java.util.HashMap;
 
 /**
@@ -11,4 +13,10 @@ public interface Comm {
      * @return
      */
     HashMap getAllComm();
+
+    /**
+     * 添加反馈
+     * @param feedback 反馈
+     */
+    void addFeedback(Feedback feedback);
 }

src/main/java/com/danbai/ys/service/YsService.java

@@ -113,7 +113,13 @@ public interface YsService {
      * @return List<Gkls>
      */
     List<Gkls> getGkls(String username);
-
+    /**
+     * 获取观看历史 不重复
+     *
+     * @param username 用户名
+     * @return List<Gkls>
+     */
+    List<Gkls> getGklsSole(String username);
     /**
      * 获取影视观看时间
      *

src/main/java/com/danbai/ys/service/impl/CommImpl.java

@@ -1,6 +1,8 @@
 package com.danbai.ys.service.impl;
 
 import com.danbai.ys.entity.Config;
+import com.danbai.ys.entity.Feedback;
+import com.danbai.ys.mapper.FeedbackMapper;
 import com.danbai.ys.service.Comm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -16,6 +18,8 @@
 public class CommImpl implements Comm {
     @Autowired
     AdminServiceImpl adminService;
+    @Autowired
+    FeedbackMapper feedbackMapper;
     @Override
     public HashMap getAllComm() {
         HashMap<String,Object> map = new HashMap(20);
@@ -26,4 +30,9 @@ public HashMap getAllComm() {
         map.put(Config.HEAD,adminService.getConfig(Config.HEAD));
         return map;
     }
+
+    @Override
+    public void addFeedback(Feedback feedback) {
+        feedbackMapper.insert(feedback);
+    }
 }

src/main/java/com/danbai/ys/service/impl/YsServiceImpl.java

@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 
 /**
@@ -197,6 +198,41 @@ public List<Gkls> getGkls(String username) {
         return list;
     }
 
+    @Override
+    public List<Gkls> getGklsSole(String username) {
+        Example example = new Example(VideoTime.class);
+        example.createCriteria().andEqualTo("username", username);
+        example.orderBy("gktime").desc();
+        List<VideoTime> select = videoTimeMapper.selectByExample(example);
+        List<Gkls> list = new ArrayList<>();
+        for (VideoTime v : select) {
+            if((v.getTime()>30)){
+                AtomicBoolean in= new AtomicBoolean(false);
+                list.forEach(gkls -> {
+                    if(gkls.id==v.getYsid()){
+                        in.set(true);
+                        return;
+                    }
+                });
+                if(in.get()){
+                    continue;
+                }
+                Gkls gkls = new Gkls();
+                Ysb ysb = selectYsById(v.getYsid());
+                if (ysb != null) {
+                    gkls.setPm(ysb.getPm());
+                    gkls.setYsimg(ysb.getTp());
+                }
+                gkls.setJi(v.getYsjiname());
+                gkls.setTime(DateUtils.secondToTime(v.getTime().longValue()));
+                gkls.setGktime(v.getGktime());
+                gkls.setId(v.getYsid());
+                list.add(gkls);
+            }
+        }
+        return list;
+    }
+
     @Override
     public HashMap getYsLs(String username, int ysid) {
         HashMap<String, String> map = new HashMap<>(30);

src/main/resources/mapper/FeedbackMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.danbai.ys.mapper.FeedbackMapper">
+  <resultMap id="BaseResultMap" type="com.danbai.ys.entity.Feedback">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="time" jdbcType="TIMESTAMP" property="time" />
+    <result column="dispose" jdbcType="BIT" property="dispose" />
+    <result column="content" jdbcType="LONGVARCHAR" property="content" />
+  </resultMap>
+</mapper>