h5模板

src/main/java/com/sxtvs/open/api/h5template/controller/H5OperateController.java

@@ -1,5 +1,6 @@
 package com.sxtvs.open.api.h5template.controller;
 
+import com.sxtvs.open.api.h5template.dto.H5OperateParseDTO;
 import com.sxtvs.open.api.h5template.entity.H5Operate;
 import com.sxtvs.open.api.h5template.entity.H5Template;
 import com.sxtvs.open.api.h5template.service.impl.H5OperateServiceImpl;
@@ -16,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -39,8 +41,8 @@ public class H5OperateController {
 
     @RequestMapping("list")
     @LoginRequired
-    public List<H5Operate> ls(){
-        return h5OperateService.list();
+    public List<H5OperateParseDTO> ls(){
+        return h5OperateService.list().stream().map(H5OperateParseDTO::new).collect(Collectors.toList());
     }
 
     @RequestMapping("update")

src/main/java/com/sxtvs/open/api/h5template/controller/H5TemplateController.java

@@ -1,5 +1,6 @@
 package com.sxtvs.open.api.h5template.controller;
 
+import com.sxtvs.open.api.h5template.dto.H5TemplateParseDTO;
 import com.sxtvs.open.api.h5template.entity.H5Template;
 import com.sxtvs.open.api.h5template.service.impl.H5TemplateServiceImpl;
 import com.sxtvs.open.api.h5template.service.impl.OSSService;
@@ -14,6 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -41,8 +43,8 @@ public class H5TemplateController {
 
     @RequestMapping("list")
     @LoginRequired
-    public List<H5Template> ls(){
-        return h5TemplateService.list();
+    public List<H5TemplateParseDTO> ls(){
+        return h5TemplateService.list().stream().map(H5TemplateParseDTO::new).collect(Collectors.toList());
     }
 
     @RequestMapping("update")

src/main/java/com/sxtvs/open/api/h5template/dto/H5OperateParseDTO.java

@@ -0,0 +1,47 @@
+package com.sxtvs.open.api.h5template.dto;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sxtvs.open.api.h5template.entity.H5Operate;
+import com.sxtvs.open.core.advice.BizException;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import java.time.LocalDateTime;
+
+@Data
+public class H5OperateParseDTO {
+    private Long id;
+
+    private String title;
+
+    private String h5Desc;
+
+    private Object hoversList;
+
+    private Integer h5Status;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+
+    private String url;
+
+    private Long templateId;
+
+    private String cover;
+
+    private String type;
+
+    public H5OperateParseDTO(H5Operate h5Operate) {
+
+        BeanUtils.copyProperties(h5Operate, this);
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            this.hoversList = objectMapper.readValue(h5Operate.getHoversList(), Object.class);
+        } catch (JsonProcessingException e) {
+            throw new BizException("json转换失败");
+        }
+
+    }
+}

src/main/java/com/sxtvs/open/api/h5template/dto/H5TemplateParseDTO.java

@@ -0,0 +1,43 @@
+package com.sxtvs.open.api.h5template.dto;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sxtvs.open.api.h5template.entity.H5Template;
+import com.sxtvs.open.core.advice.BizException;
+import lombok.Data;
+import org.springframework.beans.BeanUtils;
+
+import java.time.LocalDateTime;
+
+@Data
+public class H5TemplateParseDTO {
+    private Long id;
+
+    private String title;
+
+    private String h5Desc;
+
+    private Object hoversList;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+
+    private String url;
+
+    private String cover;
+
+    private String type;
+
+    public H5TemplateParseDTO(H5Template h5Template) {
+
+        BeanUtils.copyProperties(h5Template, this);
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            this.hoversList = objectMapper.readValue(h5Template.getHoversList(), Object.class);
+        } catch (JsonProcessingException e) {
+            throw new BizException("json转换失败");
+        }
+
+    }
+}

src/main/java/com/sxtvs/open/api/h5template/entity/H5Operate.java

@@ -26,11 +26,11 @@ public class H5Operate implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    private String h5Name;
+    private String title;
 
     private String h5Desc;
 
-    private String h5Conf;
+    private String hoversList;
 
     private Integer h5Status;
 
@@ -43,4 +43,6 @@ public class H5Operate implements Serializable {
     private Long templateId;
 
     private String cover;
+
+    private String type;
 }

src/main/java/com/sxtvs/open/api/h5template/entity/H5Template.java

@@ -26,11 +26,11 @@ public class H5Template implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-    private String h5Name;
+    private String title;
 
     private String h5Desc;
 
-    private String h5Conf;
+    private String hoversList;
 
     private LocalDateTime createTime;
 
@@ -39,4 +39,6 @@ public class H5Template implements Serializable {
     private String url;
 
     private String cover;
+
+    private String type;
 }