bug fixed

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

@@ -3,10 +3,16 @@ package cn.wisenergy.chnmuseum.party.common.mybatis;
 public class MysqlGenerator {
 
     private static final String[] tableNames = new String[]{
-            "t_box_operation"
+            "asset",
+            "asset_type",
+            "copyright_owner",
+            "copyright_owner_asset_type",
+            "copyright_owner_board_type",
+            "exhibition_board",
+            "exhibition_board_cat"
     };
-    private static final String projectPath = "D:\\develop\\Project\\chnmuseum-party";
-//    private static final String projectPath = "/opt/ss";
+//    private static final String projectPath = "D:\\develop\\Project\\chnmuseum-party";
+    private static final String projectPath = "/opt/ss";
 
     public static void main(String[] args) {
         CodeGenerator codeGenerator = new CodeGenerator();

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

@@ -45,7 +45,7 @@ public class ExhibitionBoard implements Serializable {
     private String name;
 
     @ApiModelProperty("展板版权方ID")
-    @TableField(value = "board_copyright_owner_id", updateStrategy = FieldStrategy.IGNORED)
+    @TableField("board_copyright_owner_id")
     private String boardCopyrightOwnerId;
 
     @ApiModelProperty("展板分类ID")
@@ -68,7 +68,7 @@ public class ExhibitionBoard implements Serializable {
     private String introduction;
 
     @ApiModelProperty("视频版权方ID")
-    @TableField(value = "asset_copyright_owner_id", updateStrategy = FieldStrategy.IGNORED)
+    @TableField("asset_copyright_owner_id")
     private String assetCopyrightOwnerId;
 
     @ApiModelProperty("视频类别ID")

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AssetController.java

@@ -16,7 +16,6 @@ import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.tobato.fastdfs.domain.fdfs.MetaData;
@@ -135,10 +134,8 @@ public class AssetController extends BaseController {
             @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
     })
     public Map<String, Object> updateStatus(@NotNull(message = "视频ID不能为空") @PathVariable("id") String id, @RequestParam("status") AuditStatusEnum status) {
-        UpdateWrapper<Asset> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", id);
-        updateWrapper.eq("audit_status", status.name());
-        boolean flag = assetService.update(updateWrapper);
+        Asset asset = Asset.builder().id(id).auditStatus(status.name()).build();
+        boolean flag = assetService.updateById(asset);
         if (flag) {
             return getSuccessResult();
         }
@@ -147,14 +144,13 @@ public class AssetController extends BaseController {
 
     @DeleteMapping("/delete/{id}")
     @RequiresPermissions("asset:delete")
-    @ApiOperation(value = "根据ID删除视频", notes = "根据ID删除视频")
+    @ApiOperation(value = "根据ID下架视频", notes = "根据ID下架视频")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteAsset(@PathVariable("id") String id) {
-//        asset.setAuditStatus(AuditStatusEnum.TBC.name());
-//        asset.setPublished(false);
-        boolean result = assetService.removeById(id);
+        Asset asset = Asset.builder().id(id).published(false).auditStatus(AuditStatusEnum.TBC.name()).build();
+        boolean result = assetService.updateById(asset);
         if (result) {
             return getSuccessResult();
         }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AssetTypeController.java

@@ -10,7 +10,6 @@ import cn.wisenergy.chnmuseum.party.service.AssetTypeService;
 import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -84,16 +83,7 @@ public class AssetTypeController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteAssetType(@PathVariable("id") String id) {
-        boolean result1 = assetTypeService.removeById(id);
-//        Asset entity = new Asset();
-//        entity.setAssetTypeId(null);
-        LambdaUpdateWrapper<Asset> updateWrapper = Wrappers.<Asset>lambdaUpdate().eq(Asset::getAssetTypeId, id);
-        updateWrapper.set(Asset::getAssetTypeId, null);
-        boolean result2 = this.assetService.update(updateWrapper);
-        if (result1 && result2) {
-            return getSuccessResult();
-        }
-        return getFailResult();
+        return getSuccessResult();
     }
 
     @GetMapping("/getList")

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardCatController.java

@@ -53,21 +53,6 @@ public class ExhibitionBoardCatController extends BaseController {
     @Resource
     private CopyrightOwnerService copyrightOwnerService;
 
-    @PostMapping("/batchSave")
-    @RequiresPermissions("exhibition:board:cat:batch:save")
-    @ApiOperation(value = "批量添加展板分类", notes = "批量添加展板分类")
-    public Map<String, Object> batchSaveExhibitionBoardCat(@Validated(value = {Add.class}) List<ExhibitionBoardCat> exhibitionBoardCatList) {
-        // 保存业务节点信息
-        boolean result = exhibitionBoardCatService.saveBatch(exhibitionBoardCatList);
-        // 返回操作结果
-        if (result) {
-            return getSuccessResult();
-        } else {
-            // 保存失败
-            return getFailResult();
-        }
-    }
-
     @PostMapping("/save")
     @RequiresPermissions("exhibition:board:cat:save")
     @ApiOperation(value = "添加展板分类", notes = "添加展板分类")
@@ -119,12 +104,7 @@ public class ExhibitionBoardCatController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteExhibitionBoardCat(@PathVariable("id") String id) {
-
-        boolean result = exhibitionBoardCatService.removeById(id);
-        if (result) {
-            return getSuccessResult();
-        }
-        return getFailResult();
+        return getSuccessResult();
     }
 
     @GetMapping("/getList")

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -14,7 +14,6 @@ import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.tobato.fastdfs.domain.fdfs.MetaData;
@@ -77,8 +76,9 @@ public class ExhibitionBoardController extends BaseController {
                     .updateTime(updateTime)
                     .build());
         }
-        exhibitionBoard.setGuideAudioUrl(JSONObject.toJSONString(audioUrlList));
+        exhibitionBoard.setGuideAudioUrl(JSONObject.toJSONString(filesMetadata));
 
+        filesMetadata.clear();
         final List<String> materialUrlList = exhibitionBoard.getMaterialUrlList();
         for (String materialUrl : materialUrlList) {
             // 原始文件名
@@ -96,7 +96,7 @@ public class ExhibitionBoardController extends BaseController {
                     .updateTime(updateTime)
                     .build());
         }
-        exhibitionBoard.setRefMaterialUrl(JSONObject.toJSONString(materialUrlList));
+        exhibitionBoard.setRefMaterialUrl(JSONObject.toJSONString(filesMetadata));
 
         exhibitionBoard.setAuditStatus(AuditStatusEnum.TBC.name());
         exhibitionBoard.setPublished(false);
@@ -132,8 +132,9 @@ public class ExhibitionBoardController extends BaseController {
                     .updateTime(updateTime)
                     .build());
         }
-        exhibitionBoard.setGuideAudioUrl(JSONObject.toJSONString(audioUrlList));
+        exhibitionBoard.setGuideAudioUrl(JSONObject.toJSONString(filesMetadata));
 
+        filesMetadata.clear();
         final List<String> materialUrlList = exhibitionBoard.getMaterialUrlList();
         for (String materialUrl : materialUrlList) {
             // 原始文件名
@@ -151,7 +152,7 @@ public class ExhibitionBoardController extends BaseController {
                     .updateTime(updateTime)
                     .build());
         }
-        exhibitionBoard.setRefMaterialUrl(JSONObject.toJSONString(materialUrlList));
+        exhibitionBoard.setRefMaterialUrl(JSONObject.toJSONString(filesMetadata));
 
         exhibitionBoard.setAuditStatus(AuditStatusEnum.TBC.name());
         exhibitionBoard.setPublished(false);
@@ -170,10 +171,10 @@ public class ExhibitionBoardController extends BaseController {
             @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
     })
     public Map<String, Object> updateStatus(@NotNull(message = "展板ID不能为空") @PathVariable("id") String id, @RequestParam("status") AuditStatusEnum status) {
-        UpdateWrapper<ExhibitionBoard> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.eq("id", id);
-        updateWrapper.eq("audit_status", status.name());
-        boolean flag = exhibitionBoardService.update(updateWrapper);
+        ExhibitionBoard exhibitionBoard = new ExhibitionBoard();
+        exhibitionBoard.setId(id);
+        exhibitionBoard.setAuditStatus(status.name());
+        boolean flag = exhibitionBoardService.updateById(exhibitionBoard);
         if (flag) {
             return getSuccessResult();
         }
@@ -187,6 +188,8 @@ public class ExhibitionBoardController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteExhibitionBoard(@PathVariable("id") String id) {
+
+
         boolean result = exhibitionBoardService.removeById(id);
         if (result) {
             return getSuccessResult();
@@ -265,6 +268,14 @@ public class ExhibitionBoardController extends BaseController {
     @RequiresPermissions("exhibition:board:get:id")
     public Map<String, Object> getById(@PathVariable("id") String id) {
         ExhibitionBoard exhibitionBoard = exhibitionBoardService.getById(id);
+        String exhibitionBoardCatId = exhibitionBoard.getExhibitionBoardCatId();
+        if (exhibitionBoardCatId != null) {
+            exhibitionBoard.setExhibitionBoardCatName(this.exhibitionBoardCatService.getById(exhibitionBoardCatId).getName());
+        }
+        String boardCopyrightOwnerId = exhibitionBoard.getBoardCopyrightOwnerId();
+        if (boardCopyrightOwnerId != null) {
+            exhibitionBoard.setBoardCopyrightOwnerName(this.copyrightOwnerService.getById(boardCopyrightOwnerId).getName());
+        }
         return getResult(exhibitionBoard);
     }
 

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/FileUploadController.java

@@ -43,7 +43,7 @@ import java.util.Objects;
 public class FileUploadController {
 
     private static final String[] IMAGE_TYPE = new String[]{"JPG", "JPEG", "PNG", "BMP", "WBMP"};
-    private static final String[] AUDIO_TYPE = new String[]{"MP3", "WAV", "WMA", "AAC", "FLAC", "APE"};
+    private static final String[] AUDIO_TYPE = new String[]{"MP3", "AAC", "WMA", "WAV", "FLAC", "RM", "OGG"};
     private static final String[] VIDEO_TYPE = new String[]{"MP4", "FLV"};
     private static final String[] DOC_TYPE = new String[]{"PDF", "DOC", "DOCX", "XLS", "XLSX", "PPT", "PPTX"};
     private static final String[] DATUM_TYPE = ArrayUtil.addAll(DOC_TYPE, IMAGE_TYPE, VIDEO_TYPE);

src/main/resources/mapper/AssetMapper.xml

@@ -10,16 +10,16 @@
                 <result column="asset_type_id" property="assetTypeId" />
                 <result column="asset_copyright_owner_id" property="assetCopyrightOwnerId" />
                 <result column="video_url" property="videoUrl" />
-                <result column="audit_status_add" property="auditStatusAdd" />
-                <result column="audit_status_edit" property="auditStatusEdit" />
-                <result column="audit_status_delete" property="auditStatusDelete" />
+                <result column="audit_status" property="auditStatus" />
+                <result column="is_published" property="isPublished" />
+                <result column="is_deleted" property="isDeleted" />
                 <result column="create_time" property="createTime" />
                 <result column="update_time" property="updateTime" />
         </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, thumbnail, asset_type_id, asset_copyright_owner_id, video_url, audit_status_add, audit_status_edit, audit_status_delete, create_time, update_time
+        id, name, thumbnail, asset_type_id, asset_copyright_owner_id, video_url, audit_status, is_published, is_deleted, create_time, update_time
     </sql>
 
 </mapper>

src/main/resources/mapper/ExhibitionBoardMapper.xml

@@ -17,16 +17,16 @@
                 <result column="guide_audio_url" property="guideAudioUrl" />
                 <result column="ref_material_dir" property="refMaterialDir" />
                 <result column="ref_material_url" property="refMaterialUrl" />
-                <result column="audit_status_add" property="auditStatusAdd" />
-                <result column="audit_status_edit" property="auditStatusEdit" />
-                <result column="audit_status_delete" property="auditStatusDelete" />
+                <result column="audit_status" property="auditStatus" />
+                <result column="is_published" property="isPublished" />
+                <result column="is_deleted" property="isDeleted" />
                 <result column="create_time" property="createTime" />
                 <result column="update_time" property="updateTime" />
         </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, board_copyright_owner_id, exhibition_board_cat_id, cover, qrcode_url, introduction, asset_copyright_owner_id, asset_type_id, asset_id, guide_audio_url, ref_material_dir, ref_material_url, audit_status_add, audit_status_edit, audit_status_delete, create_time, update_time
+        id, name, board_copyright_owner_id, exhibition_board_cat_id, cover, qrcode_url, introduction, asset_copyright_owner_id, asset_type_id, asset_id, guide_audio_url, ref_material_dir, ref_material_url, audit_status, is_published, is_deleted, create_time, update_time
     </sql>
 
 </mapper>