增加master缺失文件，3.11

.idea/workspace.xml

@@ -4,9 +4,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="视频上传修正">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+    <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="合并master，3.11">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/WxscController.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/po/Wxsc.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/vo/WxscVO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/mapper/WxscMapper.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/IWxscService.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/service/impl/WxscServiceImpl.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/resources/mapper/WxscMapper.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/GuideController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/GuideController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/ManualController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/ManualController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -67,7 +75,7 @@
     "SHARE_PROJECT_CONFIGURATION_FILES": "true",
     "Spring Boot.OperationApplication.executor": "Run",
     "WebServerToolWindowFactoryState": "false",
-    "git-widget-placeholder": "master",
+    "git-widget-placeholder": "permission-wxy",
     "ignore.virus.scanning.warn.message": "true",
     "kotlin-language-version-configured": "true",
     "last_opened_file_path": "C:/Users/wxy/IdeasProjects/outsourcing/OperationSystem/pom.xml",
@@ -98,7 +106,11 @@
       <recent name="$PROJECT_DIR$/src/main/java/com/om/mapper" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/screenshots" />
+      <recent name="C:\Users\wxy\IdeasProjects\outsourcing\OperationSystem\src\main\resources\mapper" />
+      <recent name="C:\Users\wxy\IdeasProjects\outsourcing\OperationSystem\src\main\java\com\om\entity\vo" />
+      <recent name="C:\Users\wxy\IdeasProjects\outsourcing\OperationSystem\src\main\java\com\om\service\impl" />
+      <recent name="C:\Users\wxy\IdeasProjects\outsourcing\OperationSystem\src\main\java\com\om\service" />
+      <recent name="C:\Users\wxy\IdeasProjects\outsourcing\OperationSystem\src\main\java\com\om\mapper" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.om.controller.user" />
@@ -321,7 +333,15 @@
       <option name="project" value="LOCAL" />
       <updated>1709604133381</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="合并master，3.11">
+      <option name="closed" value="true" />
+      <created>1710145459857</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1710145459857</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -349,6 +369,7 @@
     <MESSAGE value="refined" />
     <MESSAGE value="使用手册模块更新" />
     <MESSAGE value="视频上传修正" />
-    <option name="LAST_COMMIT_MESSAGE" value="视频上传修正" />
+    <MESSAGE value="合并master，3.11" />
+    <option name="LAST_COMMIT_MESSAGE" value="合并master，3.11" />
   </component>
 </project>

src/main/java/com/om/controller/admin/GuideController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/guide")
-@Api(tags = "手册视频控制类")
+@Api(tags = "使用手册视频管理类")
 public class GuideController {
   IGuideService guideService;
 

src/main/java/com/om/controller/admin/ManualController.java

@@ -5,6 +5,7 @@ import com.om.entity.po.Manual;
 import com.om.entity.vo.ManualVO;
 import com.om.service.IManualService;
 import com.om.utils.Result;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import javafx.print.Collation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,7 @@ import java.util.Iterator;
  */
 @RestController
 @RequestMapping("/manual")
+@Api(tags = "使用手册管理模块")
 public class ManualController {
   private final IManualService manualService;
   @Autowired

src/main/java/com/om/controller/admin/WxscController.java

@@ -0,0 +1,73 @@
+package com.om.controller.admin;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.om.entity.po.Wxsc;
+import com.om.entity.vo.WxscVO;
+import com.om.service.IWxscService;
+import com.om.utils.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author henry-ong
+ * @since 2024-03-09
+ */
+@RestController
+@RequestMapping("/wxsc")
+@Api(tags = "维修手册管理模块")
+public class WxscController {
+  private final IWxscService wxscService;
+
+  @Autowired
+  public WxscController(IWxscService wxscService) {
+    this.wxscService = wxscService;
+  }
+
+  @ApiOperation("新增多版本维修手册接口")
+  @PostMapping("/savemore")
+  public Result<Object> saveMore(@RequestBody WxscVO wxscVO) {
+    Collection<Wxsc> collection = new ArrayList<>();
+    String title = wxscVO.getTitle();
+    LocalDateTime createTime = wxscVO.getCreateTime();
+    String[] langs = wxscVO.getLang();
+    String[] urls = wxscVO.getFileUrl();
+    String[] scNames = wxscVO.getScName();
+    String brandCode = wxscVO.getBrandCode();
+    Arrays.stream(wxscVO.getClientCode()).forEach(client -> {
+      for (int i = 0; i < langs.length; i++) {
+        Wxsc wxsc = new Wxsc();
+        wxsc.setTitle(title);
+        wxsc.setBrandCode(brandCode);
+        wxsc.setLang(langs[i]);
+        wxsc.setScName(scNames[i]);
+        wxsc.setFileUrl(urls[i]);
+        wxsc.setClientCode(client);
+        wxsc.setCreateTime(createTime);
+        wxsc.setUpdateTime(LocalDateTime.now());
+        collection.add(wxsc);
+      }
+    });
+
+    return Result.succ(wxscService.saveBatch(collection));
+  }
+
+  @ApiOperation("分页查询维修手册接口")
+  @GetMapping("/page")
+  public Result<Object> findPage(@RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize,
+                                 @RequestParam(defaultValue = "") String code,
+                                 @RequestParam(defaultValue = "") String title) {
+    return Result.succ(wxscService.findManual(new Page<>(pageNum, pageSize), code, title));
+  }
+}

src/main/java/com/om/entity/po/Wxsc.java

@@ -0,0 +1,67 @@
+package com.om.entity.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author henry-ong
+ * @since 2024-03-09
+ */
+@TableName("wxsc")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "维修手册对象", description = "维修手册对象")
+public class Wxsc implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+      @ApiModelProperty("手册id")
+      @TableId(value = "id", type = IdType.AUTO)
+      private Integer id;
+
+      @ApiModelProperty("标题")
+      private String title;
+
+      @ApiModelProperty("语言")
+      private String lang;
+
+      @ApiModelProperty("维修手册名")
+      @TableField(value="scName")
+      private String scName;
+
+      @ApiModelProperty("文件链接")
+      @TableField(value="fileUrl")
+      private String fileUrl;
+
+      @ApiModelProperty("品牌")
+      @TableField(value="brandCode")
+      private String brandCode;
+
+      @ApiModelProperty("客户端编号")
+      @TableField(value="clientCode")
+      private String clientCode;
+
+      @ApiModelProperty("创建时间")
+      @TableField(value="createTime")
+      @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+      private LocalDateTime createTime;
+
+      @ApiModelProperty("最近修改时间")
+      @TableField(value="updateTime")
+      @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+      private LocalDateTime updateTime;
+}

src/main/java/com/om/entity/vo/WxscVO.java

@@ -0,0 +1,44 @@
+package com.om.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@NoArgsConstructor
+public class WxscVO implements Serializable {
+
+  @ApiModelProperty("标题")
+  private String title;
+
+  @ApiModelProperty("语言")
+  private String[] lang;
+
+  @ApiModelProperty("手册文件名")
+  @TableField(value="scName")
+  private String[] scName;
+
+  @ApiModelProperty("文件网址")
+  private String[] fileUrl;
+
+  @ApiModelProperty("品牌")
+  @TableField(value="brandCode")
+//  private String[] brandCode;
+  private String brandCode;
+
+  @ApiModelProperty("客户端编号")
+  @TableField(value="clientCode")
+  private String[] clientCode;
+
+  @ApiModelProperty("创建时间")
+  @TableField(value="createTime")
+  private LocalDateTime createTime;
+
+  @ApiModelProperty("最近修改时间")
+  @TableField(value="updateTime")
+  private LocalDateTime updateTime;
+}

src/main/java/com/om/mapper/WxscMapper.java

@@ -0,0 +1,18 @@
+package com.om.mapper;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.om.entity.po.Manual;
+import com.om.entity.po.Wxsc;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author henry-ong
+ * @since 2024-03-09
+ */
+public interface WxscMapper extends BaseMapper<Wxsc> {
+  Page<Wxsc> findManual(Page<Wxsc> page, String code, String title);
+}

src/main/java/com/om/service/IWxscService.java

@@ -0,0 +1,18 @@
+package com.om.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.om.entity.po.Wxsc;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author henry-ong
+ * @since 2024-03-09
+ */
+public interface IWxscService extends IService<Wxsc> {
+
+  Page<Wxsc> findManual(Page<Wxsc> objectPage, String code, String title);
+}

src/main/java/com/om/service/impl/WxscServiceImpl.java

@@ -0,0 +1,30 @@
+package com.om.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.om.entity.po.Wxsc;
+import com.om.mapper.WxscMapper;
+import com.om.service.IWxscService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author henry-ong
+ * @since 2024-03-09
+ */
+@Service
+public class WxscServiceImpl extends ServiceImpl<WxscMapper, Wxsc> implements IWxscService {
+  private final WxscMapper wxscMapper;
+
+  public WxscServiceImpl(WxscMapper wxscMapper) {
+    this.wxscMapper = wxscMapper;
+  }
+
+  @Override
+  public Page<Wxsc> findManual(Page<Wxsc> page, String code, String title) {
+    return wxscMapper.findManual(page, code, title);
+  }
+}

src/main/resources/mapper/WxscMapper.xml

@@ -0,0 +1,14 @@
+<?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="com.om.mapper.WxscMapper">
+  <select id="findManual" resultType="com.om.entity.po.Wxsc">
+    select e.*
+    from wxsc as e
+    <if test="code != null and code != ''">
+      where e.clientCode like concat('%',#{code},'%')
+    </if>
+    <if test="title != null and title != ''">
+      where e.title like concat('%',#{title},'%')
+    </if>
+  </select>
+</mapper>