Browse Source

使用手册模块API更新

Jessica Wong 1 year ago
parent
commit
9f0cd4a60e

+ 5 - 2
.idea/workspace.xml

@@ -5,8 +5,10 @@
   </component>
   </component>
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="视频上传修正">
     <list default="true" id="46b159bd-08ca-42f0-b80f-41d4944a8a29" name="Changes" comment="视频上传修正">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/vo/ManualVO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.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/EmployeeController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/controller/admin/EmployeeController.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" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/om/entity/po/Manual.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/om/entity/po/Manual.java" afterDir="false" />
     </list>
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -24,7 +26,7 @@
     <option name="PUSH_AUTO_UPDATE" value="true" />
     <option name="PUSH_AUTO_UPDATE" value="true" />
     <option name="RECENT_BRANCH_BY_REPOSITORY">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
       <map>
-        <entry key="$PROJECT_DIR$" value="master" />
+        <entry key="$PROJECT_DIR$" value="master-site" />
       </map>
       </map>
     </option>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -147,6 +149,7 @@
     <recent_temporary>
     <recent_temporary>
       <list>
       <list>
         <item itemvalue="Spring Boot.OperationApplication" />
         <item itemvalue="Spring Boot.OperationApplication" />
+        <item itemvalue="应用程序.CodeGenerator" />
         <item itemvalue="npm.dev" />
         <item itemvalue="npm.dev" />
         <item itemvalue="Spring Boot.OperationApplication" />
         <item itemvalue="Spring Boot.OperationApplication" />
         <item itemvalue="npm.dev" />
         <item itemvalue="npm.dev" />

+ 36 - 0
src/main/java/com/om/controller/admin/ManualController.java

@@ -2,12 +2,22 @@ package com.om.controller.admin;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.om.entity.po.Manual;
 import com.om.entity.po.Manual;
+import com.om.entity.vo.ManualVO;
 import com.om.service.IManualService;
 import com.om.service.IManualService;
 import com.om.utils.Result;
 import com.om.utils.Result;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
+import javafx.print.Collation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
 
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+
 /**
 /**
  * <p>
  * <p>
  *  前端控制器
  *  前端控制器
@@ -31,6 +41,32 @@ public class ManualController {
     return Result.succ(manualService.save(manual));
     return Result.succ(manualService.save(manual));
   }
   }
 
 
+  @ApiOperation("新增多版本使用手册接口")
+  @PostMapping("/savemore")
+  public Result<Object> saveMore(@RequestBody ManualVO manualVO) {
+    Collection<Manual> collection = new ArrayList<>();
+    String title = manualVO.getTitle();
+    LocalDateTime createTime = manualVO.getCreateTime();
+    String[] langs = manualVO.getLang();
+    String[] urls = manualVO.getUrl();
+    String[] fileNames = manualVO.getFileName();
+    Arrays.stream(manualVO.getClientCode()).forEach(client -> {
+      for (int i = 1; i < langs.length; i++) {
+        Manual manual = new Manual();
+        manual.setTitle(title);
+        manual.setLang(langs[i]);
+        manual.setFileName(fileNames[i]);
+        manual.setUrl(urls[i]);
+        manual.setClientCode(client);
+        manual.setCreateTime(createTime);
+        manual.setUpdateTime(LocalDateTime.now());
+        collection.add(manual);
+      }
+    });
+
+    return Result.succ(manualService.saveBatch(collection));
+  }
+
   @ApiOperation("编辑使用手册接口")
   @ApiOperation("编辑使用手册接口")
   @PostMapping("/edit")
   @PostMapping("/edit")
   public Result<Object> edit(@RequestBody Manual manual) {
   public Result<Object> edit(@RequestBody Manual manual) {

+ 3 - 0
src/main/java/com/om/entity/po/Guide.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
@@ -50,9 +51,11 @@ public class Guide implements Serializable {
 
 
       @ApiModelProperty("创建时间")
       @ApiModelProperty("创建时间")
       @TableField(value="createTime")
       @TableField(value="createTime")
+      @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
       private LocalDateTime createTime;
       private LocalDateTime createTime;
 
 
       @ApiModelProperty("更新时间")
       @ApiModelProperty("更新时间")
       @TableField(value="updateTime")
       @TableField(value="updateTime")
+      @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
       private LocalDateTime updateTime;
       private LocalDateTime updateTime;
 }
 }

+ 3 - 0
src/main/java/com/om/entity/po/Manual.java

@@ -7,6 +7,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.*;
@@ -51,9 +52,11 @@ public class Manual implements Serializable {
 
 
       @ApiModelProperty("创建时间")
       @ApiModelProperty("创建时间")
       @TableField(value="createTime")
       @TableField(value="createTime")
+      @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
       private LocalDateTime createTime;
       private LocalDateTime createTime;
 
 
       @ApiModelProperty("最近修改时间")
       @ApiModelProperty("最近修改时间")
       @TableField(value="updateTime")
       @TableField(value="updateTime")
+      @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
       private LocalDateTime updateTime;
       private LocalDateTime updateTime;
 }
 }

+ 41 - 0
src/main/java/com/om/entity/vo/ManualVO.java

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