操作手册

src/main/java/com/qs/serve/modules/sys/controller/SysOperationManualController.java

@@ -6,9 +6,12 @@ import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
+import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.PageUtil;
 import com.qs.serve.common.util.CopierUtil;
 import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.modules.sys.entity.SysAttach;
+import com.qs.serve.modules.sys.service.SysAttachService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -18,6 +21,7 @@ import com.qs.serve.modules.sys.entity.SysOperationManual;
 import com.qs.serve.modules.sys.service.SysOperationManualService;
 
 import javax.validation.Valid;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -32,6 +36,7 @@ import java.util.List;
 public class SysOperationManualController {
 
     private SysOperationManualService sysOperationManualService;
+    private SysAttachService attachService;
 
     /**
      * 列表
@@ -43,8 +48,14 @@ public class SysOperationManualController {
     public R<List<SysOperationManual>> getList(SysOperationManual param){
         SysOperationManual entity = CopierUtil.copy(param,new SysOperationManual());
         LambdaQueryWrapper<SysOperationManual> lqw = new LambdaQueryWrapper<>(entity);
-        PageUtil.startPage();
         List<SysOperationManual> list = sysOperationManualService.list(lqw);
+        list.forEach(sysOperationManual->{
+            if(CollectionUtil.isNotEmpty(sysOperationManual.getAttachIds())){
+                List<String> attachIds = Arrays.asList(sysOperationManual.getAttachIds());
+                List<SysAttach> attachList = attachService.listByIds(attachIds);
+                sysOperationManual.setAttachList(attachList);
+            }
+        });
         return R.ok(list);
     }
 
@@ -60,6 +71,13 @@ public class SysOperationManualController {
         LambdaQueryWrapper<SysOperationManual> lqw = new LambdaQueryWrapper<>(entity);
         PageUtil.startPage();
         List<SysOperationManual> list = sysOperationManualService.list(lqw);
+        list.forEach(sysOperationManual->{
+            if(CollectionUtil.isNotEmpty(sysOperationManual.getAttachIds())){
+                List<String> attachIds = Arrays.asList(sysOperationManual.getAttachIds());
+                List<SysAttach> attachList = attachService.listByIds(attachIds);
+                sysOperationManual.setAttachList(attachList);
+            }
+        });
         return R.byPageHelperList(list);
     }
 
@@ -73,6 +91,11 @@ public class SysOperationManualController {
     //@PreAuthorize("hasRole('sys:operationManual:query')")
     public R<SysOperationManual> getById(@PathVariable("id") String id){
         SysOperationManual sysOperationManual = sysOperationManualService.getById(id);
+        if(CollectionUtil.isNotEmpty(sysOperationManual.getAttachIds())){
+            List<String> attachIds = Arrays.asList(sysOperationManual.getAttachIds());
+            List<SysAttach> attachList = attachService.listByIds(attachIds);
+            sysOperationManual.setAttachList(attachList);
+        }
         return R.ok(sysOperationManual);
     }
 

src/main/java/com/qs/serve/modules/sys/entity/SysOperationManual.java

@@ -4,12 +4,15 @@ import java.time.LocalDate;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
 import lombok.Data;
+import org.apache.ibatis.type.JdbcType;
 import org.hibernate.validator.constraints.Length;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -22,7 +25,7 @@ import javax.validation.constraints.NotBlank;
  * @since 2023-08-11
  */
 @Data
-@TableName("sys_operation_manual")
+@TableName(value = "sys_operation_manual", autoResultMap = true)
 public class SysOperationManual implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -35,24 +38,17 @@ public class SysOperationManual implements Serializable {
     @Length(max = 255,message = "长度不能超过255字")
     private String name;
 
-    /**  */
-    @Length(max = 255,message = "长度不能超过255字")
-    private String url;
+    /** 附件id */
+    @TableField(typeHandler = SplitStringTypeHandler.class,jdbcType= JdbcType.VARCHAR)
+    private String[] attachIds;
+
+    @TableField(exist = false)
+    private List<?> attachList;
 
     /**  */
     @JsonIgnore
     @JsonProperty
     private String delFlag;
 
-
-	public static SysOperationManual toNewObject(SysOperationManual source){
-		SysOperationManual operationManual = new SysOperationManual();
-		operationManual.setId(source.getId());
-		operationManual.setName(source.getName());
-		operationManual.setUrl(source.getUrl());
-		operationManual.setDelFlag(source.getDelFlag());
-		return operationManual;
-	}
-
 }