bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/common/log/SystemOperationLogService.java

@@ -15,11 +15,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authc.AuthenticationException;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
 import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -83,10 +82,9 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
      *
      * @param point
      * @return
-     * @throws Throwable
      */
-    @Around("methodCachePointcut()")
-    public Object around(ProceedingJoinPoint point) throws Throwable {
+    @Before("methodCachePointcut()")
+    public Object doBefore(JoinPoint point) {
         HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         MethodLog methodLog = getAnnotationLog(point);
         String ip = getIp(request);
@@ -107,19 +105,17 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
                 return getFailResult();
             }
         }
-        Object[] method_param;
-        Object object = point.proceed();
-        method_param = point.getArgs(); //获取方法参数
+        Object[] method_param = point.getArgs(); //获取方法参数;
         if (OperModule.STBOPERATION.getMsg().equals(methodLog.operModule().getMsg())) {
             TOperationLog operationLog = new TOperationLog();
             operationLog.setCreateTime(LocalDateTime.now());
             operationLog.setUserId(user.getId());
-            if (user.getAreaName()!=null) {
+            if (user.getAreaName() != null) {
                 operationLog.setArea(user.getAreaName());
             }
             operationLog.setOperationType(methodLog.operType().getMsg());
             operationLogService.save(operationLog);
-            return object;
+            return method_param;
         }
         SysLog sysLog = new SysLog();
         // todo null
@@ -135,7 +131,7 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
         // 处理设置注解上的参数
         getControllerMethodDescription(user, methodLog, sysLog, method_param);
         sysLogMapper.insert(sysLog);
-        return object;
+        return method_param;
     }
 
     /**
@@ -143,26 +139,24 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
      *
      * @param sysLog 日志
      * @param
-     * @throws Exception
      */
-    public void getControllerMethodDescription(TUser user, MethodLog methodLog, SysLog sysLog, Object[] method_param) throws Exception {
+    public void getControllerMethodDescription(TUser user, MethodLog methodLog, SysLog sysLog, Object[] method_param) {
         // 设置action动作
         sysLog.setOperationType(methodLog.operType().getMsg());
         sysLog.setOperationContent(methodLog.operType().getMsg());
         sysLog.setOperationObject(methodLog.operModule().getMsg());
         //判断是哪个页面调的用户接口，返回不同日志操作对象
-        if (methodLog.operModule().getCode() == OperModule.USER.getCode()) {
-            TUser u = null;
-            String type = null;
-            if (methodLog.operType().getCode() == OperType.ADD.getCode() || methodLog.operType().getCode() == OperType.UPDATE.getCode()) {
+        if (methodLog.operModule().getCode().equals(OperModule.USER.getCode())) {
+            TUser u;
+            String type;
+            if (methodLog.operType().getCode().equals(OperType.ADD.getCode()) || methodLog.operType().getCode().equals(OperType.UPDATE.getCode())) {
                 u = (TUser) method_param[0];
                 type = u.getType();
-            } else if (methodLog.operType().getCode() == OperType.CHANGE_PASSWORD.getCode()) {
+            } else if (methodLog.operType().getCode().equals(OperType.CHANGE_PASSWORD.getCode())) {
                 u = user;
                 type = u.getType();
-            } else if (methodLog.operType().getCode() == OperType.SELECT.getCode()) {
-                String s = (String) method_param[0];
-                type = s;
+            } else if (methodLog.operType().getCode().equals(OperType.SELECT.getCode())) {
+                type = (String) method_param[0];
             } else {
                 String s = (String) method_param[0];
                 u = userService.getById(s);
@@ -188,10 +182,10 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
             }
         }
         //判断是哪个页面调的审核接口，返回不同日志操作对象
-        else if (methodLog.operModule().getCode() == OperModule.CHECKVIDEO.getCode()) {
+        else if (methodLog.operModule().getCode().equals(OperModule.CHECKVIDEO.getCode())) {
             String type = null;
-            String status = null;
-            if (methodLog.operType().getCode() == OperType.AUDIT.getCode()) {
+            String status;
+            if (methodLog.operType().getCode().equals(OperType.AUDIT.getCode())) {
                 AuditStatusParam auditStatusParam = (AuditStatusParam) method_param[0];
                 Audit byId = auditService.getById(auditStatusParam.getId());
                 type = byId.getType();
@@ -201,9 +195,9 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
                 } else {
                     sysLog.setOperationContent(AuditStatusEnum.APPROVED_FINAL.getMsg());
                 }
-            } else if (methodLog.operType().getCode() == OperType.DETAILS.getCode()) {
+            } else if (methodLog.operType().getCode().equals(OperType.DETAILS.getCode())) {
                 type = (String) method_param[1];
-            } else if (methodLog.operType().getCode() == OperType.SELECT.getCode()) {
+            } else if (methodLog.operType().getCode().equals(OperType.SELECT.getCode())) {
                 type = (String) method_param[2];
             }
             if (AuditTypeEnum.EXHIBITION_BOARD.name().equals(type)) {
@@ -213,21 +207,21 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
             } else if (AuditTypeEnum.VIDEO_CONTENT.name().equals(type)) {
                 sysLog.setOperationObject(OperModule.CHECKVIDEO.getMsg());
             }
-        } else if (methodLog.operModule().getCode() == OperModule.STBOPERATION.getCode() && methodLog.operType().getCode() == OperType.ACTIVATION.getCode()) {
+        } else if (methodLog.operModule().getCode().equals(OperModule.STBOPERATION.getCode()) && methodLog.operType().getCode().equals(OperType.ACTIVATION.getCode())) {
             TBoxOperation o = (TBoxOperation) method_param[0];
             if (o.getStatus() == 2) {
                 sysLog.setOperationType(OperType.ACTIVATION.getMsg());
             } else {
                 sysLog.setOperationType(OperType.FAULT.getMsg());
             }
-        } else if (methodLog.operModule().getCode() == OperModule.LEARNCONTENT.getCode() && methodLog.operType().getCode() == OperType.ENABLE.getCode()) {
+        } else if (methodLog.operModule().getCode().equals(OperModule.LEARNCONTENT.getCode()) && methodLog.operType().getCode().equals(OperType.ENABLE.getCode())) {
             Boolean o = (Boolean) method_param[1];
             if (o) {
                 sysLog.setOperationType(OperType.ENABLE.getMsg());
             } else {
                 sysLog.setOperationType(OperType.DISABLE.getMsg());
             }
-        } else if (methodLog.operModule().getCode() == OperModule.DISPLAYCONTENT.getCode() && methodLog.operType().getCode() == OperType.UPDATE.getCode()) {
+        } else if (methodLog.operModule().getCode().equals(OperModule.DISPLAYCONTENT.getCode()) && methodLog.operType().getCode().equals(OperType.UPDATE.getCode())) {
             Boolean o = (Boolean) method_param[1];
             if (o) {
                 sysLog.setOperationType(OperType.UPDATE.getMsg());
@@ -235,7 +229,7 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
                 sysLog.setOperationType(OperType.LOWER.getMsg());
             }
 
-        } else if (methodLog.operModule().getCode() == OperModule.VIDEOCOPYRIGHT.getCode()) {
+        } else if (methodLog.operModule().getCode().equals(OperModule.VIDEOCOPYRIGHT.getCode())) {
             GenericPageParam g = (GenericPageParam) method_param[0];
             if (VIDEO_CONTENT.name().equals(g.getOwnerType())) {
                 sysLog.setOperationObject(OperModule.VIDEOCOPYRIGHT.getMsg());
@@ -243,21 +237,21 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
                 sysLog.setOperationObject(OperModule.DISPLAYCOPYRIGHT.getMsg());
             }
 
-        } else if (methodLog.operModule().getCode() == OperModule.DISPLAYCOPYRIGHT.getCode()) {
-            CopyrightOwner c = null;
+        } else if (methodLog.operModule().getCode().equals(OperModule.DISPLAYCOPYRIGHT.getCode())) {
+            CopyrightOwner c;
             String type = null;
-            if (methodLog.operType().getCode() == OperType.ADD.getCode() || methodLog.operType().getCode() == OperType.UPDATE.getCode()) {
+            if (methodLog.operType().getCode().equals(OperType.ADD.getCode()) || methodLog.operType().getCode().equals(OperType.UPDATE.getCode())) {
                 c = (CopyrightOwner) method_param[0];
                 type = c.getOwnerType();
-            } else if (methodLog.operType().getCode() == OperType.DETAILS.getCode() || methodLog.operType().getCode() == OperType.DELETE.getCode()) {
+            } else if (methodLog.operType().getCode().equals(OperType.DETAILS.getCode()) || methodLog.operType().getCode().equals(OperType.DELETE.getCode())) {
                 String id = (String) method_param[0];
                 CopyrightOwner byId = copyrightOwnerService.getById(id);
                 type = byId.getOwnerType();
-            } else if (methodLog.operType().getCode() == OperType.SELECT.getCode()) {
+            } else if (methodLog.operType().getCode().equals(OperType.SELECT.getCode())) {
                 CopyrightOwnerTypeEnum s = (CopyrightOwnerTypeEnum) method_param[0];
                 type = s.name();
             }
-            switch (type) {
+            switch (Objects.requireNonNull(type)) {
                 case "EXHIBITION_BOARD":
                     // 设置标题
                     sysLog.setOperationObject(OperModule.DISPLAYCOPYRIGHT.getMsg());
@@ -273,7 +267,7 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
     /**
      * 是否存在注解，如果存在就获取
      */
-    private MethodLog getAnnotationLog(JoinPoint joinPoint) throws Exception {
+    private MethodLog getAnnotationLog(JoinPoint joinPoint) {
         Signature signature = joinPoint.getSignature();
         MethodSignature methodSignature = (MethodSignature) signature;
         Method method = methodSignature.getMethod();
@@ -297,7 +291,7 @@ public class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog>
      * @param
      */
     @AfterThrowing("methodCachePointcut()")
-    public void afterThrowing(JoinPoint point) throws Throwable {
+    public void afterThrowing(JoinPoint point) {
 
     }
 

src/main/java/cn/wisenergy/chnmuseum/party/mapper/AssetMapper.java

@@ -25,7 +25,6 @@ public interface AssetMapper extends BaseMapper<Asset> {
             "and vc.video_content_cat_id = vcc.id " +
             "and vc.video_content_copyright_owner_id = co.id " +
             "and vc.is_published = 1 and vc.is_deleted = 0 " +
-            "and co.is_deleted = 0 and vcc.is_deleted = 0 " +
             "<![CDATA[and co.expire_date_start <= DATE_FORMAT(now(), '%Y-%m-%d') ]]>" +
             "<![CDATA[and co.expire_date_end >= DATE_FORMAT(now(), '%Y-%m-%d') ]]>" +
             "<if test='videoContentCatId != null'>and vcc.id = #{videoContentCatId} </if>" +

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

@@ -67,11 +67,6 @@ public class CopyrightOwner implements Serializable {
     @Length(min = 0, max = 100, message = "备注的字数超过最大限制100")
     private String remarks;
 
-    @ApiModelProperty("是否已删除")
-    @TableField("is_deleted")
-    @TableLogic
-    private Boolean deleted;
-
     @ApiModelProperty("创建日期")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
     private LocalDateTime createTime;

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

@@ -54,11 +54,6 @@ public class VideoContentCat implements Serializable {
     @Length(min = 0, max = 100, message = "备注的字数超过最大限制100")
     private String remarks;
 
-    @ApiModelProperty("是否已删除")
-    @TableField("is_deleted")
-    @TableLogic
-    private Boolean deleted;
-
     @ApiModelProperty("创建日期")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
     private LocalDateTime createTime;

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

@@ -66,6 +66,9 @@ public class CopyrightOwnerController extends BaseController {
     @Resource
     private ExhibitionBoardService exhibitionBoardService;
 
+    @Resource
+    private LearningContentCopyrightOwnerService learningContentCopyrightOwnerService;
+
     @PostMapping("/save")
     @RequiresAuthentication  //@RequiresPermissions("copyright:owner:save")
     @ApiOperation(value = "添加版权方", notes = "添加版权方")
@@ -299,6 +302,9 @@ public class CopyrightOwnerController extends BaseController {
         LambdaUpdateWrapper<CopyrightOwnerVideoContentCat> deleteWrapper1 = Wrappers.<CopyrightOwnerVideoContentCat>lambdaUpdate().eq(CopyrightOwnerVideoContentCat::getCopyrightOwnerId, id);
         this.copyrightOwnerVideoContentCatService.remove(deleteWrapper1);
 
+        LambdaUpdateWrapper<LearningContentCopyrightOwner> deleteWrapper2 = Wrappers.<LearningContentCopyrightOwner>lambdaUpdate().eq(LearningContentCopyrightOwner::getCopyrightOwnerId, id);
+        this.learningContentCopyrightOwnerService.remove(deleteWrapper2);
+
         return getSuccessResult();
     }
 

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

@@ -192,7 +192,7 @@ public class ExhibitionBoardCatController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:cat:delete")
     @ApiOperation(value = "根据ID删除展板分类", notes = "根据ID删除展板分类")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
+            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String", required = true)
     })
     @MethodLog(operModule = OperModule.DISPLAYCLASSIFY, operType = OperType.DELETE)
     public Map<String, Object> deleteExhibitionBoardCat(@PathVariable("id") String id) {

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

@@ -75,17 +75,6 @@ public class LearningProjectController extends BaseController {
         return getFailResult();
     }
 
-    @DeleteMapping("/delete/{id}")
-    @RequiresAuthentication  //@RequiresPermissions("learning:project:delete")
-    @ApiOperation(value = "根据ID下架学习项目", notes = "根据ID下架学习项目")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
-    })
-    @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.DELETE)
-    public Map<String, Object> deleteLearningProject(@PathVariable("id") String id) {
-        return getSuccessResult();
-    }
-
     @GetMapping("/getList")
     @RequiresAuthentication  //@RequiresPermissions("learning:project:list")
     @ApiOperation(value = "获取全部列表(无分页)", notes = "获取全部列表(无分页)")
@@ -139,7 +128,7 @@ public class LearningProjectController extends BaseController {
 
     @ApiOperation(value = "获取详情", notes = "获取详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path")
+            @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path", required = true)
     })
     @GetMapping("/get/{id}")
     @RequiresAuthentication  //@RequiresPermissions("learning:project:get:id")
@@ -149,5 +138,17 @@ public class LearningProjectController extends BaseController {
         return getResult(learningProject);
     }
 
+    @DeleteMapping("/delete/{id}")
+    @RequiresAuthentication  //@RequiresPermissions("learning:project:delete")
+    @ApiOperation(value = "根据ID下架学习项目", notes = "根据ID下架学习项目")
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String", required = true)
+    })
+    @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.DELETE)
+    public Map<String, Object> deleteLearningProject(@PathVariable("id") String id) {
+        this.learningProjectService.removeById(id);
+        return getSuccessResult();
+    }
+
 }
 

src/main/resources/mapper/CopyrightOwnerMapper.xml

@@ -10,14 +10,13 @@
         <result column="expire_date_start" property="expireDateStart"/>
         <result column="expire_date_end" property="expireDateEnd"/>
         <result column="remarks" property="remarks"/>
-        <result column="is_deleted" property="deleted"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, owner_type, expire_date_start, expire_date_end, remarks, is_deleted, create_time, update_time
+        id, name, owner_type, expire_date_start, expire_date_end, remarks, create_time, update_time
     </sql>
 
 </mapper>

src/main/resources/mapper/VideoContentCatMapper.xml

@@ -8,14 +8,13 @@
         <result column="name" property="name"/>
         <result column="copyright_owner_id" property="copyrightOwnerId"/>
         <result column="remarks" property="remarks"/>
-        <result column="is_deleted" property="deleted"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, copyright_owner_id, remarks, is_deleted, create_time, update_time
+        id, name, copyright_owner_id, remarks, create_time, update_time
     </sql>
 
 </mapper>