周伟鹏 / cnlive_shenhe · Commits

Commit 04cdb0e53dfd1354438aeafbbebaa951de668446

Authored by 郑超
2 parents 238aa904 a2fed0ec

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
Inline Side-by-side
Showing 13 changed files with 386 additions and 24 deletions
src/main/java/com/cnlive/shenhe/bean/ErrorEnum.java
  View file @04cdb0e
... ... @@ -19,6 +19,7 @@ public enum ErrorEnum {
19 19 private Integer errorCode;
20 20 private String errorMessage;
21 21  
  22 +
22 23 ErrorEnum(Integer errorCode, String errorMessage) {
23 24 this.errorCode = errorCode;
24 25 this.errorMessage = errorMessage;
... ...
src/main/java/com/cnlive/shenhe/config/MyInterceptor.java
  View file @04cdb0e
... ... @@ -18,11 +18,11 @@ import javax.servlet.http.HttpSession;
18 18 public class MyInterceptor implements HandlerInterceptor {
19 19 @Override
20 20 public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object o) throws Exception {
21   - HttpSession httpSession=httpServletRequest.getSession();
22   - SessionUser sessionUser = (SessionUser)httpSession.getAttribute(SessionUser.getSessionKey());
23   - if(CommonUtils.isNull(sessionUser)){
24   -// httpServletRequest.getRequestDispatcher("/users/login").forward(httpServletRequest, httpServletResponse);
25   - httpServletResponse.sendRedirect("/users/login");
  21 + HttpSession httpSession = httpServletRequest.getSession();
  22 + SessionUser sessionUser = (SessionUser) httpSession.getAttribute(SessionUser.getSessionKey());
  23 + if (CommonUtils.isNull(sessionUser)) {
  24 + // httpServletRequest.getRequestDispatcher("/users/login").forward(httpServletRequest, httpServletResponse);
  25 + httpServletResponse.sendRedirect("/users/login");
26 26 return false;
27 27 }
28 28  
... ...
src/main/java/com/cnlive/shenhe/controller/BootTestController.java 0 → 100644
  View file @04cdb0e
  1 +package com.cnlive.shenhe.controller;
  2 +import com.google.common.collect.Lists;
  3 +
  4 +import com.cnlive.shenhe.entity.BootTest;
  5 +import com.cnlive.shenhe.serviceImpl.BootTestServiceImpl;
  6 +import com.cnlive.shenhe.utils.CommonUtils;
  7 +import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.web.bind.annotation.*;
  9 +
  10 +import java.util.List;
  11 +
  12 +/**
  13 + * @Author: yanzhaowang
  14 + * @Date: 2022/3/4 14:10
  15 + */
  16 +@RestController
  17 +@RequestMapping("/boottest")
  18 +public class BootTestController {
  19 +
  20 + @Autowired
  21 + BootTestServiceImpl bootTestService;
  22 +
  23 + @GetMapping("/testselect/{pagesiaz}/{pageNum}")
  24 + public List<BootTest> selectAll(@RequestParam(defaultValue = "10") @PathVariable(name = "pagesiaz") int pagesiaz, @RequestParam(defaultValue = "1") @PathVariable(name = "pageNum") int pageNum){
  25 + List<BootTest> bootTests = bootTestService.selectAll(pagesiaz, pageNum);
  26 + return bootTests;
  27 + }
  28 + @GetMapping("/testselectid/{BootId}")
  29 + public BootTest selectById(@PathVariable(value = "BootId") String BootId){
  30 + if (BootId != null) {
  31 + BootTest bootTest = bootTestService.selectByid(BootId);
  32 + return bootTest;
  33 + }
  34 + return null;
  35 + }
  36 +
  37 + @RequestMapping("/testaddBoottest")
  38 + public int addBootTest(@RequestBody BootTest bootTest){
  39 + int i = bootTestService.addBootTest(bootTest);
  40 + return i;
  41 + }
  42 +
  43 + @DeleteMapping("/testdeleteBoottest/{bootTestid}")
  44 + public int deleteBootTest(@PathVariable(name = "bootTestid") String bootTestid){
  45 + if (CommonUtils.isNotEmpty(bootTestid)) {
  46 + int i = bootTestService.deleteBootTest(bootTestid);
  47 + return i;
  48 + }
  49 + return 0;
  50 + }
  51 +
  52 + @RequestMapping("/testupdateBoottest")
  53 + public int testupdateBoottest(@RequestBody BootTest bootTest){
  54 + if (bootTest.getId() != null&&bootTest.getAge()!=null&&bootTest.getName()!=null) {
  55 + int i = bootTestService.updateBootTest(bootTest);
  56 + return i;
  57 + }
  58 + return 0;
  59 + }
  60 +}
... ...
src/main/java/com/cnlive/shenhe/controller/CommentsController.java
  View file @04cdb0e
... ... @@ -374,15 +374,21 @@ public class CommentsController extends BaseController {
374 374  
375 375 /*状态需要处理成用户可读*/
376 376 String common_type = "";//评论类型，topic:话题
377   - if (list.get(i).getType().equals(CommonConst.CATEGORY_TOPIC)) {
378   - common_type = "话题";
  377 + String type = list.get(i).getType();
  378 + if (type != null) {
  379 + if (type.equals(CommonConst.CATEGORY_TOPIC)) {
  380 + common_type = "话题";
  381 + }
379 382 } else {
380 383 common_type = "其他";
381 384 }
382 385 cell = row.createCell(6);//列
383 386 cell.setCellValue(common_type);
384 387 cell = row.createCell(7);//列
385   - cell.setCellValue(list.get(i).getLevel());
  388 + Integer level = list.get(i).getLevel();
  389 + if (level != null) {
  390 + cell.setCellValue(level);
  391 + }
386 392 /*状态需要处理成用户可读*/
387 393 String platform = "";//评论所属的平台
388 394 if (list.get(i).getPlatform().equals("a")) {
... ...
src/main/java/com/cnlive/shenhe/controller/VideosController.java
  View file @04cdb0e
... ... @@ -347,13 +347,15 @@ public class VideosController extends BaseController {
347 347 if (spid == 0) {
348 348 videosDTO.setSpid(null);
349 349 }
350   - if (videosDTO.getSp_Id() != null) {
  350 + if (videosDTO.getSp_Id() != null && videosDTO.getSp_Id() != "") {
351 351 videosDTO.setSpid(Integer.valueOf(videosDTO.getSp_Id()));
352 352 }
353 353 List<ShyVideos> shyVideosList = videosService.findByCondition(videosDTO);
354 354 String fileName = "点播数据";
355   - String updater = "";//审核员名字
356   - String state1 = "";//审核状态 1已审核 2审核拒绝 0未审核
  355 + //审核员名字
  356 + String updater = "";
  357 + //审核状态 1已审核 2审核拒绝 0未审核
  358 + String state1 = "";
357 359 XSSFWorkbook wb = new XSSFWorkbook();
358 360 ServletOutputStream out = null;
359 361 BufferedInputStream bis = null;
... ...
src/main/java/com/cnlive/shenhe/entity/BootTest.java 0 → 100644
  View file @04cdb0e
  1 +package com.cnlive.shenhe.entity;
  2 +
  3 +import javax.persistence.*;
  4 +
  5 +@Table(name = "boot_test")
  6 +public class BootTest {
  7 + @Id
  8 + private Integer id;
  9 +
  10 + private String name;
  11 +
  12 + private Integer age;
  13 +
  14 + private String address;
  15 +
  16 + private String hobby;
  17 +
  18 + /**
  19 + * @return id
  20 + */
  21 + public Integer getId() {
  22 + return id;
  23 + }
  24 +
  25 + /**
  26 + * @param id
  27 + */
  28 + public void setId(Integer id) {
  29 + this.id = id;
  30 + }
  31 +
  32 + /**
  33 + * @return name
  34 + */
  35 + public String getName() {
  36 + return name;
  37 + }
  38 +
  39 + /**
  40 + * @param name
  41 + */
  42 + public void setName(String name) {
  43 + this.name = name;
  44 + }
  45 +
  46 + /**
  47 + * @return age
  48 + */
  49 + public Integer getAge() {
  50 + return age;
  51 + }
  52 +
  53 + /**
  54 + * @param age
  55 + */
  56 + public void setAge(Integer age) {
  57 + this.age = age;
  58 + }
  59 +
  60 + /**
  61 + * @return address
  62 + */
  63 + public String getAddress() {
  64 + return address;
  65 + }
  66 +
  67 + /**
  68 + * @param address
  69 + */
  70 + public void setAddress(String address) {
  71 + this.address = address;
  72 + }
  73 +
  74 + /**
  75 + * @return hobby
  76 + */
  77 + public String getHobby() {
  78 + return hobby;
  79 + }
  80 +
  81 + /**
  82 + * @param hobby
  83 + */
  84 + public void setHobby(String hobby) {
  85 + this.hobby = hobby;
  86 + }
  87 +}
0 88 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/mapper/BootTestMapper.java 0 → 100644
  View file @04cdb0e
  1 +package com.cnlive.shenhe.mapper;
  2 +
  3 +import com.cnlive.shenhe.entity.BootTest;
  4 +import tk.mybatis.mapper.common.Mapper;
  5 +
  6 +public interface BootTestMapper extends Mapper<BootTest> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/BootTestServiceImpl.java 0 → 100644
  View file @04cdb0e
  1 +package com.cnlive.shenhe.serviceImpl;
  2 +import com.google.common.collect.Lists;
  3 +
  4 +import com.cnlive.shenhe.entity.BootTest;
  5 +import com.cnlive.shenhe.mapper.BootTestMapper;
  6 +import com.cnlive.shenhe.utils.CommonUtils;
  7 +import com.github.pagehelper.Page;
  8 +import com.github.pagehelper.PageHelper;
  9 +import com.github.pagehelper.PageInfo;
  10 +import org.springframework.beans.factory.annotation.Autowired;
  11 +import org.springframework.stereotype.Service;
  12 +
  13 +import java.util.List;
  14 +
  15 +/**
  16 + * @Author: yanzhaowang
  17 + * @Date: 2022/3/4 13:38
  18 + */
  19 +@Service
  20 +public class BootTestServiceImpl {
  21 +
  22 + @Autowired
  23 + BootTestMapper bootTestMapper;
  24 +
  25 + /**
  26 + *根据主键查询对象
  27 + * @param boottestid
  28 + * @return
  29 + */
  30 + public BootTest selectByid(String boottestid) {
  31 +
  32 + if (CommonUtils.isEmpty(boottestid)) {
  33 + return null;
  34 + }
  35 + BootTest bootTest = bootTestMapper.selectByPrimaryKey(boottestid);
  36 +
  37 + return bootTest;
  38 + }
  39 +
  40 + /**
  41 + * 查询所有的数据
  42 + * @return
  43 + */
  44 + public List<BootTest> selectAll(int pagesaiz, int pagenum){
  45 +// PageInfo pageInfo = new PageInfo();
  46 +// pageInfo.setSize(pagesaiz);
  47 +// pageInfo.setPageNum(pagenum);
  48 +// PageHelper pageHelper = new PageHelper();
  49 + List<BootTest> bootTestList = bootTestMapper.selectAll();
  50 +// pageInfo.setList(bootTestList);
  51 + return bootTestList;
  52 + }
  53 +
  54 + /**
  55 + * 添加一个对象
  56 + * @param bootTest
  57 + * @return
  58 + */
  59 + public int addBootTest(BootTest bootTest) {
  60 + Integer age = bootTest.getAge();
  61 + if (age >= 18 && age <= 60) {
  62 + int i = bootTestMapper.insertSelective(bootTest);
  63 + return i;
  64 + }
  65 + return 0;
  66 + }
  67 +
  68 + /**
  69 + * 根据主键删除一个对象
  70 + * @param boottestid
  71 + * @return
  72 + */
  73 + public int deleteBootTest(String boottestid){
  74 + if (boottestid == null) {
  75 + return 0;
  76 + }
  77 + int i = bootTestMapper.deleteByPrimaryKey(boottestid);
  78 + return i;
  79 + }
  80 +
  81 + /**
  82 + * 根据条件修改对象
  83 + * @return
  84 + */
  85 + public int updateBootTest(BootTest bootTest){
  86 + if (bootTest != null) {
  87 + int i = bootTestMapper.updateByPrimaryKeySelective(bootTest);
  88 + return i;
  89 + }
  90 + return 0;
  91 +
  92 + }
  93 +}
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/CommentsServiceImpl.java
  View file @04cdb0e
... ... @@ -105,9 +105,9 @@ public class CommentsServiceImpl {
105 105 if (CommonUtils.isNotNull(commentsDTO.getComment_user_id())) {
106 106 criteria.andEqualTo("comment_user_id", commentsDTO.getComment_user_id());
107 107 }
108   - if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "0") {
  108 + if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.valueOf(commentsDTO.getType()) == 0) {
109 109 criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
110   - } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "1") {
  110 + } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && Integer.valueOf(commentsDTO.getType()) == 1) {
111 111 criteria.andEqualTo("type", CommonConst.CATEGORY_ELSE);
112 112 }
113 113 if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
... ... @@ -168,9 +168,9 @@ public class CommentsServiceImpl {
168 168 if (CommonUtils.isNotNull(commentsDTO.getIs_hot())) {
169 169 criteria.andEqualTo("is_hot", commentsDTO.getIs_hot());
170 170 }
171   - if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "0") {
  171 + if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType().equals("0")) {
172 172 criteria.andEqualTo("type", CommonConst.CATEGORY_TOPIC);
173   - } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType() == "1") {
  173 + } else if (CommonUtils.isNotEmpty(commentsDTO.getType()) && commentsDTO.getType().equals("0")) {
174 174 criteria.andIsNull("type");
175 175 }
176 176 if (CommonUtils.isNotEmpty(commentsDTO.getActivity_id())) {
... ... @@ -183,14 +183,14 @@ public class CommentsServiceImpl {
183 183 }
184 184 }
185 185  
186   - if (CommonUtils.isNotEmpty(String.valueOf(commentsDTO.getState()))) {
187   - Example.Criteria criteria1 = example.createCriteria();
188   - String[] stas = String.valueOf(commentsDTO.getState()).split(",");
189   - for (String s : stas) {
190   - criteria1.orEqualTo("state", Integer.parseInt(s));
191   - }
192   - example.and(criteria1);
193   - }
  186 + //if (CommonUtils.isNotEmpty(String.valueOf(commentsDTO.getState()))) {
  187 + // Example.Criteria criteria1 = example.createCriteria();
  188 + // String[] stas = String.valueOf(commentsDTO.getState()).split(",");
  189 + // for (String s : stas) {
  190 + // criteria1.orEqualTo("state", Integer.parseInt(s));
  191 + // }
  192 + // example.and(criteria1);
  193 + //}
194 194  
195 195 if (CommonUtils.isNotNull(commentsDTO.getState()) && commentsDTO.getState() != 3) {
196 196 criteria.andEqualTo("state", commentsDTO.getState());
... ...
src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
  View file @04cdb0e
... ... @@ -114,7 +114,7 @@ public class VideosServiceImpl {
114 114 }
115 115  
116 116 public PageInfo<ShyVideos> getListContent(VideosDTO videosDTO) {
117   - logger.info("接受桉树列表为，VideosDTO:{}", JSON.toJSONString(videosDTO));
  117 + logger.info("接受点播列表为，VideosDTO:{}",JSON.toJSONString(videosDTO));
118 118 Example example = new Example(ShyVideos.class);
119 119 Example.Criteria criteria = example.createCriteria();
120 120 Example.Criteria criteria2 = example.createCriteria();
... ...
src/main/resources/application-prod.properties 0 → 100644
  View file @04cdb0e
  1 +server.port=81
  2 +
  3 +#\u91d1\u5c71\u516d\u533a\u6570\u636e\u5e93
  4 +spring.datasource.url=jdbc:mysql://10.137.192.7:3306/new_shy?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
  5 +spring.datasource.username=admin
  6 +spring.datasource.password=83BwiCoq
  7 +
  8 +spring.datasource.driver-class-name=com.mysql.jdbc.Driver
  9 +
  10 +server.tomcat.protocol_header=x-forwarded-proto
  11 +server.use-forward-headers=true
  12 +
  13 +spring.jpa.properties.hibernate.hbm2ddl.auto=update
  14 +spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
  15 +spring.jpa.show-sql= true
  16 +
  17 +server.tomcat.uri-encoding=UTF-8
  18 +spring.http.encoding.charset=UTF-8
  19 +spring.http.encoding.enabled=true
  20 +spring.http.encoding.force=true
  21 +
  22 +
  23 +#\u6253\u5370\u8fd0\u884c\u65f6\u7684sql
  24 +#logging.level.com.cnlive.shenhe.mapper=debug
  25 +
  26 +mybatis.mapper-locations=classpath:mapper/*.xml
  27 +mybatis.type-aliases-package=com.cnlive.shenhe.entity
  28 +
  29 +#rabbitmq\u76f8\u5173\u914d\u7f6e
  30 +spring.rabbitmq.host=10.254.176.11
  31 +spring.rabbitmq.port=5672
  32 +spring.rabbitmq.username=admin
  33 +spring.rabbitmq.password=fA{5Uikx7
  34 +# \u5f00\u542f\u53d1\u9001\u786e\u8ba4
  35 +spring.rabbitmq.publisher-confirms=true
  36 +# \u5f00\u542f\u53d1\u9001\u5931\u8d25\u9000\u56de
  37 +spring.rabbitmq.publisher-returns=true
  38 +# \u5f00\u542fACK
  39 +spring.rabbitmq.listener.direct.acknowledge-mode=manual
  40 +spring.rabbitmq.listener.simple.acknowledge-mode=manual
  41 +
  42 +
  43 +#\u5173\u95edspringboot\u63d0\u4f9b\u7684\u9ed8\u8ba4ico
  44 +spring.mvc.favicon.enabled = false
  45 +
  46 +#\u8bc4\u8bba\u7981\u8a00\u548c\u89e3\u7981\u4f7f\u7528API
  47 +speak_comment=http://comment.cnlive.com/services/commentForTopic/muted
  48 +
  49 +#logback\u65e5\u5fd7\u4e2d\u4f7f\u7528
  50 +spring.application.name=cnlive_shenhe
  51 +spring.application.home=/usr/local/cnlive_shenhe/log
  52 +
  53 +sync_users_api=http://api.cnlive.com/open/api2/inner2/shenhe/getuser
  54 +sync_users_app_key=314a9dd4-a9b7-4c12-bbbe-1150a36491ae
  55 +
  56 +#\u7528\u6237\u4e91\u8bf7\u6c42\u67e5\u8be2\u7528\u6237\u4fe1\u606f
  57 +queryUserByMobile=http://user.api.cnlive.com/CnliveM2/user/readUserByUserName.action?userName=
  58 +queryUserByUserId=http://user.api.cnlive.com/CnliveM2/user/readUserByUid.action?uid=
  59 +
  60 +#\u70b9\u64ad\u4e91\u9700\u8981\u7684\u5e38\u91cf
  61 +url=http://mam.innerapi.cnlive.com/v1/inner/ShenHeInfo/shenheNotify
  62 +platformKey =AUDIT
  63 +platformValue=10011438
  64 +
  65 +#\u672c\u673a\u5730\u5740
  66 +spring.localhost.url=http://shen.cnlive.com
  67 +
  68 +#\u62bd\u5e27\u5e38\u91cf
  69 +avsmple_appKey=1eac30dfbee311e7a2f0fa163e771cf9
  70 +avsmple_appSecret=28ce1e1fbee311e7a2f0fa163e771cf92ea58ebfbee311e7a2f0fa163e771cf9
  71 +avsmple_url=http://transcode.cnlive.com/api/request
  72 +avsmple_callback=http://shen.cnlive.com/api/avsample/callback
  73 +
  74 +#\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f
  75 +live_url=http://bc.cnlive.com/bokong/activity/activityShenHe
  76 +
  77 +#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf
  78 +email_app_id=769_jetja50p18
  79 +email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
  80 +email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
  81 +
  82 +
  83 +qn_bucket=mam-sxzg-82
  84 +qn_domain=http://sxzg.ys2.cnliveimg.com
  85 +ks_bucket=mam-sxzg-82
  86 +ks_domain=http://sxzg.ys1.cnliveimg.com
  87 +
  88 +#\u56fe\u7247\u5b58\u653e\u6839\u8def\u5f84
  89 +desdir=shen
  90 +yiDun_audio_callback=http://shen.cnlive.com/api/audio/callbackAudio
  91 +cms_getVideoAndLiveId=http://cms.cnlive.com:8768/contentApi/getBeanById
0 92 \ No newline at end of file
... ...
src/main/resources/mapper/BootTestMapper.xml 0 → 100644
  View file @04cdb0e
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.cnlive.shenhe.mapper.BootTestMapper">
  4 + <resultMap id="BaseResultMap" type="com.cnlive.shenhe.entity.BootTest">
  5 + <!--
  6 + WARNING - @mbg.generated
  7 + -->
  8 + <id column="id" jdbcType="INTEGER" property="id" />
  9 + <result column="name" jdbcType="VARCHAR" property="name" />
  10 + <result column="age" jdbcType="INTEGER" property="age" />
  11 + <result column="address" jdbcType="VARCHAR" property="address" />
  12 + <result column="hobby" jdbcType="VARCHAR" property="hobby" />
  13 + </resultMap>
  14 +</mapper>
0 15 \ No newline at end of file
... ...
src/main/resources/mapper/ShyAudioMapper.xml
  View file @04cdb0e
... ... @@ -42,4 +42,5 @@
42 42 FROM shy_audio
43 43 where audioId = #{audioId,jdbcType=VARCHAR};
44 44 </select>
  45 +
45 46 </mapper>
46 47 \ No newline at end of file
... ...