场景预览图片上传

src/main/java/com/yeejoin/amos/api/tool/controller/AmosToolTemplateController.java

@@ -2,6 +2,8 @@ package com.yeejoin.amos.api.tool.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.api.tool.face.model.AmosToolTemplateModel;
+import com.yeejoin.amos.api.tool.face.model.AmosToolTemplateVoModel;
+import com.yeejoin.amos.api.tool.face.model.TemplateVoModel;
 import com.yeejoin.amos.api.tool.face.service.AmosToolTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,9 +33,8 @@ public class AmosToolTemplateController {
     @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
     @PostMapping("/save")
     @ApiOperation(value = "新增", notes = "新增")
-    public ResponseModel<AmosToolTemplateModel> create(@RequestBody AmosToolTemplateModel model) {
-        model = amosToolTemplateService.createWithModel(model);
-        return ResponseHelper.buildResponse(model);
+    public ResponseModel<AmosToolTemplateModel> create(@RequestBody AmosToolTemplateVoModel amosToolTplVoModel) throws NoSuchFieldException, IllegalAccessException {
+        return ResponseHelper.buildResponse(amosToolTemplateService.createWithModel(amosToolTemplateService.convertModel(amosToolTplVoModel)));
     }
 
     /**
@@ -63,10 +64,10 @@ public class AmosToolTemplateController {
     @ApiOperation(value = "编辑")
     @RequestMapping(value = "/{sequenceNbr}", method = RequestMethod.PUT)
     public ResponseModel<AmosToolTemplateModel> update(
-            @RequestBody AmosToolTemplateModel model,
-            @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        model.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(amosToolTemplateService.updateWithModel(model));
+            @RequestBody AmosToolTemplateVoModel amosToolTplVoModel,
+            @PathVariable(value = "sequenceNbr") Long sequenceNbr) throws NoSuchFieldException, IllegalAccessException {
+        amosToolTplVoModel.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(amosToolTemplateService.updateWithModel(amosToolTemplateService.convertModel(amosToolTplVoModel)));
     }
 
     /**
@@ -75,10 +76,11 @@ public class AmosToolTemplateController {
     @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
     @ApiOperation(value = "查询单个对象")
     @RequestMapping(value = "/{sequenceNbr}", method = RequestMethod.GET)
-    public ResponseModel<AmosToolTemplateModel> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(amosToolTemplateService.queryBySeq(sequenceNbr));
+    public ResponseModel<AmosToolTemplateVoModel> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(amosToolTemplateService.queryForTplVo(sequenceNbr));
     }
 
+
     /**
      * 根据字段查询
      */

src/main/java/com/yeejoin/amos/api/tool/face/model/AmosToolTemplateModel.java

 package com.yeejoin.amos.api.tool.face.model;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.typroject.tyboot.core.rdbms.model.BaseModel;
@@ -18,6 +19,11 @@ public class AmosToolTemplateModel extends BaseModel {
      */
     private String categoryScene;
     /**
+     * 效果图
+     */
+    @ApiModelProperty(value = "效果图")
+    protected String sketch;
+    /**
      * 所属机构
      */
     private String agencyName;
@@ -33,4 +39,8 @@ public class AmosToolTemplateModel extends BaseModel {
      * 是否删除
      */
     private Boolean isDelete;
+
+    public void setSketch(String sketch) {
+        this.sketch = sketch;
+    }
 }

src/main/java/com/yeejoin/amos/api/tool/face/model/AmosToolTemplateVoModel.java

+package com.yeejoin.amos.api.tool.face.model;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@JsonIgnoreProperties({"hibernateLazyInitializer","handler"})
+public class AmosToolTemplateVoModel extends AmosToolTemplateModel {
+
+    /**
+     * 模板名称
+     */
+    private String templateName;
+    /**
+     * 场景类型
+     */
+    private String categoryScene;
+    /**
+     * 效果图
+     */
+    @ApiModelProperty(value = "效果图")
+    protected String sketch;
+    /**
+     * 所属机构
+     */
+    private String agencyName;
+
+    /**
+     * 模板URL
+     */
+    private String templateLink;
+
+    @ApiModelProperty(value = "效果图")
+    private List<PictureModel> sketches = new ArrayList<>();
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/AmosToolTemplate.java

@@ -25,6 +25,11 @@ public class AmosToolTemplate extends BaseEntity {
     @TableField("CATEGORY_SCENE")
     private String categoryScene;
     /**
+     *效果图
+     */
+    @TableField("SKETCH")
+    private String sketch;
+    /**
      * 所属机构
      */
     @TableField("AGENCY_NAME")

src/main/java/com/yeejoin/amos/api/tool/face/service/AmosToolTemplateService.java

 package com.yeejoin.amos.api.tool.face.service;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.api.tool.enums.SortType;
-import com.yeejoin.amos.api.tool.face.model.AmosToolTemplateModel;
+import com.yeejoin.amos.api.tool.face.model.*;
 import com.yeejoin.amos.api.tool.face.orm.dao.AmosToolTemplateMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.AmosToolTemplate;
+import com.yeejoin.amos.api.tool.utils.ConvertUtil;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 @Component
 public class AmosToolTemplateService extends BaseService<AmosToolTemplateModel,
@@ -58,4 +63,54 @@ public class AmosToolTemplateService extends BaseService<AmosToolTemplateModel,
             return amosToolTemplateMapper.queryByScenes(categoryScene, sortType.getField(), sortType.getDirection());
         }
     }
+    /**
+     * 生成随机UID
+     */
+    public String getUid() {
+        UUID uuid = UUID.randomUUID();
+        String str = uuid.toString();
+        return str.replace("-", "");
+    }
+    /**
+     * url转化图片
+     */
+    public List<PictureModel> urlToModel(String url) {
+        List<PictureModel> pictureModels = new ArrayList<>();
+        PictureModel pictureModel = new PictureModel("", this.getUid(), url, "done");
+        pictureModels.add(pictureModel);
+        return pictureModels;
+    }
+    /**
+     * model转化VO
+     */
+    public AmosToolTemplateVoModel convertVoModel(AmosToolTemplateModel templateModel) {
+        AmosToolTemplateVoModel tplVoModel = new AmosToolTemplateVoModel();
+        BeanUtils.copyProperties(templateModel, tplVoModel);
+        if (templateModel.getSketch() != null)
+            tplVoModel.setSketches(this.urlToModel(templateModel.getSketch()));
+        return tplVoModel;
+    }
+    /**
+     * TplVoModel转化TplModel
+     */
+    public AmosToolTemplateModel convertModel(AmosToolTemplateVoModel amosToolTplVoModel) throws NoSuchFieldException, IllegalAccessException {
+        AmosToolTemplateModel amosToolTemplateModel = new AmosToolTemplateModel();
+        BeanUtils.copyProperties(amosToolTplVoModel, amosToolTemplateModel, "thumbs", "sketches", "contentStr");
+
+        //判定sketch为空
+        if (amosToolTplVoModel.getSketches().size() != 0) {
+            amosToolTemplateModel.setSketch(ConvertUtil.objectListToUrl(amosToolTplVoModel.getSketches()));
+        }
+
+        return amosToolTemplateModel;
+    }
+    /**
+     * 根据sequenceNbr获取模板并转化为VO
+     */
+    public AmosToolTemplateVoModel queryForTplVo(Long sequenceNbr) {
+        AmosToolTemplateModel templateModel = this.queryBySeq(sequenceNbr);
+        AmosToolTemplateVoModel templateVoModel = this.convertVoModel(templateModel);
+
+        return templateVoModel;
+    }
 }