add build script

build.sh

@@ -29,9 +29,5 @@ public interface PlayerInfoMapper{
     PlayerInfo queryPlayerInfo(PlayerInfo record);
 
     List<PlayerInfo> query(PlayerInfo record);
-
-    List<PlayerInfo> queryPlayerInfoRankByPage(Map<String, Object> parameter);
-
-    int userRank(PlayerInfo record);
 }
 

src/main/java/com/izouma/awesomeadmin/dto/VideoNotifyParam.java

@@ -7,18 +7,20 @@ import net.sf.json.JSONObject;
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class VideoNotifyParam {
-    private String call;
-    private String addr;
-    private String app;
-    private String flashVer;
-    private String swfUrl;
-    private String tcUrl;
-    private String pageUrl;
-    private String name;
-    private String recorder;
-    private String path;
-    private Long   time;
-    private Long   timestamp;
+    private String  call;
+    private String  addr;
+    private String  app;
+    private String  flashVer;
+    private String  swfUrl;
+    private String  tcUrl;
+    private String  pageUrl;
+    private String  name;
+    private String  recorder;
+    private String  path;
+    private Long    time;
+    private Long    timestamp;
+    private Integer userId;
+    private Integer playerInfoId;
 
     public String getCall() {
         return call;
@@ -116,6 +118,22 @@ public class VideoNotifyParam {
         this.timestamp = timestamp;
     }
 
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getPlayerInfoId() {
+        return playerInfoId;
+    }
+
+    public void setPlayerInfoId(Integer playerInfoId) {
+        this.playerInfoId = playerInfoId;
+    }
+
     @Override
     public String toString() {
         return JSONObject.fromObject(this).toString(4);

src/main/java/com/izouma/awesomeadmin/model/PlayerInfo.java

@@ -2,14 +2,13 @@ package com.izouma.awesomeadmin.model;
 
 import java.math.BigDecimal;
 import java.util.*;
-
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 
 @JsonAutoDetect
 @JsonInclude(JsonInclude.Include.NON_NULL)
-public class PlayerInfo {
+public class PlayerInfo{
     private Integer id;
     private String delFlag;
     private Date updateTime;
@@ -37,279 +36,234 @@ public class PlayerInfo {
     private String gameType;
     private Integer seasonId;
 
-    private Integer houseRank;
-
-
-    private UserInfo userInfo;
-
-    private String idStr;
+private String idStr;
 
-    private String searchKey;
+private String searchKey;
 
-    /**
-     * and,test_name,like,value;or,remark,=,123
-     */
-    private String advancedQuery;
+/**
+* and,test_name,like,value;or,remark,=,123
+*/
+private String advancedQuery;
 
-    /**
-     * column_name_,desc_;column_name_,asc
-     */
-    private String orderByStr;
+/**
+* column_name_,desc_;column_name_,asc
+*/
+private String orderByStr;
 
-    public Integer getId() {
+    public Integer getId(){
         return this.id;
     }
 
-    public void setId(Integer id) {
+    public void setId(Integer id){
         this.id = id;
     }
-
-    public String getDelFlag() {
+    public String getDelFlag(){
         return this.delFlag;
     }
 
-    public void setDelFlag(String delFlag) {
+    public void setDelFlag(String delFlag){
         this.delFlag = delFlag;
     }
-
-    public Date getUpdateTime() {
+    public Date getUpdateTime(){
         return this.updateTime;
     }
 
-    public void setUpdateTime(Date updateTime) {
+    public void setUpdateTime(Date updateTime){
         this.updateTime = updateTime;
     }
-
-    public String getUpdateUser() {
+    public String getUpdateUser(){
         return this.updateUser;
     }
 
-    public void setUpdateUser(String updateUser) {
+    public void setUpdateUser(String updateUser){
         this.updateUser = updateUser;
     }
-
-    public Date getCreateTime() {
+    public Date getCreateTime(){
         return this.createTime;
     }
 
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(Date createTime){
         this.createTime = createTime;
     }
-
-    public String getCreateUser() {
+    public String getCreateUser(){
         return this.createUser;
     }
 
-    public void setCreateUser(String createUser) {
+    public void setCreateUser(String createUser){
         this.createUser = createUser;
     }
-
-    public Integer getGameId() {
+    public Integer getGameId(){
         return this.gameId;
     }
 
-    public void setGameId(Integer gameId) {
+    public void setGameId(Integer gameId){
         this.gameId = gameId;
     }
-
-    public Integer getHouseId() {
+    public Integer getHouseId(){
         return this.houseId;
     }
 
-    public void setHouseId(Integer houseId) {
+    public void setHouseId(Integer houseId){
         this.houseId = houseId;
     }
-
-    public Date getJoinTime() {
+    public Date getJoinTime(){
         return this.joinTime;
     }
 
-    public void setJoinTime(Date joinTime) {
+    public void setJoinTime(Date joinTime){
         this.joinTime = joinTime;
     }
-
-    public BigDecimal getPrincipal() {
+    public BigDecimal getPrincipal(){
         return this.principal;
     }
 
-    public void setPrincipal(BigDecimal principal) {
+    public void setPrincipal(BigDecimal principal){
         this.principal = principal;
     }
-
-    public BigDecimal getBonus() {
+    public BigDecimal getBonus(){
         return this.bonus;
     }
 
-    public void setBonus(BigDecimal bonus) {
+    public void setBonus(BigDecimal bonus){
         this.bonus = bonus;
     }
-
-    public Integer getUserId() {
+    public Integer getUserId(){
         return this.userId;
     }
 
-    public void setUserId(Integer userId) {
+    public void setUserId(Integer userId){
         this.userId = userId;
     }
-
-    public String getRemark() {
+    public String getRemark(){
         return this.remark;
     }
 
-    public void setRemark(String remark) {
+    public void setRemark(String remark){
         this.remark = remark;
     }
-
-    public String getImage() {
+    public String getImage(){
         return this.image;
     }
 
-    public void setImage(String image) {
+    public void setImage(String image){
         this.image = image;
     }
-
-    public Integer getKillNumber() {
+    public Integer getKillNumber(){
         return this.killNumber;
     }
 
-    public void setKillNumber(Integer killNumber) {
+    public void setKillNumber(Integer killNumber){
         this.killNumber = killNumber;
     }
-
-    public Integer getRanking() {
+    public Integer getRanking(){
         return this.ranking;
     }
 
-    public void setRanking(Integer ranking) {
+    public void setRanking(Integer ranking){
         this.ranking = ranking;
     }
-
-    public Date getBeginTime() {
+    public Date getBeginTime(){
         return this.beginTime;
     }
 
-    public void setBeginTime(Date beginTime) {
+    public void setBeginTime(Date beginTime){
         this.beginTime = beginTime;
     }
-
-    public Date getEndTime() {
+    public Date getEndTime(){
         return this.endTime;
     }
 
-    public void setEndTime(Date endTime) {
+    public void setEndTime(Date endTime){
         this.endTime = endTime;
     }
-
-    public Integer getStatusFlag() {
+    public Integer getStatusFlag(){
         return this.statusFlag;
     }
 
-    public void setStatusFlag(Integer statusFlag) {
+    public void setStatusFlag(Integer statusFlag){
         this.statusFlag = statusFlag;
     }
-
-    public String getExamineUser() {
+    public String getExamineUser(){
         return this.examineUser;
     }
 
-    public void setExamineUser(String examineUser) {
+    public void setExamineUser(String examineUser){
         this.examineUser = examineUser;
     }
-
-    public Date getExamineTime() {
+    public Date getExamineTime(){
         return this.examineTime;
     }
 
-    public void setExamineTime(Date examineTime) {
+    public void setExamineTime(Date examineTime){
         this.examineTime = examineTime;
     }
-
-    public Integer getExamineType() {
+    public Integer getExamineType(){
         return this.examineType;
     }
 
-    public void setExamineType(Integer examineType) {
+    public void setExamineType(Integer examineType){
         this.examineType = examineType;
     }
-
-    public String getVideo() {
+    public String getVideo(){
         return this.video;
     }
 
-    public void setVideo(String video) {
+    public void setVideo(String video){
         this.video = video;
     }
-
-    public String getLiveTime() {
+    public String getLiveTime(){
         return this.liveTime;
     }
 
-    public void setLiveTime(String liveTime) {
+    public void setLiveTime(String liveTime){
         this.liveTime = liveTime;
     }
-
-    public String getGameType() {
+    public String getGameType(){
         return this.gameType;
     }
 
-    public void setGameType(String gameType) {
+    public void setGameType(String gameType){
         this.gameType = gameType;
     }
-
-    public Integer getSeasonId() {
+    public Integer getSeasonId(){
         return this.seasonId;
     }
 
-    public void setSeasonId(Integer seasonId) {
+    public void setSeasonId(Integer seasonId){
         this.seasonId = seasonId;
     }
 
-    public String getSearchKey() {
-        return searchKey;
-    }
-
-    public void setSearchKey(String searchKey) {
-        this.searchKey = searchKey;
-    }
-
-    public String getAdvancedQuery() {
-        return advancedQuery;
-    }
-
-    public void setAdvancedQuery(String advancedQuery) {
-        this.advancedQuery = advancedQuery;
-    }
+public String getSearchKey() {
+    return searchKey;
+}
 
-    public String getOrderByStr() {
-        return orderByStr;
-    }
+public void setSearchKey(String searchKey) {
+    this.searchKey = searchKey;
+}
 
-    public void setOrderByStr(String orderByStr) {
-        this.orderByStr = orderByStr;
-    }
+public String getAdvancedQuery() {
+    return advancedQuery;
+}
 
-    public String getIdStr() {
-        return idStr;
-    }
+public void setAdvancedQuery(String advancedQuery) {
+    this.advancedQuery = advancedQuery;
+}
 
-    public void setIdStr(String idStr) {
-        this.idStr = idStr;
-    }
+public String getOrderByStr() {
+    return orderByStr;
+}
 
-    public Integer getHouseRank() {
-        return houseRank;
-    }
+public void setOrderByStr(String orderByStr) {
+    this.orderByStr = orderByStr;
+}
 
-    public void setHouseRank(Integer houseRank) {
-        this.houseRank = houseRank;
-    }
+public String getIdStr() {
+    return idStr;
+}
 
-    public UserInfo getUserInfo() {
-        return userInfo;
-    }
+public void setIdStr(String idStr) {
+    this.idStr = idStr;
+}
 
-    public void setUserInfo(UserInfo userInfo) {
-        this.userInfo = userInfo;
-    }
 }
 

src/main/java/com/izouma/awesomeadmin/service/PlayerInfoService.java

@@ -23,9 +23,5 @@ public interface PlayerInfoService{
     boolean deletePlayerInfo(PlayerInfo record);
 
     boolean updatePlayerInfo(PlayerInfo record);
-
-    List<PlayerInfo> getPlayerInfoRankByPage(Page page, PlayerInfo record);
-
-    int userRank(PlayerInfo record);
 }
 

src/main/java/com/izouma/awesomeadmin/service/VideoNotifyService.java

@@ -18,7 +18,7 @@ public interface VideoNotifyService {
 
     void onPublishDone(VideoNotifyParam param, HttpServletRequest request, HttpServletResponse response);
 
-    void onRecodDone(VideoNotifyParam param, HttpServletRequest request, HttpServletResponse response);
+    void onRecordDone(VideoNotifyParam param, HttpServletRequest request, HttpServletResponse response);
 
     void onUpdate(VideoNotifyParam param, HttpServletRequest request, HttpServletResponse response);
 }

src/main/java/com/izouma/awesomeadmin/service/VideoRecognitionService.java

@@ -1,5 +1,6 @@
 package com.izouma.awesomeadmin.service;
 
+import com.izouma.awesomeadmin.model.PlayerInfo;
 import org.opencv.core.Mat;
 import org.opencv.ml.SVM;
 
@@ -8,6 +9,8 @@ import java.util.Map;
 public interface VideoRecognitionService {
     boolean start(String videoPath);
 
+    void start(PlayerInfo playerInfo);
+
     boolean matchGameOver(SVM svm, Mat inputImage);
 
     String extractRank(Mat inputImage);

src/main/java/com/izouma/awesomeadmin/service/impl/PlayerInfoServiceImpl.java

@@ -52,24 +52,6 @@ public class PlayerInfoServiceImpl implements PlayerInfoService{
         return null;
     }
 
-    @Override
-    public List<PlayerInfo> getPlayerInfoRankByPage(Page page, PlayerInfo record) {
-
-        logger.info("queryPlayerInfoRankByPage");
-        try {
-
-        Map<String, Object> parameter = new HashMap<String, Object>();
-        parameter.put("record", record);
-        parameter.put(AppConstant.PAGE, page);
-
-        return playerInfoMapper.queryPlayerInfoRankByPage(parameter);
-        } catch (Exception e) {
-        logger.error("queryPlayerInfoRankByPage", e);
-        }
-
-        return null;
-    }
-
     @Override
     public PlayerInfo getPlayerInfoById(String id) {
 
@@ -98,21 +80,6 @@ public class PlayerInfoServiceImpl implements PlayerInfoService{
         return null;
     }
 
-    @Override
-    public int userRank(PlayerInfo record) {
-
-        logger.info("getPlayerInfo");
-        try {
-
-            return playerInfoMapper.userRank(record);
-
-        } catch (Exception e) {
-        logger.error("getPlayerInfo", e);
-        }
-
-        return 0;
-    }
-
     @Override
     public boolean createPlayerInfo(PlayerInfo record) {
 

src/main/java/com/izouma/awesomeadmin/service/impl/VideoNotifyServiceImpl.java

@@ -1,8 +1,12 @@
 package com.izouma.awesomeadmin.service.impl;
 
 import com.izouma.awesomeadmin.dto.VideoNotifyParam;
+import com.izouma.awesomeadmin.model.PlayerInfo;
+import com.izouma.awesomeadmin.service.PlayerInfoService;
 import com.izouma.awesomeadmin.service.VideoNotifyService;
+import com.izouma.awesomeadmin.service.VideoRecognitionService;
 import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
@@ -12,6 +16,11 @@ import javax.servlet.http.HttpServletResponse;
 public class VideoNotifyServiceImpl implements VideoNotifyService {
     private static Logger logger = Logger.getLogger(PowerInfoServiceImpl.class);
 
+    @Autowired
+    private PlayerInfoService       playerInfoService;
+    @Autowired
+    private VideoRecognitionService videoRecognitionService;
+
     @Override
     public void onConnect(VideoNotifyParam param, HttpServletRequest request, HttpServletResponse response) {
     }
@@ -42,8 +51,13 @@ public class VideoNotifyServiceImpl implements VideoNotifyService {
     }
 
     @Override
-    public void onRecodDone(VideoNotifyParam param, HttpServletRequest request, HttpServletResponse response) {
-
+    public void onRecordDone(VideoNotifyParam param, HttpServletRequest request, HttpServletResponse response) {
+        if (param.getPlayerInfoId() != null) {
+            PlayerInfo playerInfo = playerInfoService.getPlayerInfoById(param.getPlayerInfoId().toString());
+            playerInfo.setVideo(param.getPath());
+            playerInfo.setStatusFlag(5);
+            playerInfoService.updatePlayerInfo(playerInfo);
+        }
     }
 
     @Override

src/main/java/com/izouma/awesomeadmin/service/impl/VideoRecognitionServiceImpl.java

@@ -1,5 +1,8 @@
 package com.izouma.awesomeadmin.service.impl;
 
+import com.izouma.awesomeadmin.model.PlayerInfo;
+import com.izouma.awesomeadmin.service.OSSFileService;
+import com.izouma.awesomeadmin.service.PlayerInfoService;
 import com.izouma.awesomeadmin.service.VideoRecognitionService;
 import com.sun.jna.Library;
 import com.sun.jna.Native;
@@ -16,6 +19,7 @@ import org.opencv.imgproc.Imgproc;
 import org.opencv.ml.SVM;
 import org.opencv.videoio.VideoCapture;
 import org.opencv.videoio.Videoio;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import sun.misc.BASE64Encoder;
 
@@ -24,6 +28,8 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -39,6 +45,12 @@ import static org.opencv.imgproc.Imgproc.*;
 
 @Service
 public class VideoRecognitionServiceImpl implements VideoRecognitionService {
+
+    @Autowired
+    private OSSFileService    ossFileService;
+    @Autowired
+    private PlayerInfoService playerInfoService;
+
     public static  boolean                          DEBUG      = false;
     private static Map<String, Map<String, Object>> resultMap  = new HashMap<>();
     private static Map<String, Long>                lastStat   = new HashMap<>();
@@ -136,6 +148,69 @@ public class VideoRecognitionServiceImpl implements VideoRecognitionService {
         return false;
     }
 
+    @Override
+    public void start(PlayerInfo playerInfo) {
+        if (playerInfo.getStatusFlag() > 4) {
+            return;
+        }
+        VideoCapture capture = new VideoCapture();
+        if (capture.open(playerInfo.getVideo())) {
+            System.out.println(capture.get(Videoio.CAP_PROP_FRAME_WIDTH));
+            System.out.println(capture.get(Videoio.CAP_PROP_FRAME_HEIGHT));
+            executor.execute(() -> {
+                SVM svm = SVM.load(GetResource.class.getClassLoader().getResource("trainneddata/pubg.xml").getPath());
+                Mat frame = new Mat();
+                Mat v = new Mat();
+                long frameCount = 0;
+                while (capture.read(frame)) {
+                    frameCount++;
+                    if (frameCount % 200 == 0) {
+                        System.gc();
+                    }
+                    if (frameCount % 3 != 0) {
+                        continue;
+                    }
+                    if (matchGameOver(svm, frame)) {
+                        String rank = extractRank(frame);
+                        String time = extractGameTime(frame);
+                        if (StringUtils.isNotEmpty(rank) && StringUtils.isNotEmpty(time)) {
+                            rank = rank.trim().replace(" ", "").replace("\n", "");
+                            time = time.trim().replace(" ", "").replace("\n", "");
+                            if (Pattern.matches("^第\\d{1,3}$", rank)
+                                    && Pattern.matches("((^([0-9]+[.][0-9]*))|(^\\d{1,2}))分钟", time)) {
+                                System.out.println(rank);
+                                System.out.println(time);
+                                Map<String, Object> map = new HashMap<>();
+                                map.put("rank", rank);
+                                map.put("time", time);
+                                BufferedImage image = createBufferedImage(frame);
+                                ByteArrayOutputStream baos = new ByteArrayOutputStream();//io流
+                                try {
+                                    ImageIO.write(image, "png", baos);//写入流中
+                                } catch (IOException e) {
+                                    e.printStackTrace();
+                                }
+                                byte[] bytes = baos.toByteArray();//转换成字节
+                                InputStream in = new ByteArrayInputStream(bytes);
+                                String path = String.format("images/%s-%s.jpg", new SimpleDateFormat("yyyy-MM-dd-hh-mm-ss").format(new Date()), UUID.randomUUID().toString());
+                                String url = ossFileService.upload(in, path);
+                                playerInfo.setImage(url);
+                                playerInfo.setStatusFlag(6);
+                                playerInfoService.updatePlayerInfo(playerInfo);
+                                break;
+                            }
+                        }
+                    }
+                    System.out.println(frameCount + " frame processed");
+                }
+                capture.release();
+                frame.release();
+                v.release();
+                System.gc();
+            });
+        }
+    }
+
     @Override
     public boolean matchGameOver(SVM svm, Mat inputImage) {
         if (inputImage.cols() < inputImage.rows()) {

src/main/java/com/izouma/awesomeadmin/web/PlayerInfoController.java

@@ -18,8 +18,8 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * controller类
- */
+*  controller类
+*/
 @Controller
 @RequestMapping("/playerInfo")
 public class PlayerInfoController {
@@ -28,8 +28,8 @@ public class PlayerInfoController {
     private PlayerInfoService playerInfoService;
 
     /**
-     * <p>获取全部记录。</p>
-     */
+    * <p>获取全部记录。</p>
+    */
     @RequiresAuthentication
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @ResponseBody
@@ -39,8 +39,8 @@ public class PlayerInfoController {
     }
 
     /**
-     * <p>根据Id。</p>
-     */
+    * <p>根据Id。</p>
+    */
     @RequestMapping(value = "/getPlayerInfo", method = RequestMethod.GET)
     @ResponseBody
     public Result getPlayerInfo(@RequestParam(required = false, value = "id") String id) {
@@ -49,8 +49,8 @@ public class PlayerInfoController {
     }
 
     /**
-     * <p>根据条件获取。</p>
-     */
+    * <p>根据条件获取。</p>
+    */
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @ResponseBody
     public Result getOne(PlayerInfo record) {
@@ -58,158 +58,120 @@ public class PlayerInfoController {
         return new Result(true, data);
     }
 
-    @RequestMapping(value = "/check", method = RequestMethod.GET)
-    @ResponseBody
-    public Result check(PlayerInfo record) {
-        PlayerInfo data = playerInfoService.getPlayerInfo(record);
-
-        if (data != null) {
-
-            return new Result(false, "玩家已存在");
-        }
-        return new Result(true, "玩家不存在");
-
-    }
-
 
     /**
-     * <p>分页查询。</p>
-     */
+    * <p>分页查询。</p>
+    */
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ResponseBody
     public Result page(Page page, PlayerInfo record) {
         Map<String, Object> result = new HashMap<>();
 
-        List<PlayerInfo> pp = playerInfoService.getPlayerInfoByPage(page, record);
+        List<PlayerInfo> pp =playerInfoService.getPlayerInfoByPage(page, record);
 
         result.put(AppConstant.PAGE, page);
         result.put("pp", pp);
         return new Result(true, result);
     }
 
-    /**
-     * <p>分页排名查询。</p>
-     */
-    @RequestMapping(value = "/rankPage", method = RequestMethod.GET)
-    @ResponseBody
-    public Result rankPage(Page page, PlayerInfo record) {
-        Map<String, Object> result = new HashMap<>();
-
-        List<PlayerInfo> pp = playerInfoService.getPlayerInfoRankByPage(page, record);
-
-        result.put(AppConstant.PAGE, page);
-        result.put("pp", pp);
-        return new Result(true, result);
-    }
-
-    @RequestMapping(value = "/userRank", method = RequestMethod.GET)
-    @ResponseBody
-    public Result userRank(PlayerInfo record) {
-
-        int rank = playerInfoService.userRank(record);
-
-        return new Result(true, rank);
-    }
-
 
     /**
-     * <p>保存。</p>
-     */
+    * <p>保存。</p>
+    */
     @RequestMapping(value = "/save", method = RequestMethod.POST)
     @ResponseBody
     public Result save(PlayerInfo record) {
         boolean num = playerInfoService.createPlayerInfo(record);
         if (num) {
-            return new Result(true, record.getId());
+        return new Result(true, record.getId());
         }
         return new Result(false, "保存异常");
     }
 
     /**
-     * <p>更新信息。</p>
-     */
+    * <p>更新信息。</p>
+    */
     @RequestMapping(value = "/update", method = RequestMethod.POST)
     @ResponseBody
     public Result updatePlayerInfo(PlayerInfo record) {
         boolean num = playerInfoService.updatePlayerInfo(record);
         if (num) {
-            return new Result(true, "保存成功");
+        return new Result(true, "保存成功");
         }
         return new Result(false, "保存异常");
     }
 
     /**
-     * <p>删除。</p>
-     */
+    * <p>删除。</p>
+    */
     @RequestMapping(value = "/del", method = RequestMethod.POST)
     @ResponseBody
     public Result deletePlayerInfo(PlayerInfo record) {
 
         boolean num = playerInfoService.deletePlayerInfo(record);
         if (num) {
-            return new Result(true, "删除成功");
+        return new Result(true, "删除成功");
         }
         return new Result(false, "删除异常");
     }
 
     /**
-     * 导出Excel
-     *
-     * @param request
-     * @param response
-     * @param record
-     * @throws Exception
-     */
+    * 导出Excel
+    * @param request
+    * @param response
+    * @param record
+    * @throws Exception
+    */
     @RequestMapping(value = "/exportExcel", method = RequestMethod.GET)
     @ResponseBody
     public void exportExcel(HttpServletRequest request, HttpServletResponse response, PlayerInfo record) throws Exception {
 
-        List<PlayerInfo> playerInfos = playerInfoService.getPlayerInfoList(record);
+    List<PlayerInfo> playerInfos = playerInfoService.getPlayerInfoList(record);
 
 
         String sheetName = "player_info";
         String titleName = "参赛人员数据表";
         String fileName = "参赛人员表";
         int columnNumber = 26;
-        int[] columnWidth = {20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20};
-        String[] columnName = {"ID", "删除标识", "更新时间", "更新人", "创建时间", "创建人", "游戏ID", "房间ID", "加入时间", "本金", "奖金", "用户", "备注", "截图", "击败玩家", "游戏排名", "开始时间", "结束时间", "状态", "审核人", "审核时间", "审核类型", "视频地址", "存活时长", "游戏类型", "赛季ID"};
+        int[] columnWidth = { 20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20,  20 };
+        String[] columnName = {  "ID" ,   "删除标识" ,   "更新时间" ,   "更新人" ,   "创建时间" ,   "创建人" ,   "游戏ID" ,   "房间ID" ,   "加入时间" ,   "本金" ,   "奖金" ,   "用户" ,   "备注" ,   "截图" ,   "击败玩家" ,   "游戏排名" ,   "开始时间" ,   "结束时间" ,   "状态" ,   "审核人" ,   "审核时间" ,   "审核类型" ,   "视频地址" ,   "存活时长" ,   "游戏类型" ,   "赛季ID"  };
         String[][] dataList = new String[playerInfos.size()][26];
 
         for (int i = 0; i < playerInfos.size(); i++) {
 
-            dataList[i][0] = String.valueOf(playerInfos.get(i).getId());
-            dataList[i][1] = String.valueOf(playerInfos.get(i).getDelFlag());
-            dataList[i][2] = String.valueOf(playerInfos.get(i).getUpdateTime());
-            dataList[i][3] = String.valueOf(playerInfos.get(i).getUpdateUser());
-            dataList[i][4] = String.valueOf(playerInfos.get(i).getCreateTime());
-            dataList[i][5] = String.valueOf(playerInfos.get(i).getCreateUser());
-            dataList[i][6] = String.valueOf(playerInfos.get(i).getGameId());
-            dataList[i][7] = String.valueOf(playerInfos.get(i).getHouseId());
-            dataList[i][8] = String.valueOf(playerInfos.get(i).getJoinTime());
-            dataList[i][9] = String.valueOf(playerInfos.get(i).getPrincipal());
-            dataList[i][10] = String.valueOf(playerInfos.get(i).getBonus());
-            dataList[i][11] = String.valueOf(playerInfos.get(i).getUserId());
-            dataList[i][12] = String.valueOf(playerInfos.get(i).getRemark());
-            dataList[i][13] = String.valueOf(playerInfos.get(i).getImage());
-            dataList[i][14] = String.valueOf(playerInfos.get(i).getKillNumber());
-            dataList[i][15] = String.valueOf(playerInfos.get(i).getRanking());
-            dataList[i][16] = String.valueOf(playerInfos.get(i).getBeginTime());
-            dataList[i][17] = String.valueOf(playerInfos.get(i).getEndTime());
-            dataList[i][18] = String.valueOf(playerInfos.get(i).getStatusFlag());
-            dataList[i][19] = String.valueOf(playerInfos.get(i).getExamineUser());
-            dataList[i][20] = String.valueOf(playerInfos.get(i).getExamineTime());
-            dataList[i][21] = String.valueOf(playerInfos.get(i).getExamineType());
-            dataList[i][22] = String.valueOf(playerInfos.get(i).getVideo());
-            dataList[i][23] = String.valueOf(playerInfos.get(i).getLiveTime());
-            dataList[i][24] = String.valueOf(playerInfos.get(i).getGameType());
-            dataList[i][25] = String.valueOf(playerInfos.get(i).getSeasonId());
-        }
+                        dataList[i][0] = String.valueOf(playerInfos.get(i).getId());
+                        dataList[i][1] = String.valueOf(playerInfos.get(i).getDelFlag());
+                        dataList[i][2] = String.valueOf(playerInfos.get(i).getUpdateTime());
+                        dataList[i][3] = String.valueOf(playerInfos.get(i).getUpdateUser());
+                        dataList[i][4] = String.valueOf(playerInfos.get(i).getCreateTime());
+                        dataList[i][5] = String.valueOf(playerInfos.get(i).getCreateUser());
+                        dataList[i][6] = String.valueOf(playerInfos.get(i).getGameId());
+                        dataList[i][7] = String.valueOf(playerInfos.get(i).getHouseId());
+                        dataList[i][8] = String.valueOf(playerInfos.get(i).getJoinTime());
+                        dataList[i][9] = String.valueOf(playerInfos.get(i).getPrincipal());
+                        dataList[i][10] = String.valueOf(playerInfos.get(i).getBonus());
+                        dataList[i][11] = String.valueOf(playerInfos.get(i).getUserId());
+                        dataList[i][12] = String.valueOf(playerInfos.get(i).getRemark());
+                        dataList[i][13] = String.valueOf(playerInfos.get(i).getImage());
+                        dataList[i][14] = String.valueOf(playerInfos.get(i).getKillNumber());
+                        dataList[i][15] = String.valueOf(playerInfos.get(i).getRanking());
+                        dataList[i][16] = String.valueOf(playerInfos.get(i).getBeginTime());
+                        dataList[i][17] = String.valueOf(playerInfos.get(i).getEndTime());
+                        dataList[i][18] = String.valueOf(playerInfos.get(i).getStatusFlag());
+                        dataList[i][19] = String.valueOf(playerInfos.get(i).getExamineUser());
+                        dataList[i][20] = String.valueOf(playerInfos.get(i).getExamineTime());
+                        dataList[i][21] = String.valueOf(playerInfos.get(i).getExamineType());
+                        dataList[i][22] = String.valueOf(playerInfos.get(i).getVideo());
+                        dataList[i][23] = String.valueOf(playerInfos.get(i).getLiveTime());
+                        dataList[i][24] = String.valueOf(playerInfos.get(i).getGameType());
+                        dataList[i][25] = String.valueOf(playerInfos.get(i).getSeasonId());
+                    }
 
 
         ExportExcelUtil.ExportWithResponse(sheetName, titleName, fileName,
-                columnNumber, columnWidth, columnName, dataList, response);
+        columnNumber, columnWidth, columnName, dataList, response);
 
 
+        }
     }
-}
 

src/main/java/com/izouma/awesomeadmin/web/VideoNotifyController.java

@@ -2,7 +2,6 @@ package com.izouma.awesomeadmin.web;
 
 import com.izouma.awesomeadmin.dto.VideoNotifyParam;
 import com.izouma.awesomeadmin.service.VideoNotifyService;
-import com.izouma.awesomeadmin.service.impl.PowerInfoServiceImpl;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -36,14 +35,14 @@ public class VideoNotifyController {
             case "done":
                 videoNotifyService.onDone(param, request, response);
                 break;
-            case "playDone":
+            case "play_done":
                 videoNotifyService.onPlayDone(param, request, response);
                 break;
-            case "publishDone":
+            case "publish_done":
                 videoNotifyService.onPublishDone(param, request, response);
                 break;
-            case "recordDone":
-                videoNotifyService.onRecodDone(param, request, response);
+            case "record_done":
+                videoNotifyService.onRecordDone(param, request, response);
                 break;
         }
     }

src/main/vue/src/pages/PlayerInfo.vue

@@ -68,10 +68,19 @@
                                 </div>
                             </template>
                         </el-form-item>
-                                                                                                                                                                                                                                            <el-form-item prop="statusFlag" label="状态">
-                <el-input v-model="formData.statusFlag" :disabled="'statusFlag'==subColumn"></el-input>
-            </el-form-item>
-                                                                                                                                                                                                                                                                                                                            <el-form-item prop="examineUser" label="审核人">
+                                                                                                                                                                                                                                                                                                                                                <el-form-item prop="statusFlag" label="状态">
+                <template>
+                    <el-select v-model="formData.statusFlag" clearable  placeholder="请选择" :disabled="'statusFlag'==subColumn">
+                        <el-option
+                                v-for="item in statusFlagOptions"
+                                :key="item.value"
+                                :label="item.label"
+                                :value="item.value">
+                        </el-option>
+                    </el-select>
+                </template>
+            </el-form-item>
+                                                                                                                                                                                                                        <el-form-item prop="examineUser" label="审核人">
                 <el-input v-model="formData.examineUser" :disabled="'examineUser'==subColumn"></el-input>
             </el-form-item>
                                                                                                                                                                                                                                                                                                                                                                                                                         <el-form-item prop="examineTime" label="审核时间">
@@ -143,14 +152,15 @@
                 }
             }
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            },
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                },
         data() {
             return {
                 saving: false,
                 formData: {},
                 rules: {
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             },
-                                                                                                                                                                                                                            subColumn: '',
+                                                                                                                                                                        statusFlagOptions:[{label:'等待中',value:1},{label:'准备中',value:2},{label:'游戏中',value:3},{label:'已结束',value:4},{label:'处理中',value:5},{label:'已完成',value:6}],
+                                                                                        subColumn: '',
             subValue: '',
         }
         },