bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/common/enums/CopyrightOwnerTypeEnum.java

@@ -8,8 +8,8 @@ import java.util.stream.Collectors;
  */
 public enum CopyrightOwnerTypeEnum {
 
-    ASSET(1, "视频"),
-    EXHIBITION_BOARD(2, "展板");
+    VIDEO_CONTENT(1, "视频内容"),
+    EXHIBITION_BOARD(2, "展板内容");
     public  String name;
     public static String names;
 

src/main/java/cn/wisenergy/chnmuseum/party/common/mybatis/MysqlGenerator.java

@@ -3,7 +3,7 @@ package cn.wisenergy.chnmuseum.party.common.mybatis;
 public class MysqlGenerator {
 
     private static final String[] tableNames = new String[]{
-            "asset", "video_content", "video_content_cat"
+            "copyright_owner_video_content_cat"
     };
     //        private static final String projectPath = "D:\\develop\\Project\\chnmuseum-party";
     private static final String projectPath = "/opt/ss";

src/main/java/cn/wisenergy/chnmuseum/party/mapper/CopyrightOwnerAssetTypeMapper.java → src/main/java/cn/wisenergy/chnmuseum/party/mapper/CopyrightOwnerVideoContentCatMapper.java

 package cn.wisenergy.chnmuseum.party.mapper;
 
-import cn.wisenergy.chnmuseum.party.model.CopyrightOwnerAssetType;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springframework.stereotype.Repository;
+import cn.wisenergy.chnmuseum.party.model.CopyrightOwnerVideoContentCat;
 
 /**
  * <pre>
@@ -10,9 +9,8 @@ import org.springframework.stereotype.Repository;
  * </pre>
  *
  * @author Danny Lee
- * @since 2021-03-18
+ * @since 2021-04-02
  */
-@Repository
-public interface CopyrightOwnerAssetTypeMapper extends BaseMapper<CopyrightOwnerAssetType> {
+public interface CopyrightOwnerVideoContentCatMapper extends BaseMapper<CopyrightOwnerVideoContentCat> {
 
 }

src/main/java/cn/wisenergy/chnmuseum/party/model/CopyrightOwner.java

@@ -45,7 +45,7 @@ public class CopyrightOwner implements Serializable {
     @NotBlank(message = "版权方名称不能为空", groups = {Add.class, Update.class})
     private String name;
 
-    @ApiModelProperty(value = "版权方类型", allowableValues = "ASSET, EXHIBITION_BOARD")
+    @ApiModelProperty(value = "版权方类型", allowableValues = "VIDEO_CONTENT, EXHIBITION_BOARD")
     @TableField("owner_type")
     @NotBlank(message = "版权方类型不能为空", groups = {Add.class, Update.class})
     private String ownerType;
@@ -72,16 +72,16 @@ public class CopyrightOwner implements Serializable {
     @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
 
-    @ApiModelProperty("视频分类ID集合(详情使用)")
+    @ApiModelProperty("视频内容分类ID集合(详情使用)")
     @TableField(exist = false)
-    private List<String> assetTypeIdList;
+    private List<String> videoContentCatIdList;
 
-    @ApiModelProperty("视频分类名称集合(详情使用)")
+    @ApiModelProperty("视频内容分类名称集合(详情使用)")
     @TableField(exist = false)
-    private List<String> assetTypeNameList;
+    private List<String> videoContentCatNameList;
 
-    @ApiModelProperty("视频分类名称(列表使用)")
+    @ApiModelProperty("视频内容分类名称(列表使用)")
     @TableField(exist = false)
-    private String assetTypeNames;
+    private String videoContentCatNames;
 
 }

src/main/java/cn/wisenergy/chnmuseum/party/model/CopyrightOwnerAssetType.java → src/main/java/cn/wisenergy/chnmuseum/party/model/CopyrightOwnerVideoContentCat.java

@@ -21,7 +21,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author Danny Lee
- * @since 2021-03-23
+ * @since 2021-04-02
  */
 @Data
 @Builder
@@ -29,9 +29,9 @@ import java.io.Serializable;
 @NoArgsConstructor
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
-@TableName("copyright_owner_asset_type")
+@TableName("copyright_owner_video_content_cat")
 @ApiModel(value = "版权方视频分类", description = "版权方视频分类")
-public class CopyrightOwnerAssetType implements Serializable {
+public class CopyrightOwnerVideoContentCat implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -40,14 +40,17 @@ public class CopyrightOwnerAssetType implements Serializable {
     @NotNull(message = "标识ID不能为空", groups = {Update.class})
     private String id;
 
-    @ApiModelProperty("视频版权方ID")
+    @ApiModelProperty("视频内容版权方ID")
     @TableField("copyright_owner_id")
-    @NotBlank(message = "视频版权方ID不能为空", groups = {Add.class, Update.class})
+        @NotBlank(message = "视频内容版权方ID不能为空", groups = {Add.class, Update.class})
         private String copyrightOwnerId;
     
-    @ApiModelProperty("视频分类ID")
-    @TableField("asset_type_id")
-    @NotBlank(message = "视频分类ID不能为空", groups = {Add.class, Update.class})
-    private String assetTypeId;
+    @ApiModelProperty("视频内容分类ID")
+    @TableField("video_content_cat_id")
+        @NotBlank(message = "视频内容分类ID不能为空", groups = {Add.class, Update.class})
+        private String videoContentCatId;
+    
+
+
 
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/CopyrightOwnerAssetTypeService.java → src/main/java/cn/wisenergy/chnmuseum/party/service/CopyrightOwnerVideoContentCatService.java

 package cn.wisenergy.chnmuseum.party.service;
 
-import cn.wisenergy.chnmuseum.party.model.CopyrightOwnerAssetType;
+import cn.wisenergy.chnmuseum.party.model.CopyrightOwnerVideoContentCat;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author Danny Lee
- * @since 2021-03-18
+ * @since 2021-04-02
  */
-public interface CopyrightOwnerAssetTypeService extends IService<CopyrightOwnerAssetType> {
+public interface CopyrightOwnerVideoContentCatService extends IService<CopyrightOwnerVideoContentCat> {
 
 }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/AuditServiceImpl.java

@@ -103,7 +103,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
                 break;
             case ACCOUNT:
                 break;
-            case ASSET:
+            case VIDEO_CONTENT:
                 selectPage = auditMapper.getAssetPage(auditPage, ew);
             default:
         }

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/CopyrightOwnerAssetTypeServiceImpl.java → src/main/java/cn/wisenergy/chnmuseum/party/service/impl/CopyrightOwnerVideoContentCatServiceImpl.java

 package cn.wisenergy.chnmuseum.party.service.impl;
 
-import cn.wisenergy.chnmuseum.party.mapper.CopyrightOwnerAssetTypeMapper;
-import cn.wisenergy.chnmuseum.party.model.CopyrightOwnerAssetType;
-import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerAssetTypeService;
+import cn.wisenergy.chnmuseum.party.mapper.CopyrightOwnerVideoContentCatMapper;
+import cn.wisenergy.chnmuseum.party.model.CopyrightOwnerVideoContentCat;
+import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerVideoContentCatService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -13,11 +13,10 @@ import org.springframework.stereotype.Service;
  * </pre>
  *
  * @author Danny Lee
- * @since 2021-03-18
+ * @since 2021-04-02
  */
 @Slf4j
 @Service
-public class CopyrightOwnerAssetTypeServiceImpl extends ServiceImpl<CopyrightOwnerAssetTypeMapper, CopyrightOwnerAssetType> implements CopyrightOwnerAssetTypeService {
-
+public class CopyrightOwnerVideoContentCatServiceImpl extends ServiceImpl<CopyrightOwnerVideoContentCatMapper, CopyrightOwnerVideoContentCat> implements CopyrightOwnerVideoContentCatService {
 
 }

src/main/resources/mapper/CopyrightOwnerAssetTypeMapper.xml → src/main/resources/mapper/CopyrightOwnerVideoContentCatMapper.xml

 <?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="cn.wisenergy.chnmuseum.party.mapper.CopyrightOwnerAssetTypeMapper">
+<mapper namespace="cn.wisenergy.chnmuseum.party.mapper.CopyrightOwnerVideoContentCatMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.CopyrightOwnerAssetType">
-            <id column="id" property="id" />
-                            <result column="copyright_owner_id" property="copyrightOwnerId" />
-                <result column="asset_type_id" property="assetTypeId" />
+    <resultMap id="BaseResultMap" type="cn.wisenergy.chnmuseum.party.model.CopyrightOwnerVideoContentCat">
+        <id column="id" property="id"/>
+        <result column="copyright_owner_id" property="copyrightOwnerId"/>
+        <result column="video_content_cat_id" property="videoContentCatId"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, copyright_owner_id, asset_type_id
+        id, copyright_owner_id, video_content_cat_id
     </sql>
 
 </mapper>