缩略图显示优化

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

@@ -14,7 +14,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import javax.servlet.http.HttpServletRequest;
-import java.sql.SQLException;
 import java.util.List;
 
 
@@ -45,8 +44,6 @@ public class DataBaseResource {
 
     /**
      * 根据sequenceNbr批量删除
-     *
-     * @param sequenceNbr 主键
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @DeleteMapping(value = "/s/{sequenceNbr}")
@@ -64,9 +61,6 @@ public class DataBaseResource {
 
     /**
      * 列表分页查询
-     *
-     * @param current 当前页
-     * @param current 每页大小
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/page")

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

@@ -13,7 +13,6 @@ import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.sql.Connection;
-import java.sql.SQLException;
 
 @CrossOrigin
 @RestController

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

@@ -31,112 +31,122 @@ public class TplResource {
 
     /**
      * 新增
+     *
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<TplModel> save(@RequestBody TplVoModel tplVoModel) throws Exception{
+    public ResponseModel<TplModel> save(@RequestBody TplVoModel tplVoModel) throws Exception {
         tplVoModel.setIsDel(false);
         tplVoModel.setDisplayName(tplVoModel.getComName());
         TplModel tplModel = new TplModel();
         tplService.convertModel(tplVoModel, tplModel);
         return ResponseHelper.buildResponse(tplService.createWithModel(tplModel));
     }
+
     /**
      * 根据sequenceNbr更新
+     *
      * @param sequenceNbr 主键
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @PutMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<TplModel> updateBySequenceNbrTpl(@RequestBody TplVoModel tplVoModel,@PathVariable(value = "sequenceNbr")Long sequenceNbr) {
+    public ResponseModel<TplModel> updateBySequenceNbrTpl(@RequestBody TplVoModel tplVoModel, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
         tplVoModel.setSequenceNbr(sequenceNbr);
         tplVoModel.setDisplayName(tplVoModel.getComName());
         TplModel tplModel = new TplModel();
-        tplService.convertModel(tplVoModel,tplModel);
-        return  ResponseHelper.buildResponse(tplService.updateWithModel(tplModel));
+        tplService.convertModel(tplVoModel, tplModel);
+        return ResponseHelper.buildResponse(tplService.updateWithModel(tplModel));
     }
 
     /**
      * 根据sequenceNbr删除
+     *
      * @param sequenceNbr 主键
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
-    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr")Long sequenceNbr){
-        return  ResponseHelper.buildResponse(tplService.removeById(sequenceNbr));
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(tplService.removeById(sequenceNbr));
     }
+
     /**
      * 根据sequenceNbr删除多项
+     *
      * @param sequenceNbr 主键
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @DeleteMapping(value = "/s/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除多项", notes = "根据sequenceNbr删除多项")
-    public ResponseModel<String> deleteModelsBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr")String sequenceNbr){
+    public ResponseModel<String> deleteModelsBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") String sequenceNbr) {
         tplService.deleteByIds(sequenceNbr);
         return ResponseHelper.buildResponse("Succeed!");
     }
+
     /**
      * 根据sequenceNbr查询
-     * @param sequenceNbr  主键
+     *
+     * @param sequenceNbr 主键
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
     public ResponseModel<TplVoModel> selectOne(@PathVariable Long sequenceNbr) throws Exception {
         TplModel tplModel = tplService.queryBySeq(sequenceNbr);
-        TplVoModel tplVoModel = new TplVoModel();
-        BeanUtils.copyProperties(tplModel,tplVoModel);
-        if(tplModel.getContent() != null) tplVoModel.setContentStr(tplModel.getContent().toString());
+        TplVoModel tplVoModel = tplService.convertVoModel(tplModel);
+        if (tplModel.getContent() != null) tplVoModel.setContentStr(tplModel.getContent().toString());
         return ResponseHelper.buildResponse(tplVoModel);
     }
 
     /**
      * 列表分页查询
-     *@param current 当前页
-     *@param size 每页大小
+     *
+     * @param current 当前页
+     * @param size    每页大小
      * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/page")
-    @ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
-    public ResponseModel<Page<TplModel>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size,@RequestParam(value = "categorySeq")Long categorySeq,@RequestParam(value = "displayName",required = false)String displayName){
+    @ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
+    public ResponseModel<Page<TplModel>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size, @RequestParam(value = "categorySeq") Long categorySeq, @RequestParam(value = "displayName", required = false) String displayName) {
         Page<TplModel> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
         return ResponseHelper.buildResponse(tplService.queryForTplPage(page, categorySeq, displayName));
-//        return ResponseHelper.buildResponse(tplService.queryForTplPageByVisualDesigner(page,categorySeq));
     }
+
     /**
-     *列表全部数据查询
-     *@return
+     * 列表全部数据查询
+     *
+     * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
-    @ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/list")
-    public ResponseModel<List<TplModel>> selectForList(){
+    public ResponseModel<List<TplModel>> selectForList() {
         return ResponseHelper.buildResponse(tplService.queryForTplList());
     }
 
     /**
-     *导入
-     *@return
+     * 导入
+     *
+     * @return
      */
-    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @CrossOrigin
-    @ApiOperation(httpMethod = "POST",value = "根据sequenceNbr导入content",   notes = "根据sequenceNbr导入content")
-    @PostMapping  (value = "/import")
+    @ApiOperation(httpMethod = "POST", value = "根据sequenceNbr导入content", notes = "根据sequenceNbr导入content")
+    @PostMapping(value = "/import")
     public ResponseModel<TplModel> importTpl(@RequestParam("file") MultipartFile multipartFile) throws Exception {
         JSONObject content = JSON.parseObject(tplService.readMultipartFile(multipartFile));
         String str = "1668429235251548162";
-        TplModel tplModel = new TplModel(content,"","","",Long.parseLong(str),false,false);
+        TplModel tplModel = new TplModel(content, "", "", "", Long.parseLong(str), false, false);
         return ResponseHelper.buildResponse(tplService.createWithModel(tplModel));
     }
 

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

 package com.yeejoin.amos.api.tool.face.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor
+@AllArgsConstructor
 public class PicModel {
 
     private String name;
@@ -14,5 +16,7 @@ public class PicModel {
     private String url;
 
     private String status;
+
+
 }
 

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

@@ -28,11 +28,6 @@ public class DataBaseService extends BaseService<DataBaseModel, DataBase, DataBa
     @Autowired
     private DataBaseMapper dataBaseMapper;
 
-//    public void deleteAll(){
-//        dataBaseMapper.deleteAll();
-//    }
-
-
     /**
      * 分页查询
      */
@@ -51,16 +46,6 @@ public class DataBaseService extends BaseService<DataBaseModel, DataBase, DataBa
         return this.queryForList("", false, apiSource);
     }
 
-
-    public void deleteBySeqs(String sequenceNbrs) {
-        String Nbr[] = sequenceNbrs.split(",");
-        Long[] seq = (Long[]) ConvertUtils.convert(Nbr, Long.class);
-        Boolean Nbr2[] = new Boolean[Nbr.length];
-        for (int i = 0; i < Nbr.length; i++) {
-            Nbr2[i] = this.removeById(seq[i]);
-        }
-    }
-
     public Long[] stringToLong(String sequenceNbrs) {
         String[] seqs = sequenceNbrs.split(",");
         Long[] seq = new Long[seqs.length];

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

@@ -85,10 +85,6 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
 
     /**
      * 递归建立树形结构 （算法）
-     *
-     * @param relationTreeModels
-     * @param parentName
-     * @return
      */
     public List<RelationTreeModel> createTree(List<RelationTreeModel> relationTreeModels, String parentName) {
         List<RelationTreeModel> tree = new ArrayList<>();
@@ -155,18 +151,6 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
     }
 
     /**
-     * 根据多颗树生成sql语句
-     */
-    public String createSQL(List<RelationTreeModel> tree) {
-        StringBuilder sql = new StringBuilder("DELETE");
-        List<RelationTreeModel> result = new ArrayList<>();
-        for (RelationTreeModel node : tree) {
-
-        }
-        return sql.toString();
-    }
-
-    /**
      * 列表节点生成（递归）
      */
     public List<RelationTreeModel> createNodeList(List<RelationTreeModel> tree) {

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

@@ -2,6 +2,7 @@ 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.face.model.PicModel;
 import com.yeejoin.amos.api.tool.face.model.TplModel;
 import com.yeejoin.amos.api.tool.face.model.TplVoModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.TplMapper;
@@ -16,7 +17,9 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 @Service
 public class TplService extends BaseService<TplModel, Tpl, TplMapper> {
@@ -27,65 +30,56 @@ public class TplService extends BaseService<TplModel, Tpl, TplMapper> {
     TplCateService tplCateService;
     @Autowired
     VisualDesignerService visualDesignerService;
+
     /**
      * 分页查询
      */
-    public Page<TplModel> queryForTplPage(Page<TplModel> page, Long categorySeq, String displayName)   {
-            return this.queryForPage(page, null, false, categorySeq, displayName);
+    public Page<TplModel> queryForTplPage(Page<TplModel> page, Long categorySeq, String displayName) {
+        return this.queryForPage(page, null, false, categorySeq, displayName);
     }
-//    /**
-//     * 根据设计器分页查询
-//     */
-//    public Page<TplModel> queryForTplPageByVisualDesigner(Page<TplModel> page, Long sequenceNbr){
-//        List<TplCateTreeModel> tplCateTreeModels = visualDesignerService.queryForTplCateTreeListByVisualDesigner(sequenceNbr);
-//        for(TplCateTreeModel tplCateTreeModel:tplCateTreeModels){
-//            page.getRecords().addAll(tplService.queryForTplListByCategorySeq(tplCateTreeModel.getSequenceNbr()));
-//        }
-//        System.out.println(page);
-//        return page;
-//    }
-
-
 
     /**
      * 列表查询
      */
-    public List<TplModel> queryForTplListByCategorySeq(Long categorySeq)   {
-        return this.queryForList("" , false,categorySeq);
+    public List<TplModel> queryForTplListByCategorySeq(Long categorySeq) {
+        return this.queryForList("", false, categorySeq);
     }
+
     /**
      * 列表查询
      */
-    public List<TplModel> queryForTplList()   {
-        return this.queryForList("" , false);
+    public List<TplModel> queryForTplList() {
+        return this.queryForList("", false);
     }
 
 
     /**
      * TplVoModel转化TplModel
      */
-    public TplModel convertModel(TplVoModel tplVoModel,TplModel tplModel){
-        BeanUtils.copyProperties(tplVoModel,tplModel,"thumbs","sketches","contentStr");
+    public TplModel convertModel(TplVoModel tplVoModel, TplModel tplModel) {
+        BeanUtils.copyProperties(tplVoModel, tplModel, "thumbs", "sketches", "contentStr");
         //判定thumbs为空
-        if(tplVoModel.getThumbs().size() != 0)
+        if (tplVoModel.getThumbs().size() != 0)
             tplModel.setThumb(tplVoModel.getThumbs().get(0).getUrl());
         //判定sketch为空
-        if(tplVoModel.getSketches().size() !=0)
+        if (tplVoModel.getSketches().size() != 0)
             tplModel.setSketch(tplVoModel.getSketches().get(0).getUrl());
         tplModel.setContent(JSON.parseObject(tplVoModel.getContentStr()));
         return tplModel;
     }
+
     /**
      * 删除多个模板
      */
-    public void deleteByIds(String sequenceNbr){
+    public void deleteByIds(String sequenceNbr) {
         String[] seqs = sequenceNbr.split(",");
         Long[] seq = new Long[seqs.length];
-        for (int i = 0;i < seq.length;i++){
+        for (int i = 0; i < seq.length; i++) {
             seq[i] = Long.parseLong(seqs[i]);
             this.removeById(seq[i]);
         }
     }
+
     /**
      * 读取json文件
      */
@@ -100,5 +94,28 @@ public class TplService extends BaseService<TplModel, Tpl, TplMapper> {
         return stringBuffer.toString();
     }
 
+    public TplVoModel convertVoModel(TplModel tplModel){
+        TplVoModel tplVoModel = new TplVoModel();
+        BeanUtils.copyProperties(tplModel, tplVoModel);
+        if(tplModel.getSketch() != null)
+            tplVoModel.setSketches(urlToPicModel(tplModel.getSketch()));
+        if (tplModel.getThumb() != null)
+            tplVoModel.setThumbs(urlToPicModel(tplModel.getThumb()));
+        return tplVoModel;
+    }
+
+    public String getUid(){
+        UUID uuid= UUID.randomUUID();
+        String str = uuid.toString();
+        return str.replace("-", "");
+    }
+
+    public List<PicModel> urlToPicModel(String url){
+        List<PicModel> picModels = new ArrayList<>();
+        PicModel picModel = new PicModel("", this.getUid(), url, "done");
+        picModels.add(picModel);
+        return picModels;
+    }
+
 
 }