Merge remote-tracking branch 'origin/dev_wangyanzhao' into dev

# Conflicts: # pom.xml # src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java # src/main/resources/application-dev.properties # src/main/resources/application.properties # src/main/resources/logback-spring.xml

Merge remote-tracking branch 'origin/dev_wangyanzhao' into dev
# Conflicts: # pom.xml # src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java # src/main/resources/application-dev.properties # src/main/resources/application.properties # src/main/resources/logback-spring.xml
郑超
2 parents 238aa904 a2fed0ec
Showing 13 changed files with 386 additions and 24 deletions
src/main/java/com/cnlive/shenhe/bean/ErrorEnum.java
src/main/java/com/cnlive/shenhe/config/MyInterceptor.java
src/main/java/com/cnlive/shenhe/controller/BootTestController.java
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
src/main/java/com/cnlive/shenhe/controller/VideosController.java
src/main/java/com/cnlive/shenhe/entity/BootTest.java
src/main/java/com/cnlive/shenhe/mapper/BootTestMapper.java
src/main/java/com/cnlive/shenhe/serviceImpl/BootTestServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
src/main/resources/application-prod.properties
src/main/resources/mapper/BootTestMapper.xml
src/main/resources/mapper/ShyAudioMapper.xml
@@ -19,6 +19,7 @@ public enum ErrorEnum {
     private Integer errorCode;
     private String errorMessage;
+
     ErrorEnum(Integer errorCode, String errorMessage) {
         this.errorCode = errorCode;
         this.errorMessage = errorMessage;
@@ -18,11 +18,11 @@ import javax.servlet.http.HttpSession;
 public class MyInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception {
-        HttpSession httpSession=httpServletRequest.getSession();
-        SessionUser sessionUser = (SessionUser)httpSession.getAttribute(SessionUser.getSessionKey());
-        if(CommonUtils.isNull(sessionUser)){ 
-//            httpServletRequest.getRequestDispatcher("/users/login").forward(httpServletRequest, httpServletResponse);
-        	httpServletResponse.sendRedirect("/users/login");
+        HttpSession httpSession = httpServletRequest.getSession();
+        SessionUser sessionUser = (SessionUser) httpSession.getAttribute(SessionUser.getSessionKey());
+        if (CommonUtils.isNull(sessionUser)) {
+        // httpServletRequest.getRequestDispatcher("/users/login").forward(httpServletRequest, httpServletResponse);
+            httpServletResponse.sendRedirect("/users/login");
             return false;
         }
+package com.cnlive.shenhe.controller;
+import com.google.common.collect.Lists;
+
+import com.cnlive.shenhe.entity.BootTest;
+import com.cnlive.shenhe.serviceImpl.BootTestServiceImpl;
+import com.cnlive.shenhe.utils.CommonUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author: yanzhaowang
+ * @Date: 2022/3/4 14:10
+ */
+@RestController
+@RequestMapping("/boottest")
+public class BootTestController {
+
+    @Autowired
+    BootTestServiceImpl bootTestService;
+
+    @GetMapping("/testselect/{pagesiaz}/{pageNum}")
+    public List<BootTest> selectAll(@RequestParam(defaultValue = "10") @PathVariable(name = "pagesiaz") int pagesiaz, @RequestParam(defaultValue = "1") @PathVariable(name = "pageNum") int pageNum){
+        List<BootTest> bootTests = bootTestService.selectAll(pagesiaz, pageNum);
+        return bootTests;
+    }
+    @GetMapping("/testselectid/{BootId}")
+    public BootTest selectById(@PathVariable(value = "BootId") String BootId){
+        if (BootId != null) {
+            BootTest bootTest = bootTestService.selectByid(BootId);
+            return bootTest;
+        }
+        return null;
+    }
+
+    @RequestMapping("/testaddBoottest")
+    public int addBootTest(@RequestBody BootTest bootTest){
+        int i = bootTestService.addBootTest(bootTest);
+        return i;
+    }
+
+    @DeleteMapping("/testdeleteBoottest/{bootTestid}")
+    public int deleteBootTest(@PathVariable(name = "bootTestid") String bootTestid){
+        if (CommonUtils.isNotEmpty(bootTestid)) {
+            int i = bootTestService.deleteBootTest(bootTestid);
+            return i;
+        }
+        return 0;
+    }
+
+    @RequestMapping("/testupdateBoottest")
+    public int testupdateBoottest(@RequestBody BootTest bootTest){
+        if (bootTest.getId() != null&&bootTest.getAge()!=null&&bootTest.getName()!=null) {
+            int i = bootTestService.updateBootTest(bootTest);
+            return i;
+        }
+        return 0;
+    }
+}
@@ -374,15 +374,21 @@ public class CommentsController extends BaseController {
                 /*状态需要处理成用户可读*/
                 String common_type = "";//评论类型，topic:话题
-                if (list.get(i).getType().equals(CommonConst.CATEGORY_TOPIC)) {
-                    common_type = "话题";
+                String type = list.get(i).getType();
+                if (type != null) {
+                    if (type.equals(CommonConst.CATEGORY_TOPIC)) {
+                        common_type = "话题";
+                    }
                 } else {
                     common_type = "其他";
                 }
                 cell = row.createCell(6);//列
                 cell.setCellValue(common_type);
                 cell = row.createCell(7);//列
-                cell.setCellValue(list.get(i).getLevel());
+                Integer level = list.get(i).getLevel();
+                if (level != null) {
+                    cell.setCellValue(level);
+                }
                 /*状态需要处理成用户可读*/
                 String platform = "";//评论所属的平台
                 if (list.get(i).getPlatform().equals("a")) {
@@ -347,13 +347,15 @@ public class VideosController extends BaseController {
         if (spid == 0) {
             videosDTO.setSpid(null);
         }
-        if (videosDTO.getSp_Id() != null) {
+        if (videosDTO.getSp_Id() != null && videosDTO.getSp_Id() != "") {
             videosDTO.setSpid(Integer.valueOf(videosDTO.getSp_Id()));
         }
         List<ShyVideos> shyVideosList = videosService.findByCondition(videosDTO);
         String fileName = "点播数据";
-        String updater = "";//审核员名字
-        String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核
+        //审核员名字
+        String updater = "";
+        //审核状态 1已审核 2审核拒绝 0未审核
+        String state1 = "";
         XSSFWorkbook wb = new XSSFWorkbook();
         ServletOutputStream out = null;
         BufferedInputStream bis = null;
+package com.cnlive.shenhe.entity;
+
+import javax.persistence.*;
+
+@Table(name = "boot_test")
+public class BootTest {
+    @Id
+    private Integer id;
+
+    private String name;
+
+    private Integer age;
+
+    private String address;
+
+    private String hobby;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * @return name
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * @return age
+     */
+    public Integer getAge() {
+        return age;
+    }
+
+    /**
+     * @param age
+     */
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    /**
+     * @return address
+     */
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * @param address
+     */
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    /**
+     * @return hobby
+     */
+    public String getHobby() {
+        return hobby;
+    }
+
+    /**
+     * @param hobby
+     */
+    public void setHobby(String hobby) {
+        this.hobby = hobby;
+    }
+}
 \ No newline at end of file
+package com.cnlive.shenhe.mapper;
+
+import com.cnlive.shenhe.entity.BootTest;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface BootTestMapper extends Mapper<BootTest> {
+}
 \ No newline at end of file
+package com.cnlive.shenhe.serviceImpl;
+import com.google.common.collect.Lists;
+
+import com.cnlive.shenhe.entity.BootTest;
+import com.cnlive.shenhe.mapper.BootTestMapper;
+import com.cnlive.shenhe.utils.CommonUtils;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Author: yanzhaowang
+ * @Date: 2022/3/4 13:38
+ */
+@Service
+public class BootTestServiceImpl {
+
+    @Autowired
+    BootTestMapper bootTestMapper;
+
+    /**
+     *根据主键查询对象
+     * @param boottestid
+     * @return
+     */
+    public BootTest selectByid(String boottestid) {
+
+        if (CommonUtils.isEmpty(boottestid)) {
+            return null;
+        }
+        BootTest bootTest = bootTestMapper.selectByPrimaryKey(boottestid);
+
+        return bootTest;
+    }
+
+    /**
+     * 查询所有的数据
+     * @return
+     */
+    public List<BootTest> selectAll(int pagesaiz, int pagenum){
+//        PageInfo pageInfo = new PageInfo();
+//        pageInfo.setSize(pagesaiz);
+//        pageInfo.setPageNum(pagenum);
+//        PageHelper pageHelper = new PageHelper();
+        List<BootTest> bootTestList = bootTestMapper.selectAll();
+//        pageInfo.setList(bootTestList);
+        return bootTestList;
+    }
+
+    /**
+     * 添加一个对象
+     * @param bootTest
+     * @return
+     */
+    public int addBootTest(BootTest bootTest) {
+        Integer age = bootTest.getAge();
+        if (age >= 18 && age <= 60) {
+            int i = bootTestMapper.insertSelective(bootTest);
+            return i;
+        }
+        return 0;
+    }
+
+    /**
+     * 根据主键删除一个对象
+     * @param boottestid
+     * @return
+     */
+    public int deleteBootTest(String boottestid){
+        if (boottestid == null) {
+            return 0;
+        }
+        int i = bootTestMapper.deleteByPrimaryKey(boottestid);
+        return i;
+    }
+
+    /**
+     * 根据条件修改对象
+     * @return
+     */
+    public int updateBootTest(BootTest bootTest){
+        if (bootTest != null) {
+            int i = bootTestMapper.updateByPrimaryKeySelective(bootTest);
+            return i;
+        }
+        return 0;
+
+    }
+}
@@ -105,9 +105,9 @@ public class CommentsServiceImpl {
         if (CommonUtils.isNotNull(commentsDTO.getComment_user_id())) {
             criteria.andEqualTo("comment_user_id", commentsDTO.getComment_user_id());
         }
-        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "0") {
+        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.valueOf(commentsDTO.getType()) == 0) {
             criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
-        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "1") {
+        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.valueOf(commentsDTO.getType()) == 1) {
             criteria.andEqualTo("type", CommonConst.CATEGORY_ELSE);
         }
         if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
@@ -168,9 +168,9 @@ public class CommentsServiceImpl {
         if (CommonUtils.isNotNull(commentsDTO.getIs_hot())) {
             criteria.andEqualTo("is_hot", commentsDTO.getIs_hot());
         }
-        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "0") {
+        if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType().equals("0")) {
             criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
-        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "1") {
+        } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType().equals("0")) {
             criteria.andIsNull("type");
         }
         if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
@@ -183,14 +183,14 @@ public class CommentsServiceImpl {
             }
         }
-        if (CommonUtils.isNotEmpty(String.valueOf(commentsDTO.getState()))) {
-            Example.Criteria criteria1 = example.createCriteria();
-            String[] stas = String.valueOf(commentsDTO.getState()).split(",");
-            for (String s : stas) {
-                criteria1.orEqualTo("state", Integer.parseInt(s));
-            }
-            example.and(criteria1);
-        }
+        //if (CommonUtils.isNotEmpty(String.valueOf(commentsDTO.getState()))) {
+        //    Example.Criteria criteria1 = example.createCriteria();
+        //    String[] stas = String.valueOf(commentsDTO.getState()).split(",");
+        //    for (String s : stas) {
+        //        criteria1.orEqualTo("state", Integer.parseInt(s));
+        //    }
+        //    example.and(criteria1);
+        //}
         if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
             criteria.andEqualTo("state", commentsDTO.getState());
@@ -114,7 +114,7 @@ public class VideosServiceImpl {
     }
     public PageInfo<ShyVideos> getListContent(VideosDTO videosDTO) {
-        logger.info("接受桉树列表为，VideosDTO:{}", JSON.toJSONString(videosDTO));
+        logger.info("接受点播列表为，VideosDTO:{}",JSON.toJSONString(videosDTO));
         Example example = new Example(ShyVideos.class);
         Example.Criteria criteria = example.createCriteria();
         Example.Criteria criteria2 = example.createCriteria();
+server.port=81
+
+#\u91d1\u5c71\u516d\u533a\u6570\u636e\u5e93
+spring.datasource.url=jdbc:mysql://10.137.192.7:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+spring.datasource.username=admin
+spring.datasource.password=83BwiCoq
+
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+server.tomcat.protocol_header=x-forwarded-proto
+server.use-forward-headers=true
+
+spring.jpa.properties.hibernate.hbm2ddl.auto=update
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
+spring.jpa.show-sql= true
+
+server.tomcat.uri-encoding=UTF-8
+spring.http.encoding.charset=UTF-8
+spring.http.encoding.enabled=true
+spring.http.encoding.force=true
+
+
+#\u6253\u5370\u8fd0\u884c\u65f6\u7684sql
+#logging.level.com.cnlive.shenhe.mapper=debug
+
+mybatis.mapper-locations=classpath:mapper/*.xml
+mybatis.type-aliases-package=com.cnlive.shenhe.entity
+
+#rabbitmq\u76f8\u5173\u914d\u7f6e
+spring.rabbitmq.host=10.254.176.11
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=admin
+spring.rabbitmq.password=fA{5Uikx7
+# \u5f00\u542f\u53d1\u9001\u786e\u8ba4
+spring.rabbitmq.publisher-confirms=true
+# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de
+spring.rabbitmq.publisher-returns=true
+# \u5f00\u542fACK
+spring.rabbitmq.listener.direct.acknowledge-mode=manual
+spring.rabbitmq.listener.simple.acknowledge-mode=manual
+
+
+#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico
+spring.mvc.favicon.enabled = false
+
+#\u8bc4\u8bba\u7981\u8a00\u548c\u89e3\u7981\u4f7f\u7528API
+speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
+
+#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528
+spring.application.name=cnlive_shenhe
+spring.application.home=/usr/local/cnlive_shenhe/log
+
+sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
+sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
+
+#\u7528\u6237\u4e91\u8bf7\u6c42\u67e5\u8be2\u7528\u6237\u4fe1\u606f
+queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
+queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
+
+#\u70b9\u64ad\u4e91\u9700\u8981\u7684\u5e38\u91cf
+url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
+platformKey =AUDIT
+platformValue=10011438
+
+#\u672c\u673a\u5730\u5740
+spring.localhost.url=http://shen.cnlive.com
+
+#\u62bd\u5e27\u5e38\u91cf
+avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
+avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
+avsmple_url=http://transcode.cnlive.com/api/request
+avsmple_callback=http://shen.cnlive.com/api/avsample/callback
+
+#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f
+live_url=http://bc.cnlive.com/bokong/activity/activityShenHe
+
+#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf
+email_app_id=769_jetja50p18
+email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
+email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
+
+
+qn_bucket=mam-sxzg-82
+qn_domain=http://sxzg.ys2.cnliveimg.com
+ks_bucket=mam-sxzg-82
+ks_domain=http://sxzg.ys1.cnliveimg.com
+
+#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
+desdir=shen
+yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio
+cms_getVideoAndLiveId=http://cms.cnlive.com:8768/contentApi/getBeanById
 \ No newline at end of file
+<?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.cnlive.shenhe.mapper.BootTestMapper">
+  <resultMap id="BaseResultMap" type="com.cnlive.shenhe.entity.BootTest">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="age" jdbcType="INTEGER" property="age" />
+    <result column="address" jdbcType="VARCHAR" property="address" />
+    <result column="hobby" jdbcType="VARCHAR" property="hobby" />
+  </resultMap>
+</mapper>
 \ No newline at end of file
@@ -42,4 +42,5 @@
     FROM shy_audio
     where audioId = #{audioId,jdbcType=VARCHAR};
   </select>
+
 </mapper>
 \ No newline at end of file