Merge branch 'master' of ssh://1.15.26.233:10022/miaxis/zzjs

# Conflicts:
#	zzjs-service/src/main/java/com/miaxis/teachingVideo/service/impl/TeachingVideoTypeInfoServiceImpl.java

zzjs-admin/src/main/java/com/miaxis/app/controller/teachingVideo/AppletTeachingVideoInfoController.java

@@ -88,7 +88,7 @@ public class AppletTeachingVideoInfoController extends BaseController {
      */
     @GetMapping("/treeList")
     @ApiOperation("查询教学视频分类树形列表")
-    public Response<List<AppletTeachingVideoTypeInfoVo>> treeList(){
-        return videoTypeInfoService.selectAppletTeachingVideoTypeInfoTreeList();
+    public Response<List<AppletTeachingVideoTypeInfoVo>> treeList(Integer[] subjects){
+        return videoTypeInfoService.selectAppletTeachingVideoTypeInfoTreeList(subjects);
     }
 }

zzjs-common/src/main/java/com/miaxis/common/config/WxVerifierConfig.java

@@ -1,20 +1,10 @@
 package com.miaxis.common.config;
 
 import com.miaxis.common.utils.uuid.CommonUtils;
-import com.qcloud.cos.COSClient;
-import com.qcloud.cos.ClientConfig;
-import com.qcloud.cos.auth.BasicCOSCredentials;
-import com.qcloud.cos.auth.COSCredentials;
-import com.qcloud.cos.http.HttpProtocol;
-import com.qcloud.cos.region.Region;
-import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
 import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
 import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;
 import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Credentials;
-import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Validator;
-import org.apache.http.client.HttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;

zzjs-common/src/main/java/com/miaxis/common/core/domain/Response.java

@@ -2,6 +2,10 @@ package com.miaxis.common.core.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
@@ -12,6 +16,10 @@ import java.io.Serializable;
  * @date 2020-11-12
  */
 @ApiModel(description = "结果返回类")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class Response<T> implements Serializable {
     @ApiModelProperty(value = "状态码")
     private Integer code;

zzjs-framework/src/main/java/com/miaxis/framework/config/RedisConfig.java

@@ -3,14 +3,24 @@ package com.miaxis.framework.config;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * redis配置
  * 
@@ -26,18 +36,61 @@ public class RedisConfig extends CachingConfigurerSupport
     {
         RedisTemplate<Object, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(connectionFactory);
+        //序列化实现
+        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+        // 使用StringRedisSerializer来序列化和反序列化redis的key值
+        template.setKeySerializer(stringRedisSerializer);
+        template.setHashKeySerializer(stringRedisSerializer);
+        // hash的value序列化方式采用fastJson
+        template.setValueSerializer(fastJson2JsonRedisSerializer());
+        template.setHashValueSerializer(fastJson2JsonRedisSerializer());
+        template.afterPropertiesSet();
+        return template;
+    }
 
+    /**
+     * fastJson序列化
+     * @return
+     */
+    public RedisSerializer<Object> fastJson2JsonRedisSerializer() {
+        //使用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值
         FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
-
         ObjectMapper mapper = new ObjectMapper();
         mapper.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
         mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
         serializer.setObjectMapper(mapper);
+        return serializer;
+    }
 
-        template.setValueSerializer(serializer);
-        // 使用StringRedisSerializer来序列化和反序列化redis的key值
-        template.setKeySerializer(new StringRedisSerializer());
-        template.afterPropertiesSet();
-        return template;
+
+    @Bean
+    public CacheManager cacheManager(RedisConnectionFactory connectionFactory) {
+
+        //生成一个默认配置，通过config对象即可对缓存进行自定义配置
+        RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig();
+        config = config
+                // 设置 key为string序列化
+                .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
+                // 设置value为json序列化
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(fastJson2JsonRedisSerializer() ))
+                // 不缓存空值
+                .disableCachingNullValues()
+                // 设置缓存的默认过期时间 30分钟
+                .entryTtl(Duration.ofMinutes(30L));
+
+        //特殊缓存空间应用不同的配置
+        Map<String, RedisCacheConfiguration> map = new HashMap<>();
+        map.put("video", config.entryTtl(Duration.ofMinutes(15L)));//provider1缓存空间过期时间 15分钟
+    //    map.put("provider2", config.entryTtl(Duration.ofHours(1L)));//provider2缓存空间过期时间 1小时
+
+        //使用自定义的缓存配置初始化一个RedisCacheManager
+        RedisCacheManager cacheManager = RedisCacheManager.builder(connectionFactory)
+                .cacheDefaults(config) //默认配置
+                .withInitialCacheConfigurations(map) //特殊缓存
+                .transactionAware() //事务
+                .build();
+
+        return cacheManager;
     }
+
 }

zzjs-service/src/main/java/com/miaxis/teachingVideo/domain/TeachingVideoInfo.java

@@ -78,4 +78,10 @@ public class TeachingVideoInfo extends BaseBusinessEntity {
     @TableField("sort")
     @ApiModelProperty(value = "排序")
     private Integer sort;
+
+    @TableField("permission")
+    @ApiModelProperty(value = "排序")
+    private Integer permission;
+
+
 }

zzjs-service/src/main/java/com/miaxis/teachingVideo/domain/TeachingVideoTypeInfo.java

@@ -48,4 +48,8 @@ public class TeachingVideoTypeInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "状态  0：有效(默认)、1：失效 （伪删除）")
     private String status;
 
+    @TableField("subject")
+    @ApiModelProperty(value = "所属科目")
+    private Integer subject;
+
 }

zzjs-service/src/main/java/com/miaxis/teachingVideo/dto/TeachingVideoInfoDto.java

@@ -37,5 +37,8 @@ public class TeachingVideoInfoDto implements Serializable {
     @ApiModelProperty(value = "排序")
     private Integer sort;
 
+    @ApiModelProperty(value = "播放权限 0:正常 1:播放15秒  2:无法播放")
+    private Integer permission;
+
 
 }

zzjs-service/src/main/java/com/miaxis/teachingVideo/dto/TeachingVideoInfoTypeSubjectDto.java

@@ -0,0 +1,24 @@
+package com.miaxis.teachingVideo.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 教学视频对象入参
+ * @author wwl
+ * @version 1.0
+ * @date 2021/7/2 14:25
+ */
+@Data
+@ApiModel(value = "TeachingVideoInfoTypeSubjectDto", description = "教学视频subject对象")
+public class TeachingVideoInfoTypeSubjectDto implements Serializable {
+
+
+    @ApiModelProperty(value = "所属科目")
+    private Integer subject;
+
+
+}

zzjs-service/src/main/java/com/miaxis/teachingVideo/mapper/TeachingVideoTypeInfoMapper.java

@@ -2,6 +2,7 @@ package com.miaxis.teachingVideo.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.teachingVideo.domain.TeachingVideoTypeInfo;
+import com.miaxis.teachingVideo.dto.TeachingVideoInfoTypeSubjectDto;
 import com.miaxis.teachingVideo.vo.AppletTeachingVideoTypeInfoVo;
 import com.miaxis.teachingVideo.vo.TeachingVideoTypeInfoVo;
 
@@ -32,5 +33,5 @@ public interface TeachingVideoTypeInfoMapper extends BaseMapper<TeachingVideoTyp
      * 查询教学视频分类树形列表
      * @return
      */
-    List<AppletTeachingVideoTypeInfoVo> selectAppletTeachingVideoTypeInfoTreeList();
+    List<AppletTeachingVideoTypeInfoVo> selectAppletTeachingVideoTypeInfoTreeList(Integer[] subject);
 }

zzjs-service/src/main/java/com/miaxis/teachingVideo/service/ITeachingVideoTypeInfoService.java

@@ -3,6 +3,7 @@ package com.miaxis.teachingVideo.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.teachingVideo.domain.TeachingVideoTypeInfo;
+import com.miaxis.teachingVideo.dto.TeachingVideoInfoTypeSubjectDto;
 import com.miaxis.teachingVideo.vo.AppletTeachingVideoTypeInfoVo;
 import com.miaxis.teachingVideo.vo.TeachingVideoTypeInfoVo;
 
@@ -33,7 +34,7 @@ public interface ITeachingVideoTypeInfoService extends IService<TeachingVideoTyp
      * 查询教学视频分类树形列表(小程序用)
      * @return
      */
-    Response<List<AppletTeachingVideoTypeInfoVo>> selectAppletTeachingVideoTypeInfoTreeList();
+    Response<List<AppletTeachingVideoTypeInfoVo>> selectAppletTeachingVideoTypeInfoTreeList(Integer[] subjects);
 
     /**
      * 删除教学视频分类（伪删除）

zzjs-service/src/main/java/com/miaxis/teachingVideo/service/impl/TeachingVideoInfoServiceImpl.java

@@ -28,6 +28,7 @@ import com.tencentcloudapi.vod.v20180717.models.ModifyMediaInfoRequest;
 import com.tencentcloudapi.vod.v20180717.models.ModifyMediaInfoResponse;
 import lombok.AllArgsConstructor;
 import org.apache.commons.codec.binary.Base64;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -316,6 +317,7 @@ public class TeachingVideoInfoServiceImpl extends ServiceImpl<TeachingVideoInfoM
     }
 
     @Override
+    @Cacheable(cacheNames="video",key="'getTeachingVideoByTypeId'+#typeId")
     public Response getTeachingVideoByTypeId(Long typeId) {
         return Response.success(teachingVideoInfoMapper.getTeachingVideoByTypeId(typeId));
     }

zzjs-service/src/main/java/com/miaxis/teachingVideo/service/impl/TeachingVideoTypeInfoServiceImpl.java

@@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper;
 import com.miaxis.common.core.domain.Response;
 import com.miaxis.framework.config.RedisConfig;
 import com.miaxis.teachingVideo.domain.TeachingVideoTypeInfo;
+import com.miaxis.teachingVideo.dto.TeachingVideoInfoTypeSubjectDto;
 import com.miaxis.teachingVideo.mapper.TeachingVideoInfoMapper;
 import com.miaxis.teachingVideo.mapper.TeachingVideoTypeInfoMapper;
 import com.miaxis.teachingVideo.service.ITeachingVideoTypeInfoService;
@@ -102,12 +103,11 @@ public class TeachingVideoTypeInfoServiceImpl extends ServiceImpl<TeachingVideoT
      * 查询教学视频分类树形列表
      * @return
      */
-    @Cacheable(cacheNames="video",key="'selectAppletTeachingVideoTypeInfoTreeList'")
+    @Cacheable(cacheNames="video",key="'selectAppletTeachingVideoTypeInfoTreeList'+#subjects")
     @Override
-    public Response<List<AppletTeachingVideoTypeInfoVo>> selectAppletTeachingVideoTypeInfoTreeList() {
+    public Response<List<AppletTeachingVideoTypeInfoVo>> selectAppletTeachingVideoTypeInfoTreeList(Integer[] subjects) {
 
-        List<AppletTeachingVideoTypeInfoVo> list = teachingVideoTypeInfoMapper.selectAppletTeachingVideoTypeInfoTreeList();
-        teachingVideoInfoMapper.selectTeachingVideoInfoListByType();
+        List<AppletTeachingVideoTypeInfoVo> list = teachingVideoTypeInfoMapper.selectAppletTeachingVideoTypeInfoTreeList(subjects);
         for (AppletTeachingVideoTypeInfoVo productTypeInfoVo : list) {
             if(!"0".equals(productTypeInfoVo.getPid())){
                 PageHelper.startPage(1, 4, "sort");

zzjs-service/src/main/java/com/miaxis/teachingVideo/vo/TeachingVideoInfoAppletVo.java

@@ -53,5 +53,8 @@ public class TeachingVideoInfoAppletVo implements Serializable {
     @ApiModelProperty(value = "视频分类pid")
     private Long pid;
 
+    @ApiModelProperty(value = "播放权限 0:正常 1:播放15秒  2:无法播放")
+    private Integer permission;
+
 
 }

zzjs-service/src/main/java/com/miaxis/teachingVideo/vo/TeachingVideoInfoVo.java

@@ -79,4 +79,8 @@ public class TeachingVideoInfoVo extends BaseBusinessEntity {
     @ApiModelProperty(value = "排序")
     private Integer sort;
 
+    @TableField("permission")
+    @ApiModelProperty(value = "播放权限")
+    private Integer permission;
+
 }

zzjs-service/src/main/resources/mapper/teachingVideo/TeachingVideoInfoMapper.xml

@@ -16,6 +16,7 @@
         <result property="videoSize"    column="video_size"    />
         <result property="videoHeight"    column="video_height"    />
         <result property="status"    column="status"    />
+        <result property="permission"    column="permission"    />
         <result property="videoWidth"    column="video_width"    />
         <result property="vodVideoFileId"    column="vod_video_file_id"    />
         <result property="createTime"    column="create_time"    />
@@ -44,7 +45,8 @@
         vi.vod_video_file_id,
         vi.shelf_status,
         vi.status,
-        vi.sort
+        vi.sort,
+        vi.permission
         from teaching_video_info vi
         LEFT JOIN file_info f1 on f1.file_id = vi.file_id
         LEFT JOIN file_info f2 on f2.file_id = vi.cover_file_id
@@ -81,7 +83,8 @@
         vi.vod_video_file_id,
         vi.shelf_status,
         vi.status,
-        vi.sort
+        vi.sort,
+        vi.permission
         from teaching_video_info vi
         LEFT JOIN file_info f1 on f1.file_id = vi.file_id
         LEFT JOIN file_info f2 on f2.file_id = vi.cover_file_id
@@ -144,6 +147,7 @@
             vi.video_describe,
             vi.video_duration,
             vi.video_size,
+            vi.permission,
             vti.pid,
             vi.teaching_video_type_id,
             f1.file_url as fileUrl,

zzjs-service/src/main/resources/mapper/teachingVideo/TeachingVideoTypeInfoMapper.xml

@@ -44,7 +44,7 @@
         ORDER BY type_sort
     </select>
 
-    <select id="selectAppletTeachingVideoTypeInfoTreeList" resultType="com.miaxis.teachingVideo.vo.AppletTeachingVideoTypeInfoVo">
+    <select id="selectAppletTeachingVideoTypeInfoTreeList"  parameterType="Integer"  resultType="com.miaxis.teachingVideo.vo.AppletTeachingVideoTypeInfoVo">
         select
             ti.id,
             ti.type_name,
@@ -54,6 +54,12 @@
             ti.status
         from teaching_video_type_info ti
         where ti.status = 0
+        <if test="array != null and array.length >0">
+            and ti.subject in
+            <foreach collection="array" item="subject" index="index" open="(" close=")" separator=",">
+                #{subject}
+            </foreach>
+        </if>
         ORDER BY type_sort
     </select>