修改

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

@@ -2,23 +2,19 @@ package com.yeejoin.amos.api.tool.controller;
 
 import com.yeejoin.amos.api.tool.face.model.ApiInfoModel;
 import com.yeejoin.amos.api.tool.face.model.ApiSourceModel;
-import com.yeejoin.amos.api.tool.face.model.TplModel;
 import com.yeejoin.amos.api.tool.face.service.ApiInfoService;
 import com.yeejoin.amos.api.tool.face.service.ApiSourceService;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletRequest;
 import org.springframework.web.bind.annotation.*;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 @CrossOrigin
 @RestController

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

@@ -33,7 +33,7 @@ public class RelationResource {
         Long[] seqs = dataBaseService.stringToLong(sequenceNbrs);
         for (Long seq : seqs) {
             Connection connection = dataBaseService.connectNewDatabase(dataBaseService.queryBySeq(seq));
-            relationService.deleteDataBase(connection,agencyTreeService.queryForAgencyCodeById(agencyCodeId));
+            relationService.deleteDataBase(connection,agencyTreeService.queryForAgencyCodeById(agencyCodeId),dataBaseService.queryBySeq(seq).getDbName());
         }
         return ResponseHelper.buildResponse("The data has been deleted !");
     }

src/main/java/com/yeejoin/amos/api/tool/controller/TplCateResource.java → src/main/java/com/yeejoin/amos/api/tool/controller/TemplateCateResource.java

 package com.yeejoin.amos.api.tool.controller;
 
-import com.yeejoin.amos.api.tool.face.model.TplCateModel;
-import com.yeejoin.amos.api.tool.face.model.TplCateTreeModel;
-import com.yeejoin.amos.api.tool.face.model.TplModel;
-import com.yeejoin.amos.api.tool.face.service.TplCateService;
-import com.yeejoin.amos.api.tool.face.service.TplService;
+import com.yeejoin.amos.api.tool.face.model.TemplateCateModel;
+import com.yeejoin.amos.api.tool.face.model.TemplateCateTreeModel;
+import com.yeejoin.amos.api.tool.face.model.TemplateModel;
+import com.yeejoin.amos.api.tool.face.service.TemplateCateService;
+import com.yeejoin.amos.api.tool.face.service.TemplateService;
 import com.yeejoin.amos.api.tool.face.service.VisualDesignerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,12 +22,12 @@ import java.util.List;
 @RestController
 @Api(tags = "模板分类管理Api")
 @RequestMapping(value = "/tpl_cate")
-public class TplCateResource {
+public class TemplateCateResource {
 
     @Autowired
-    TplCateService tplCateService;
+    TemplateCateService templateCateService;
     @Autowired
-    TplService tplService;
+    TemplateService templateService;
     @Autowired
     VisualDesignerService visualDesignerService;
 
@@ -39,12 +39,12 @@ public class TplCateResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @PostMapping(value = "/save/{sequenceNbr}")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
-    public ResponseModel<TplCateModel> save(@PathVariable Long sequenceNbr,@RequestBody TplCateModel tplCateModel){
-        tplCateModel.setDesignerType(visualDesignerService.queryBySeq(sequenceNbr).getDesignerType());
-        tplCateModel.setIcon("");
-        tplCateModel.setIsDel(false);
-        tplCateModel = tplCateService.createWithModel(tplCateModel);
-        return ResponseHelper.buildResponse(tplCateModel);
+    public ResponseModel<TemplateCateModel> save(@PathVariable Long sequenceNbr, @RequestBody TemplateCateModel templateCateModel){
+        templateCateModel.setDesignerType(visualDesignerService.queryBySeq(sequenceNbr).getDesignerType());
+        templateCateModel.setIcon("");
+        templateCateModel.setIsDel(false);
+        templateCateModel = templateCateService.createWithModel(templateCateModel);
+        return ResponseHelper.buildResponse(templateCateModel);
     }
 
     /**
@@ -56,9 +56,9 @@ public class TplCateResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @PutMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
-    public ResponseModel<TplCateModel> updateBySeqTplCate(@RequestBody TplCateModel tplCateModel,@PathVariable(value = "sequenceNbr") Long sequenceNbr){
-        tplCateModel.setSequenceNbr(sequenceNbr);
-        return ResponseHelper.buildResponse(tplCateService.updateWithModel(tplCateModel));
+    public ResponseModel<TemplateCateModel> updateBySeqTplCate(@RequestBody TemplateCateModel templateCateModel, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        templateCateModel.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(templateCateService.updateWithModel(templateCateModel));
     }
 
     /**
@@ -71,11 +71,11 @@ public class TplCateResource {
     @DeleteMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
     public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-        List<TplModel> tplModels = tplService.queryForTplListByCategorySeq(sequenceNbr);
-        for (TplModel tplModel:tplModels){
-            tplService.removeById(tplModel.getSequenceNbr());
+        List<TemplateModel> templateModels = templateService.queryForTplListByCategorySeq(sequenceNbr);
+        for (TemplateModel templateModel : templateModels){
+            templateService.removeById(templateModel.getSequenceNbr());
         }
-        return ResponseHelper.buildResponse(tplCateService.removeById(sequenceNbr));
+        return ResponseHelper.buildResponse(templateCateService.removeById(sequenceNbr));
     }
 
     /**
@@ -87,8 +87,8 @@ public class TplCateResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @GetMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public  ResponseModel<TplCateModel> selectOne(@PathVariable Long sequenceNbr){
-        return ResponseHelper.buildResponse(tplCateService.queryBySeq(sequenceNbr));
+    public  ResponseModel<TemplateCateModel> selectOne(@PathVariable Long sequenceNbr){
+        return ResponseHelper.buildResponse(templateCateService.queryBySeq(sequenceNbr));
     }
 
     /**
@@ -99,8 +99,8 @@ public class TplCateResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/list")
-    public ResponseModel<List<TplCateModel>> selectForList(){
-        return ResponseHelper.buildResponse(tplCateService.queryForTplCateList());
+    public ResponseModel<List<TemplateCateModel>> selectForList(){
+        return ResponseHelper.buildResponse(templateCateService.queryForTplCateList());
     }
     /**
      * 列表树形结构查询
@@ -110,7 +110,7 @@ public class TplCateResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "列表树形结构查询", notes = "列表树形结构查询")
     @GetMapping(value = "/tree")
-    public ResponseModel<List<TplCateTreeModel>> selectForTree(){
+    public ResponseModel<List<TemplateCateTreeModel>> selectForTree(){
         return ResponseHelper.buildResponse(visualDesignerService.getList());
     }
 

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

@@ -3,9 +3,9 @@ package com.yeejoin.amos.api.tool.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-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.service.TplService;
+import com.yeejoin.amos.api.tool.face.model.TemplateModel;
+import com.yeejoin.amos.api.tool.face.model.TemplateVoModel;
+import com.yeejoin.amos.api.tool.face.service.TemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,10 +23,10 @@ import java.util.*;
 @RestController
 @Api(tags = "模板管理Api")
 @RequestMapping(value = "/tpl")
-public class TplResource {
+public class TemplateResource {
 
     @Autowired
-    TplService tplService;
+    TemplateService templateService;
 
     /**
      * 新增
@@ -36,12 +36,12 @@ public class TplResource {
     @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<TemplateModel> save(@RequestBody TemplateVoModel tplVoModel) throws Exception {
         tplVoModel.setIsDel(false);
         tplVoModel.setDisplayName(tplVoModel.getComName());
-        TplModel tplModel = new TplModel();
-        tplService.convertModel(tplVoModel, tplModel);
-        return ResponseHelper.buildResponse(tplService.createWithModel(tplModel));
+        TemplateModel templateModel = new TemplateModel();
+        templateService.convertModel(tplVoModel, templateModel);
+        return ResponseHelper.buildResponse(templateService.createWithModel(templateModel));
     }
 
     /**
@@ -53,12 +53,12 @@ public class TplResource {
     @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) throws NoSuchFieldException, IllegalAccessException {
+    public ResponseModel<TemplateModel> updateBySequenceNbrTpl(@RequestBody TemplateVoModel tplVoModel, @PathVariable(value = "sequenceNbr") Long sequenceNbr) throws NoSuchFieldException, IllegalAccessException {
         tplVoModel.setSequenceNbr(sequenceNbr);
         tplVoModel.setDisplayName(tplVoModel.getComName());
-        TplModel tplModel = new TplModel();
-        tplService.convertModel(tplVoModel, tplModel);
-        return ResponseHelper.buildResponse(tplService.updateWithModel(tplModel));
+        TemplateModel templateModel = new TemplateModel();
+        templateService.convertModel(tplVoModel, templateModel);
+        return ResponseHelper.buildResponse(templateService.updateWithModel(templateModel));
     }
 
     /**
@@ -71,7 +71,7 @@ public class TplResource {
     @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));
+        return ResponseHelper.buildResponse(templateService.removeById(sequenceNbr));
     }
 
     /**
@@ -84,7 +84,7 @@ public class TplResource {
     @DeleteMapping(value = "/delete/{sequenceNbr}")
     @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除多项", notes = "根据sequenceNbr删除多项")
     public ResponseModel<String> deleteModelsBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") String sequenceNbr) {
-        tplService.deleteByIds(sequenceNbr);
+        templateService.deleteByIds(sequenceNbr);
         return ResponseHelper.buildResponse("Succeed!");
     }
 
@@ -97,10 +97,10 @@ public class TplResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/{sequenceNbr}")
     @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
-    public ResponseModel<TplVoModel> selectOne(@PathVariable Long sequenceNbr) throws Exception {
-        TplModel tplModel = tplService.queryBySeq(sequenceNbr);
-        TplVoModel tplVoModel = tplService.convertVoModel(tplModel);
-        if (tplModel.getContent() != null) tplVoModel.setContentStr(tplModel.getContent().toString());
+    public ResponseModel<TemplateVoModel> selectOne(@PathVariable Long sequenceNbr) throws Exception {
+        TemplateModel templateModel = templateService.queryBySeq(sequenceNbr);
+        TemplateVoModel tplVoModel = templateService.convertVoModel(templateModel);
+        if (templateModel.getContent() != null) tplVoModel.setContentStr(templateModel.getContent().toString());
         return ResponseHelper.buildResponse(tplVoModel);
     }
 
@@ -114,11 +114,11 @@ public class TplResource {
     @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) {
-        Page<TplModel> page = new Page<>();
+    public ResponseModel<Page<TemplateModel>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size, @RequestParam(value = "categorySeq") Long categorySeq, @RequestParam(value = "displayName", required = false) String displayName) {
+        Page<TemplateModel> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(tplService.queryForTplPage(page, categorySeq, displayName));
+        return ResponseHelper.buildResponse(templateService.queryForTplPage(page, categorySeq, displayName));
     }
 
     /**
@@ -129,8 +129,8 @@ public class TplResource {
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/list")
-    public ResponseModel<List<TplModel>> selectForList() {
-        return ResponseHelper.buildResponse(tplService.queryForTplList());
+    public ResponseModel<List<TemplateModel>> selectForList() {
+        return ResponseHelper.buildResponse(templateService.queryForTplList());
     }
 
     /**
@@ -142,11 +142,11 @@ public class TplResource {
     @CrossOrigin
     @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));
+    public ResponseModel<TemplateModel> importTpl(@RequestParam("file") MultipartFile multipartFile) throws Exception {
+        JSONObject content = JSON.parseObject(templateService.readMultipartFile(multipartFile));
         String str = "1668429235251548162";
-        TplModel tplModel = new TplModel(content, "", "", "", Long.parseLong(str), false, false);
-        return ResponseHelper.buildResponse(tplService.createWithModel(tplModel));
+        TemplateModel templateModel = new TemplateModel(content, "", "", "", Long.parseLong(str), false, false);
+        return ResponseHelper.buildResponse(templateService.createWithModel(templateModel));
     }
 
 }

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

@@ -7,7 +7,7 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class PicModel {
+public class PictureModel {
 
     private String name;
 

src/main/java/com/yeejoin/amos/api/tool/face/model/TplCateModel.java → src/main/java/com/yeejoin/amos/api/tool/face/model/TemplateCateModel.java

@@ -8,8 +8,8 @@ import org.typroject.tyboot.core.rdbms.model.BaseModel;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="TplCateModel", description="")
-public class TplCateModel extends BaseModel {
+@ApiModel(value="TemplateCateModel", description="")
+public class TemplateCateModel extends BaseModel {
 
     @ApiModelProperty(value = "模板分类名称")
     private String cateName;

src/main/java/com/yeejoin/amos/api/tool/face/model/TplCateTreeModel.java → src/main/java/com/yeejoin/amos/api/tool/face/model/TemplateCateTreeModel.java

@@ -10,8 +10,8 @@ import java.util.List;
 
 @Data
 @NoArgsConstructor
-@ApiModel(value="TplCateTreeModel", description="")
-public class TplCateTreeModel {
+@ApiModel(value="TemplateCateTreeModel", description="")
+public class TemplateCateTreeModel {
     @ApiModelProperty(value = "物理主键")
     private Long sequenceNbr;
 
@@ -25,19 +25,19 @@ public class TplCateTreeModel {
     private String designerType;
 
     @ApiModelProperty(value = "子列表")
-    private List<TplCateTreeModel> children = new ArrayList<>();
+    private List<TemplateCateTreeModel> children = new ArrayList<>();
 
     public void setParentId(Long parentId) {
         this.parentId = parentId;
     }
 
-    public TplCateTreeModel(Long sequenceNb, Long parentId, String name,String designerType){
+    public TemplateCateTreeModel(Long sequenceNb, Long parentId, String name, String designerType){
         this.sequenceNbr =sequenceNb ;
         this.parentId = parentId;
         this.name = name;
         this.designerType =designerType;
     }
-    public TplCateTreeModel(Long sequenceNb, Long parentId, String name,String designerType,List<TplCateTreeModel> children){
+    public TemplateCateTreeModel(Long sequenceNb, Long parentId, String name, String designerType, List<TemplateCateTreeModel> children){
         this.sequenceNbr =sequenceNb ;
         this.parentId = parentId;
         this.name = name;

src/main/java/com/yeejoin/amos/api/tool/face/model/TplModel.java → src/main/java/com/yeejoin/amos/api/tool/face/model/TemplateModel.java

@@ -16,8 +16,8 @@ import org.typroject.tyboot.core.rdbms.model.BaseModel;
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @TableName(autoResultMap = true)
-@ApiModel(value="TplModel", description="")
-public class TplModel extends BaseModel {
+@ApiModel(value="TemplateModel", description="")
+public class TemplateModel extends BaseModel {
     @ApiModelProperty(value = "展示名称")
     protected String displayName;
 
@@ -55,7 +55,7 @@ public class TplModel extends BaseModel {
         this.sketch = sketch;
     }
 
-    public TplModel(JSONObject content, String displayName, String comKey, String comName, Long cateSeq, Boolean openStatus, Boolean isDel){
+    public TemplateModel(JSONObject content, String displayName, String comKey, String comName, Long cateSeq, Boolean openStatus, Boolean isDel){
         this.content = content;
         this.displayName =displayName;
         this.comKey = comKey;

src/main/java/com/yeejoin/amos/api/tool/face/model/TplVoModel.java → src/main/java/com/yeejoin/amos/api/tool/face/model/TemplateVoModel.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.api.tool.face.model;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.yeejoin.amos.api.tool.face.util.PicUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,18 +14,18 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="TplVoModel", description="")
+@ApiModel(value="TemplateVoModel", description="")
 @JsonIgnoreProperties({"hibernateLazyInitializer","handler"})
-public class TplVoModel extends TplModel {
+public class TemplateVoModel extends TemplateModel {
 
     @ApiModelProperty(value = "模板内容")
     private String contentStr;
 
     @ApiModelProperty(value = "缩略图")
-    private List<PicModel> thumbs = new ArrayList<>();
+    private List<PictureModel> thumbs = new ArrayList<>();
 
     @ApiModelProperty(value = "效果图")
-    private List<PicModel> sketches = new ArrayList<>();
+    private List<PictureModel> sketches = new ArrayList<>();
 
     public void setIsDel(Boolean isDel) {
         this.isDel = isDel;

src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/TplCateMapper.java → src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/TemplateCateMapper.java

 package com.yeejoin.amos.api.tool.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.tool.face.orm.entity.TplCate;
+import com.yeejoin.amos.api.tool.face.orm.entity.TemplateCate;
 
-public interface TplCateMapper extends BaseMapper<TplCate> {
+public interface TemplateCateMapper extends BaseMapper<TemplateCate> {
 }

src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/TplMapper.java → src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/TemplateMapper.java

 package com.yeejoin.amos.api.tool.face.orm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.yeejoin.amos.api.tool.face.orm.entity.Tpl;
+import com.yeejoin.amos.api.tool.face.orm.entity.Template;
 
 
-public interface TplMapper extends BaseMapper<Tpl> {
+public interface TemplateMapper extends BaseMapper<Template> {
 }

src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/Tpl.java → src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/Template.java

@@ -14,7 +14,7 @@ import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName(value = "studio_template",autoResultMap = true)
-public class Tpl extends BaseEntity {
+public class Template extends BaseEntity {
 
 
     /**

src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/TplCate.java → src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/TemplateCate.java

@@ -11,7 +11,7 @@ import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @TableName("studio_template_category")
-public class TplCate extends BaseEntity {
+public class TemplateCate extends BaseEntity {
 
     /**
      *分类名称

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

@@ -24,14 +24,14 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
     /**
      * 删除数据库
      */
-    public String deleteDataBase(Connection connection, String agencyCode) throws SQLException {
+    public String deleteDataBase(Connection connection, String agencyCode,String databaseName) throws SQLException {
         try {
             // 加载数据库驱动
             Class.forName("com.mysql.cj.jdbc.Driver");
             if (!connection.isClosed())
                 System.out.println("Succeeded connecting to the Database!");
             //通过连接获取relation表树形结构
-            List<RelationTreeModel> trees = this.createRelationTree(connection);
+            List<RelationTreeModel> trees = this.createRelationTree(connection,databaseName);
             for (RelationTreeModel tree : trees) {
                 //根据根节点获得根节点相关列表
                 List<RelationTreeModel> array = this.createList(tree);
@@ -66,9 +66,13 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
     /**
      * 获取关系表转化为map
      */
-    public List<HashMap<String, String>> queryRelation(Connection connection) throws SQLException {
+    public List<HashMap<String, String>> queryRelation(String dataBaseName) throws SQLException {
+        Connection connection = dataBaseService.connectNewDatabase(this.queryByModel())
+
         Statement statement = connection.createStatement();
-        ResultSet resultSet = statement.executeQuery("SELECT * FROM relation ;");
+        StringBuilder sql = new StringBuilder("SELECT * FROM ");
+        sql.append(dataBaseName).append("_relation ;");
+        ResultSet resultSet = statement.executeQuery(sql.toString());
         ResultSetMetaData data = resultSet.getMetaData();
         List<HashMap<String, String>> maps = new ArrayList<>();
         while (resultSet.next()) {
@@ -116,8 +120,8 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
     /**
      * 创建关系表树
      */
-    public List<RelationTreeModel> createRelationTree(Connection connection) throws SQLException {
-        List<HashMap<String, String>> maps = this.queryRelation(connection);
+    public List<RelationTreeModel> createRelationTree(Connection connection,String dataBaseName) throws SQLException {
+        List<HashMap<String, String>> maps = this.queryRelation(connection,dataBaseName);
         List<RelationTreeModel> trees = new ArrayList<>();
         trees.addAll(createTree(createNodes(maps), ""));
         return trees;
@@ -177,4 +181,8 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
         result.addAll(createNodeList(model.getChildren()));
         return result;
     }
+
+    public RelationModel queryByDbName(String dataBaseName){
+        
+    }
 }

src/main/java/com/yeejoin/amos/api/tool/face/service/TplCateService.java → src/main/java/com/yeejoin/amos/api/tool/face/service/TemplateCateService.java

 package com.yeejoin.amos.api.tool.face.service;
 
-import com.yeejoin.amos.api.tool.face.model.TplCateModel;
-import com.yeejoin.amos.api.tool.face.orm.dao.TplCateMapper;
-import com.yeejoin.amos.api.tool.face.orm.entity.TplCate;
+import com.yeejoin.amos.api.tool.face.model.TemplateCateModel;
+import com.yeejoin.amos.api.tool.face.orm.dao.TemplateCateMapper;
+import com.yeejoin.amos.api.tool.face.orm.entity.TemplateCate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -11,7 +11,7 @@ import java.util.List;
 
 
 @Service
-public class TplCateService extends BaseService<TplCateModel, TplCate, TplCateMapper> {
+public class TemplateCateService extends BaseService<TemplateCateModel, TemplateCate, TemplateCateMapper> {
 
     @Autowired
     VisualDesignerService visualDesignerService;
@@ -19,7 +19,7 @@ public class TplCateService extends BaseService<TplCateModel, TplCate, TplCateMa
     /**
      * 列表查询 示例
      */
-    public List<TplCateModel> queryForTplCateList() {
+    public List<TemplateCateModel> queryForTplCateList() {
         return this.queryForList("", false);
     }
 

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

@@ -2,17 +2,16 @@ 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;
-import com.yeejoin.amos.api.tool.face.orm.entity.Tpl;
-import com.yeejoin.amos.api.tool.face.util.PicUtil;
+import com.yeejoin.amos.api.tool.face.model.PictureModel;
+import com.yeejoin.amos.api.tool.face.model.TemplateModel;
+import com.yeejoin.amos.api.tool.face.model.TemplateVoModel;
+import com.yeejoin.amos.api.tool.face.orm.dao.TemplateMapper;
+import com.yeejoin.amos.api.tool.face.orm.entity.Template;
+import com.yeejoin.amos.api.tool.face.util.PictureUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import org.typroject.tyboot.core.foundation.utils.StringUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
 import java.io.IOException;
@@ -23,33 +22,33 @@ import java.util.List;
 import java.util.UUID;
 
 @Service
-public class TplService extends BaseService<TplModel, Tpl, TplMapper> {
+public class TemplateService extends BaseService<TemplateModel, Template, TemplateMapper> {
 
     @Autowired
-    TplService tplService;
+    TemplateService templateService;
     @Autowired
-    TplCateService tplCateService;
+    TemplateCateService templateCateService;
     @Autowired
     VisualDesignerService visualDesignerService;
 
     /**
      * 分页查询
      */
-    public Page<TplModel> queryForTplPage(Page<TplModel> page, Long categorySeq, String displayName) {
+    public Page<TemplateModel> queryForTplPage(Page<TemplateModel> page, Long categorySeq, String displayName) {
         return this.queryForPage(page, null, false, categorySeq, displayName);
     }
 
     /**
      * 列表查询
      */
-    public List<TplModel> queryForTplListByCategorySeq(Long categorySeq) {
+    public List<TemplateModel> queryForTplListByCategorySeq(Long categorySeq) {
         return this.queryForList("", false, categorySeq);
     }
 
     /**
      * 列表查询
      */
-    public List<TplModel> queryForTplList() {
+    public List<TemplateModel> queryForTplList() {
         return this.queryForList("", false);
     }
 
@@ -57,18 +56,18 @@ public class TplService extends BaseService<TplModel, Tpl, TplMapper> {
     /**
      * TplVoModel转化TplModel
      */
-    public TplModel convertModel(TplVoModel tplVoModel, TplModel tplModel) throws NoSuchFieldException, IllegalAccessException {
-        BeanUtils.copyProperties(tplVoModel, tplModel, "thumbs", "sketches", "contentStr");
+    public TemplateModel convertModel(TemplateVoModel tplVoModel, TemplateModel templateModel) throws NoSuchFieldException, IllegalAccessException {
+        BeanUtils.copyProperties(tplVoModel, templateModel, "thumbs", "sketches", "contentStr");
         //判定thumbs为空
         if (tplVoModel.getThumbs().size() != 0)
-            tplModel.setThumb(PicUtil.objectListToUrl(tplVoModel.getThumbs()));
-//            tplModel.setThumb(tplVoModel.getThumbs().get(0).getUrl());
+            templateModel.setThumb(PictureUtil.objectListToUrl(tplVoModel.getThumbs()));
+//            templateModel.setThumb(tplVoModel.getThumbs().get(0).getUrl());
 //        判定sketch为空
         if (tplVoModel.getSketches().size() != 0)
-            tplModel.setSketch(PicUtil.objectListToUrl(tplVoModel.getSketches()));
-//            tplModel.setSketch(tplVoModel.getSketches().get(0).getUrl());
-        tplModel.setContent(JSON.parseObject(tplVoModel.getContentStr()));
-        return tplModel;
+            templateModel.setSketch(PictureUtil.objectListToUrl(tplVoModel.getSketches()));
+//            templateModel.setSketch(tplVoModel.getSketches().get(0).getUrl());
+        templateModel.setContent(JSON.parseObject(tplVoModel.getContentStr()));
+        return templateModel;
     }
 
     /**
@@ -97,13 +96,13 @@ 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(this.urlToPicModel(tplModel.getSketch()));
-        if (tplModel.getThumb() != null)
-            tplVoModel.setThumbs(this.urlToPicModel(tplModel.getThumb()));
+    public TemplateVoModel convertVoModel(TemplateModel templateModel){
+        TemplateVoModel tplVoModel = new TemplateVoModel();
+        BeanUtils.copyProperties(templateModel, tplVoModel);
+        if(templateModel.getSketch() != null)
+            tplVoModel.setSketches(this.urlToPicModel(templateModel.getSketch()));
+        if (templateModel.getThumb() != null)
+            tplVoModel.setThumbs(this.urlToPicModel(templateModel.getThumb()));
         System.out.println(tplVoModel.getThumbs());
         return tplVoModel;
     }
@@ -114,11 +113,11 @@ public class TplService extends BaseService<TplModel, Tpl, TplMapper> {
         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;
+    public List<PictureModel> urlToPicModel(String url){
+        List<PictureModel> pictureModels = new ArrayList<>();
+        PictureModel pictureModel = new PictureModel("", this.getUid(), url, "done");
+        pictureModels.add(pictureModel);
+        return pictureModels;
     }
 
 

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

 package com.yeejoin.amos.api.tool.face.service;
 
 
-import com.yeejoin.amos.api.tool.face.model.TplCateModel;
-import com.yeejoin.amos.api.tool.face.model.TplCateTreeModel;
+import com.yeejoin.amos.api.tool.face.model.TemplateCateModel;
+import com.yeejoin.amos.api.tool.face.model.TemplateCateTreeModel;
 import com.yeejoin.amos.api.tool.face.model.VisualDesignerModel;
 import com.yeejoin.amos.api.tool.face.orm.dao.VisualDesignerMapper;
 import com.yeejoin.amos.api.tool.face.orm.entity.VisualDesigner;
@@ -18,7 +18,7 @@ import java.util.List;
 public class VisualDesignerService extends BaseService<VisualDesignerModel, VisualDesigner, VisualDesignerMapper> {
 
     @Autowired
-    TplCateService tplCateService;
+    TemplateCateService templateCateService;
     @Autowired
     VisualDesignerService visualDesignerService;
 
@@ -31,23 +31,23 @@ public class VisualDesignerService extends BaseService<VisualDesignerModel, Visu
         return this.queryForList("", false);
     }
 
-    public List<TplCateTreeModel> getList() {
-        List<TplCateTreeModel> treeList = new ArrayList<>();
-        List<TplCateModel> tplCateModels = tplCateService.queryForTplCateList();
+    public List<TemplateCateTreeModel> getList() {
+        List<TemplateCateTreeModel> treeList = new ArrayList<>();
+        List<TemplateCateModel> templateCateModels = templateCateService.queryForTplCateList();
         List<VisualDesignerModel> visualDesignerModels = visualDesignerService.queryForVisualDesignerList();
         for(int i = 0; i < visualDesignerModels.size();i++){
-            TplCateTreeModel tplCateTreeModel1 = new
-                    TplCateTreeModel(visualDesignerModels.get(i).getSequenceNbr(), 0L,
+            TemplateCateTreeModel templateCateTreeModel1 = new
+                    TemplateCateTreeModel(visualDesignerModels.get(i).getSequenceNbr(), 0L,
                     visualDesignerModels.get(i).getDesignerName(),visualDesignerModels.get(i).getDesignerType());
-            for (int j = 0, index =0 ;j < tplCateModels.size();j++){
-                if(tplCateModels.get(j).getDesignerType().equals(tplCateTreeModel1.getDesignerType())){
-                    TplCateTreeModel tplCateTreeModel2 = new
-                            TplCateTreeModel(tplCateModels.get(j).getSequenceNbr(), tplCateTreeModel1.getSequenceNbr(),
-                            tplCateModels.get(j).getCateName(),tplCateTreeModel1.getDesignerType(),null);
-                    tplCateTreeModel1.getChildren().add(index++,tplCateTreeModel2);
+            for (int j = 0, index = 0; j < templateCateModels.size(); j++){
+                if(templateCateModels.get(j).getDesignerType().equals(templateCateTreeModel1.getDesignerType())){
+                    TemplateCateTreeModel templateCateTreeModel2 = new
+                            TemplateCateTreeModel(templateCateModels.get(j).getSequenceNbr(), templateCateTreeModel1.getSequenceNbr(),
+                            templateCateModels.get(j).getCateName(), templateCateTreeModel1.getDesignerType(),null);
+                    templateCateTreeModel1.getChildren().add(index++, templateCateTreeModel2);
                 }
             }
-            treeList.add(i,tplCateTreeModel1);
+            treeList.add(i, templateCateTreeModel1);
         }
         return treeList;
     }

src/main/java/com/yeejoin/amos/api/tool/face/util/PicUtil.java → src/main/java/com/yeejoin/amos/api/tool/face/util/PictureUtil.java

@@ -3,7 +3,7 @@ package com.yeejoin.amos.api.tool.face.util;
 import java.lang.reflect.Field;
 import java.util.List;
 
-public class PicUtil {
+public class PictureUtil {
 
     public static <Object> String objectListToUrl(List<Object> objectList) throws IllegalAccessException, NoSuchFieldException {
         if (objectList.isEmpty()) {
@@ -22,7 +22,7 @@ public class PicUtil {
 //    public static List<Object> urlToObjectList(String url){
 //        List<Object> picUtils = new ArrayList<>();
 //        String uid= (int)((Math.random()*9+1)*100000)+"";
-//        PicUtil picUtil = new PicUtil("", uid, url, "done");
+//        PictureUtil picUtil = new PictureUtil("", uid, url, "done");
 //        picUtils.add(picUtil);
 //        return picUtils;
 //    }

src/main/resources/application-dev.properties

 #DB properties:
 # jdbc_config
-spring.datasource.url=jdbc:mysql://39.98.45.134:3306/amos_studio_delete?allowMultiQueries=true
+spring.datasource.url=jdbc:mysql://39.98.45.134:3306/amos_tool_library_test?allowMultiQueries=true
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

src/main/resources/application.properties

 spring.application.name=DemoProject
-server.servlet.context-path=/jcs
+server.servlet.context-path=/atl
 server.port=20000
 spring.profiles.active=dev
 

src/main/resources/mapper/TplCateMapper.xml

 <?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.yeejoin.amos.api.tool.face.orm.dao.TplCateMapper">
+<mapper namespace="com.yeejoin.amos.api.tool.face.orm.dao.TemplateCateMapper">
 
 </mapper>

src/main/resources/mapper/TplMapper.xml

 <?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.yeejoin.amos.api.tool.face.orm.dao.TplMapper">
+<mapper namespace="com.yeejoin.amos.api.tool.face.orm.dao.TemplateMapper">
 
 </mapper>