Skip to content

A
amos-tool
Commit 5120e09f authored by 陈祥烨's avatar 陈祥烨
Browse files
Options

代码规范调整和优化

parent b82e4f86
Hide whitespace changes
Inline Side-by-side
Showing with 493 additions and 469 deletions
src/main/java/com/yeejoin/amos/api/tool/controller/AgencyTreeResource.java
View file @ 5120e09f
......@@ -11,7 +11,6 @@ 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;
......@@ -24,28 +23,28 @@ import java.util.List;
public class AgencyTreeResource {
@Autowired
AgencyTreeService agencyTreeService;
private AgencyTreeService agencyTreeService;
/**
* 根据sequenceNbr删除
* @param sequenceNbr 主键
* @return Boolean
*/
@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){
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(agencyTreeService.removeById(sequenceNbr));
}
/**
*列表全部数据查询
* @return List<AgencyTreeModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<AgencyTreeModel>> selectForList()
{
public ResponseModel<List<AgencyTreeModel>> selectForList() {
return ResponseHelper.buildResponse(agencyTreeService.queryForAgencyTreeList());
}
}
src/main/java/com/yeejoin/amos/api/tool/controller/ApiInfoResource.java
View file @ 5120e09f
......@@ -9,11 +9,12 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.StringUtil;
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.Arrays;
import java.util.List;
@CrossOrigin
@RestController
......@@ -22,13 +23,14 @@ import java.util.List;
public class ApiInfoResource {
@Autowired
ApiInfoService apiInfoService;
private ApiInfoService apiInfoService;
@Autowired
ApiSourceService apiSourceService;
private ApiSourceService apiSourceService;
/**
* 新增
* @return
* @param apiInfoModel API信息
* @return ApiInfoModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@PostMapping(value = "/save")
......@@ -41,7 +43,7 @@ public class ApiInfoResource {
/**
* 根据sequenceNbr更新
* @param sequenceNbr 主键
* @return
* @return ApiInfoModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@PutMapping(value = "/{sequenceNbr}")
......@@ -54,29 +56,31 @@ public class ApiInfoResource {
/**
* 根据sequenceNbr删除
* @param sequenceNbr 主键
* @return
* @return Boolean
*/
@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){
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr){
return ResponseHelper.buildResponse(apiInfoService.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr删除多项
* 根据sequenceNbr 批量删除
* @param sequenceNbr 主键
* @return
* @return Boolean
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@DeleteMapping(value = "/delete/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除多项", notes = "根据sequenceNbr删除多项")
public ResponseModel<Boolean[]> deleteModelsBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr")String sequenceNbr){
return ResponseHelper.buildResponse(apiInfoService.deleteByIds(sequenceNbr));
public ResponseModel<Boolean> deleteModelsBySequenceNbr(@PathVariable(value = "sequenceNbr")String sequenceNbr){
return ResponseHelper.buildResponse(apiInfoService.removeByIds(Arrays.asList(StringUtil.string2Array(sequenceNbr))));
}
/**
* 根据sequenceNbr查询
* @param sequenceNbr 主键
* @return
* @param sequenceNbr 主键
* @return ApiInfoModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/{sequenceNbr}")
......@@ -84,32 +88,38 @@ public class ApiInfoResource {
public ResponseModel<ApiInfoModel> selectOne(@PathVariable Long sequenceNbr) throws Exception {
return ResponseHelper.buildResponse(apiInfoService.queryBySeq(sequenceNbr));
}
/**
* 列表分页查询
*@param current 当前页
*@param current 每页大小
* @return
* @param current 当前页
* @param size 每页大小
* @param apiName API名称
* @param sequenceNbr 主键
* @return Page<ApiInfoModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<ApiInfoModel>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size, @RequestParam(value = "sequenceNbr") Long sequenceNbr,@RequestParam(value = "apiName",required = false)String apiName)
{
public ResponseModel<Page<ApiInfoModel>> queryForPage(
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestParam(value = "sequenceNbr") Long sequenceNbr,
@RequestParam(value = "apiName",required = false)String apiName) {
Page<ApiInfoModel> page=new Page<ApiInfoModel>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(apiInfoService.queryForApiInfoPage(page, apiSourceService.queryCodeById(sequenceNbr),apiName));
return ResponseHelper.buildResponse(
apiInfoService.queryForApiInfoPage(page, apiSourceService.queryCodeById(sequenceNbr),apiName));
}
/**
*列表全部数据查询
*@return
* 列表全部数据查询
* @return List<ApiInfoModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<ApiInfoModel>> selectForList()
{
public ResponseModel<List<ApiInfoModel>> selectForList() {
return ResponseHelper.buildResponse(apiInfoService.queryForApiInfoList());
}
}
src/main/java/com/yeejoin/amos/api/tool/controller/ApiSourceResource.java
View file @ 5120e09f
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;
......@@ -15,7 +13,6 @@ import java.util.List;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
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;
......@@ -27,13 +24,13 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
public class ApiSourceResource {
@Autowired
ApiSourceService apiSourceService;
private ApiSourceService apiSourceService;
@Autowired
ApiInfoService apiInfoService;
private ApiInfoService apiInfoService;
/**
* 新增
*
* @param model API来源信息
* @return ApiSourceDto
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
......@@ -46,38 +43,35 @@ public class ApiSourceResource {
/**
* 根据sequenceNbr更新
*
* @param model API来源信息
* @param sequenceNbr 编码
* @return ApiSourceDto
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<ApiSourceModel> updateBySeqApiSource(@RequestBody ApiSourceModel model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
public ResponseModel<ApiSourceModel> updateBySeqApiSource(
@RequestBody ApiSourceModel model,
@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
model.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(apiSourceService.updateWithModel(model));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 编码
* @return Boolean
*/
@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) {
List<ApiInfoModel> apiInfoModels = apiInfoService.queryForApiInfoListByApiSource(apiSourceService.queryCodeById(sequenceNbr));
for (ApiInfoModel apiInfoModel:apiInfoModels){
apiInfoService.removeById(apiInfoModel.getSequenceNbr());
}
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
apiInfoService.removeByIds(apiInfoService.selectSeqByApiSource(apiSourceService.queryCodeById(sequenceNbr)));
return ResponseHelper.buildResponse(apiSourceService.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 物理主键
* @return ApiSourceDto
*/
......@@ -88,10 +82,8 @@ public class ApiSourceResource {
return ResponseHelper.buildResponse(apiSourceService.queryBySeq(sequenceNbr));
}
/**
* 列表全部数据查询
*
* @return List<ApiSourceDto>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
......
src/main/java/com/yeejoin/amos/api/tool/controller/DataBaseResource.java → src/main/java/com/yeejoin/amos/api/tool/controller/DataBaseLinkResource.java
View file @ 5120e09f
package com.yeejoin.amos.api.tool.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.api.tool.face.model.DataBaseModel;
import com.yeejoin.amos.api.tool.face.service.DataBaseService;
import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel;
import com.yeejoin.amos.api.tool.face.service.DataBaseLinkService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.beanutils.ConvertUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
......@@ -13,7 +12,6 @@ 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;
......@@ -23,62 +21,50 @@ import java.util.List;
@RestController
@Api(tags = "数据库信息")
@RequestMapping(value = "/database_join_record")
public class DataBaseResource {
public class DataBaseLinkResource {
@Autowired
DataBaseService dataBaseService;
private DataBaseLinkService dataBaseLinkService;
/**
* 新增
* 数据库初始化
* @param dataBaseLinkModel 数据库连接信息
* @return List<DataBaseLinkModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/refresh")
@ApiOperation(httpMethod = "POST", value = "数据库初始化", notes = "数据库初始化")
public ResponseModel<List<DataBaseModel>> save(@RequestBody DataBaseModel dataBaseModel) throws Exception {
List<DataBaseModel> dataBaseModels = dataBaseService.refreshDataBase(dataBaseModel);
if (dataBaseModels == null)
return null;
else
return ResponseHelper.buildResponse(dataBaseModels);
}
/**
* 根据sequenceNbr批量删除
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@DeleteMapping(value = "/delete/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "批量删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean[]> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") String sequenceNbr) {
String Nbr[] = sequenceNbr.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] = dataBaseService.removeById(seq[i]);
}
return ResponseHelper.buildResponse(Nbr2);
public ResponseModel<List<DataBaseLinkModel>> save(@RequestBody DataBaseLinkModel dataBaseLinkModel) throws Exception {
return ResponseHelper.buildResponse(
dataBaseLinkService.refreshDataBase(dataBaseLinkService.encryptPwd(dataBaseLinkModel)));
}
/**
* 列表分页查询
* @param current 当前分页
* @param size 分页大小
* @return Page<DataBaseLinkModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<DataBaseModel>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size) {
Page<DataBaseModel> page = new Page<DataBaseModel>();
public ResponseModel<Page<DataBaseLinkModel>> queryForPage(
@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size) {
Page<DataBaseLinkModel> page = new Page<DataBaseLinkModel>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(dataBaseService.queryForDataBasePage(page));
return ResponseHelper.buildResponse(dataBaseLinkService.queryForDataBasePage(page));
}
/**
* 列表全部数据查询
* @return List<DataBaseLinkModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<DataBaseModel>> selectForList() {
return ResponseHelper.buildResponse(dataBaseService.queryForDataBaseList());
public ResponseModel<List<DataBaseLinkModel>> selectForList() {
return ResponseHelper.buildResponse(dataBaseLinkService.queryForDataBaseList());
}
}
src/main/java/com/yeejoin/amos/api/tool/controller/RelationResource.java
View file @ 5120e09f
package com.yeejoin.amos.api.tool.controller;
import com.yeejoin.amos.api.tool.face.service.AgencyTreeService;
import com.yeejoin.amos.api.tool.face.service.DataBaseService;
import com.yeejoin.amos.api.tool.face.service.RelationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
......@@ -12,7 +10,6 @@ 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 java.sql.Connection;
@CrossOrigin
@RestController
......@@ -20,21 +17,21 @@ import java.sql.Connection;
@RequestMapping(value = "/Agency")
public class RelationResource {
@Autowired
RelationService relationService;
@Autowired
DataBaseService dataBaseService;
@Autowired
AgencyTreeService agencyTreeService;
private RelationService relationService;
/**
* 根据机构ID和数据库sequenceNbr批量删除数据库
* @param agencyCodeId 机构ID
* @param sequenceNbrs 多个主键
* @return String
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@DeleteMapping(value = "/relation/{agencyCodeId}/{sequenceNbrs}")
@ApiOperation(httpMethod = "DELETE", value = "机构删除", notes = "机构删除")
public ResponseModel<String> deleteDataBase(@PathVariable Long agencyCodeId, @PathVariable String sequenceNbrs) throws Exception {
Long[] seqs = dataBaseService.stringToLong(sequenceNbrs);
for (Long seq : seqs) {
Connection connection = dataBaseService.connectNewDatabase(dataBaseService.queryBySeq(seq));
relationService.deleteDataBase(connection,agencyTreeService.queryForAgencyCodeById(agencyCodeId));
}
public ResponseModel<String> deleteDataBase(
@PathVariable Long agencyCodeId,
@PathVariable String sequenceNbrs) throws Exception {
relationService.deleteAgency(agencyCodeId,sequenceNbrs);
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/TemplateCategoryResource.java
View file @ 5120e09f
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.TemplateCategoryModel;
import com.yeejoin.amos.api.tool.face.model.TemplateCategoryTreeModel;
import com.yeejoin.amos.api.tool.face.model.TemplateModel;
import com.yeejoin.amos.api.tool.face.service.TemplateCategoryService;
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;
......@@ -14,104 +14,95 @@ 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
@Api(tags = "模板分类管理Api")
@RequestMapping(value = "/tpl_cate")
public class TplCateResource {
public class TemplateCategoryResource {
@Autowired
TplCateService tplCateService;
private TemplateCategoryService templateCategoryService;
@Autowired
TplService tplService;
private TemplateService templateService;
@Autowired
VisualDesignerService visualDesignerService;
private VisualDesignerService visualDesignerService;
/**
* 新增
*
* @param sequenceNbr 设计器主键
* @param templateCategoryModel 模板分类信息
* @return ApiSourceDto
*/
@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<TemplateCategoryModel> save(
@PathVariable Long sequenceNbr,
@RequestBody TemplateCategoryModel templateCategoryModel){
templateCategoryModel.setDesignerType(visualDesignerService.queryBySeq(sequenceNbr).getDesignerType());
templateCategoryModel = templateCategoryService.createWithModel(templateCategoryModel);
return ResponseHelper.buildResponse(templateCategoryModel);
}
/**
* 根据sequenceNbr更新
*
* @param sequenceNbr 编码
* @return ApiSourceDto
*/
@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<TemplateCategoryModel> updateBySeqTplCate(@RequestBody TemplateCategoryModel templateCategoryModel, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
templateCategoryModel.setSequenceNbr(sequenceNbr);
return ResponseHelper.buildResponse(templateCategoryService.updateWithModel(templateCategoryModel));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 编码
* @return Boolean
*/
@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) {
List<TplModel> tplModels = tplService.queryForTplListByCategorySeq(sequenceNbr);
for (TplModel tplModel:tplModels){
tplService.removeById(tplModel.getSequenceNbr());
}
return ResponseHelper.buildResponse(tplCateService.removeById(sequenceNbr));
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
templateService.removeByIds(templateService.selectSeqsByCategorySeq(sequenceNbr));
return ResponseHelper.buildResponse(templateCategoryService.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 物理主键
* @return ApiSourceDto
*/
@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<TemplateCategoryModel> selectOne(@PathVariable Long sequenceNbr){
return ResponseHelper.buildResponse(templateCategoryService.queryBySeq(sequenceNbr));
}
/**
* 列表全部数据查询
*
* @return List<ApiSourceDto>
*/
@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<TemplateCategoryModel>> selectForList(){
return ResponseHelper.buildResponse(templateCategoryService.queryForTplCateList());
}
/**
* 列表树形结构查询
*
* @return List<ApiSourceDto>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "GET", value = "列表树形结构查询", notes = "列表树形结构查询")
@GetMapping(value = "/tree")
public ResponseModel<List<TplCateTreeModel>> selectForTree(){
return ResponseHelper.buildResponse(visualDesignerService.getList());
public ResponseModel<List<TemplateCategoryTreeModel>> selectForTree(){
return ResponseHelper.buildResponse(templateCategoryService.getTree());
}
}
src/main/java/com/yeejoin/amos/api/tool/controller/TplResource.java → src/main/java/com/yeejoin/amos/api/tool/controller/TemplateResource.java
View file @ 5120e09f
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;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.StringUtil;
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.io.IOException;
import java.util.*;
@CrossOrigin
@RestController
@Api(tags = "模板管理Api")
@RequestMapping(value = "/tpl")
public class TplResource {
public class TemplateResource {
@Autowired
TplService tplService;
private TemplateService templateService;
/**
* 新增
*
* @return
* @param tplVoModel 页面表单数据
* @return TemplateModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<TplModel> save(@RequestBody TplVoModel tplVoModel) throws Exception {
tplVoModel.setIsDel(false);
public ResponseModel<TemplateModel> save(@RequestBody TemplateVoModel tplVoModel) throws Exception {
tplVoModel.setDisplayName(tplVoModel.getComName());
TplModel tplModel = new TplModel();
tplService.convertModel(tplVoModel, tplModel);
return ResponseHelper.buildResponse(tplService.createWithModel(tplModel));
return ResponseHelper.buildResponse(templateService.createWithModel(templateService.convertModel(tplVoModel)));
}
/**
* 根据sequenceNbr更新
*
* @param tplVoModel 模板信息
* @param sequenceNbr 主键
* @return
* @return TemplateModel
*/
@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));
return ResponseHelper.buildResponse(templateService.updateWithModel(templateService.convertModel(tplVoModel)));
}
/**
* 根据sequenceNbr删除
*
* @param sequenceNbr 主键
* @return
* @return Boolean
*/
@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(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
return ResponseHelper.buildResponse(templateService.removeById(sequenceNbr));
}
/**
* 根据sequenceNbr删除多项
*
* @param sequenceNbr 主键
* @return
* @return String
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@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);
return ResponseHelper.buildResponse("Succeed!");
public ResponseModel<Boolean> deleteModelsBySequenceNbr(@PathVariable(value = "sequenceNbr") String sequenceNbr) {
return ResponseHelper.buildResponse(templateService.removeByIds(Arrays.asList(StringUtil.string2Array(sequenceNbr))));
}
/**
* 根据sequenceNbr查询
*
* @param sequenceNbr 主键
* @return
* @return TemplateVoModel
*/
@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());
return ResponseHelper.buildResponse(tplVoModel);
public ResponseModel<TemplateVoModel> selectOne(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(templateService.queryForTplVo(sequenceNbr));
}
/**
* 列表分页查询
*
* @param current 当前页
* @param size 每页大小
* @return
* @param categorySeq 模板分类ID
* @param displayName 模板名称
* @return Page<TemplateModel>
*/
@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));
}
/**
* 列表全部数据查询
*
* @return
* @return List<TemplateModel>
*/
@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());
}
/**
* 导入
*
* @return
* @param multipartFile 文件
* @return TemplateModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@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));
String str = "1668429235251548162";
TplModel tplModel = new TplModel(content, "", "", "", Long.parseLong(str), false, false);
return ResponseHelper.buildResponse(tplService.createWithModel(tplModel));
public ResponseModel<TemplateModel> importTpl(@RequestParam("file") MultipartFile multipartFile) throws IOException {
return ResponseHelper.buildResponse(templateService.createWithModel(templateService.fileToTpl(multipartFile)));
}
}
src/main/java/com/yeejoin/amos/api/tool/face/model/AgencyTreeModel.java
View file @ 5120e09f
......@@ -11,7 +11,7 @@ import org.typroject.tyboot.core.rdbms.model.BaseModel;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "DataBaseModel", description = "")
@ApiModel(value = "DataBaseLinkModel", description = "")
public class AgencyTreeModel extends BaseModel {
@ApiModelProperty(value = "机构名称")
......
src/main/java/com/yeejoin/amos/api/tool/face/model/DataBaseModel.java → src/main/java/com/yeejoin/amos/api/tool/face/model/DataBaseLinkModel.java
View file @ 5120e09f
......@@ -13,8 +13,8 @@ import org.typroject.tyboot.core.rdbms.model.BaseModel;
@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@ApiModel(value = "DataBaseModel", description = "")
public class DataBaseModel extends BaseModel {
@ApiModel(value = "DataBaseLinkModel", description = "")
public class DataBaseLinkModel extends BaseModel {
@ApiModelProperty(value = "数据名称")
private String dataName = "";
......@@ -31,12 +31,10 @@ public class DataBaseModel extends BaseModel {
@ApiModelProperty(value = "用户名")
private String userName;
@ApiModelProperty(value = "密码")
private String passWord;
public DataBaseModel(String dataName, String ip, String port, String dbName, String userName, String passWord) {
public DataBaseLinkModel(String dataName, String ip, String port, String dbName, String userName, String passWord) {
this.dataName = dataName;
this.ip = ip;
this.port = port;
......
src/main/java/com/yeejoin/amos/api/tool/face/model/PicModel.java → src/main/java/com/yeejoin/amos/api/tool/face/model/PictureModel.java
View file @ 5120e09f
package com.yeejoin.amos.api.tool.face.model;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......@@ -7,16 +8,18 @@ import lombok.NoArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class PicModel {
public class PictureModel {
@ApiModelProperty(value = "图片名称")
private String name;
@ApiModelProperty(value = "图片UID")
private String uid;
@ApiModelProperty(value = "图片url")
private String url;
@ApiModelProperty(value = "图片状态")
private String status;
}
src/main/java/com/yeejoin/amos/api/tool/face/model/RelationModel.java
View file @ 5120e09f
......@@ -11,15 +11,15 @@ import org.typroject.tyboot.core.rdbms.model.BaseModel;
@ApiModel(value = "RelationModel", description = "")
public class RelationModel extends BaseModel {
@ApiModelProperty(value = "表1名称")
private String table1;
@ApiModelProperty(value = "父表名称")
private String parentName;
@ApiModelProperty(value = "表1字段")
private String field1;
@ApiModelProperty(value = "父表字段")
private String parentField;
@ApiModelProperty(value = "表2名称")
private String table2;
@ApiModelProperty(value = "表名称")
private String name;
@ApiModelProperty(value = "表2字段")
private String field2;
@ApiModelProperty(value = "表字段")
private String field;
}
src/main/java/com/yeejoin/amos/api/tool/face/model/RelationTreeModel.java
View file @ 5120e09f
......@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.ArrayList;
import java.util.List;
@Data
......@@ -25,13 +26,11 @@ public class RelationTreeModel {
private String parentName;
@ApiModelProperty(value = "子节点")
private List<RelationTreeModel> children;
private List<RelationTreeModel> children = new ArrayList<>();
public RelationTreeModel(String name, String field,String parentField , String parentName, List<RelationTreeModel> children) {
public RelationTreeModel(String name, String field,String parentField ) {
this.name = name;
this.field = field;
this.parentField = parentField;
this.parentName = parentName;
this.children = children;
}
}
src/main/java/com/yeejoin/amos/api/tool/face/model/TplCateModel.java → src/main/java/com/yeejoin/amos/api/tool/face/model/TemplateCategoryModel.java
View file @ 5120e09f
......@@ -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="TemplateCategoryModel", description="")
public class TemplateCategoryModel extends BaseModel {
@ApiModelProperty(value = "模板分类名称")
private String cateName;
......@@ -21,16 +21,8 @@ public class TplCateModel extends BaseModel {
private String designerType;
@ApiModelProperty(value = "图标路径")
private String icon;
private String icon = "";
@ApiModelProperty(value = "是否删除")
private Boolean isDel;
public void setIcon(String icon) {
this.icon = icon;
}
public void setIsDel(Boolean isDel) {
this.isDel = isDel;
}
private Boolean isDel = false;
}
src/main/java/com/yeejoin/amos/api/tool/face/model/TplCateTreeModel.java → src/main/java/com/yeejoin/amos/api/tool/face/model/TemplateCategoryTreeModel.java
View file @ 5120e09f
......@@ -10,34 +10,35 @@ import java.util.List;
@Data
@NoArgsConstructor
@ApiModel(value="TplCateTreeModel", description="")
public class TplCateTreeModel {
@ApiModel(value="TemplateCategoryTreeModel", description="")
public class TemplateCategoryTreeModel {
@ApiModelProperty(value = "物理主键")
private Long sequenceNbr;
@ApiModelProperty(value = "父ID")
private Long parentId;
private Long parentId = 0L;
@ApiModelProperty(value = "名称")
private String name;
@ApiModelProperty(value = "设计器类型")
private String designerType;
private String designerType = "";
@ApiModelProperty(value = "子列表")
private List<TplCateTreeModel> children = new ArrayList<>();
private List<TemplateCategoryTreeModel> children = new ArrayList<>();
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public TplCateTreeModel(Long sequenceNb, Long parentId, String name,String designerType){
public TemplateCategoryTreeModel(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 TemplateCategoryTreeModel(Long sequenceNb, Long parentId, String name, String designerType,
List<TemplateCategoryTreeModel> 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
View file @ 5120e09f
......@@ -16,16 +16,16 @@ 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;
protected String displayName = "";
@ApiModelProperty(value = "模板标识")
protected String comKey;
protected String comKey = "";
@ApiModelProperty(value = "模板名称")
protected String comName;
protected String comName = "";
@ApiModelProperty(value = "模板内容")
@TableField(typeHandler = JacksonTypeHandler.class)
......@@ -35,7 +35,7 @@ public class TplModel extends BaseModel {
protected Long cateSeq;
@ApiModelProperty(value = "模板状态")
protected Boolean openStatus;
protected Boolean openStatus = false;
@ApiModelProperty(value = "缩略图")
protected String thumb;
......@@ -44,7 +44,7 @@ public class TplModel extends BaseModel {
protected String sketch;
@ApiModelProperty(value = "是否删除")
protected Boolean isDel;
protected Boolean isDel = false;
public void setThumb(String thumb) {
......@@ -55,14 +55,8 @@ 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, Long cateSeq) {
this.content = content;
this.displayName =displayName;
this.comKey = comKey;
this.comName = comName;
this.cateSeq = cateSeq;
this.openStatus = openStatus;
this.isDel = isDel;
}
}
src/main/java/com/yeejoin/amos/api/tool/face/model/TplVoModel.java → src/main/java/com/yeejoin/amos/api/tool/face/model/TemplateVoModel.java
View file @ 5120e09f
......@@ -14,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/DataBaseMapper.java → src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/DataBaseLinkMapper.java
View file @ 5120e09f
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.DataBase;
import com.yeejoin.amos.api.tool.face.orm.entity.DataBaseLink;
import org.mapstruct.Mapper;
import org.springframework.stereotype.Repository;
......@@ -13,5 +13,5 @@ import org.springframework.stereotype.Repository;
@Mapper
@Repository
public interface DataBaseMapper extends BaseMapper<DataBase> {
public interface DataBaseLinkMapper extends BaseMapper<DataBaseLink> {
}
src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/RelationMapper.java
View file @ 5120e09f
......@@ -5,14 +5,23 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yeejoin.amos.api.tool.face.orm.entity.Relation;
import com.yeejoin.amos.api.tool.face.service.RelationService;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.SelectProvider;
import org.mapstruct.Mapper;
import org.springframework.stereotype.Repository;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
@Mapper
@Repository
public interface RelationMapper extends BaseMapper<Relation> {
@SelectProvider(type = RelationService.class, method = "deleteDataBase")
@SqlParser(filter = true)
List<Relation> deleteDataBase(@Param("maps") List<HashMap<String,String>> maps);
@Select("${sqlStr}")
List<HashMap<String,String>> getPublicItems(@Param(value = "sqlStr") String sqlStr);
}
src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/TplCateMapper.java → src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/TemplateCategoryMapper.java
View file @ 5120e09f
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.TemplateCategory;
public interface TplCateMapper extends BaseMapper<TplCate> {
public interface TemplateCategoryMapper extends BaseMapper<TemplateCategory> {
}
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
View file @ 5120e09f
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/DataBase.java → src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/DataBaseLink.java
View file @ 5120e09f
......@@ -16,8 +16,8 @@ import lombok.experimental.Accessors;
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@TableName("database_join_record")
public class DataBase extends BaseEntity {
@TableName("database_link")
public class DataBaseLink extends BaseEntity {
/**
*数据名称
......
src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/Relation.java
View file @ 5120e09f
......@@ -16,24 +16,24 @@ public class Relation extends BaseEntity {
* 表1
*/
@TableField("table1")
private String table1;
private String parentName;
/**
* 表1 字段
*/
@TableField("table1_field")
private String field1;
private String parentField;
/**
* 表2
*/
@TableField("table2")
private String table2;
private String name;
/**
* 表2 字段
*/
@TableField("table2_field")
private String field2;
private String field;
}
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
View file @ 5120e09f
......@@ -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/TemplateCategory.java
View file @ 5120e09f
......@@ -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 TemplateCategory extends BaseEntity {
/**
*分类名称
......
src/main/java/com/yeejoin/amos/api/tool/face/service/AgencyTreeService.java
View file @ 5120e09f
......@@ -16,7 +16,7 @@ import java.util.List;
public class AgencyTreeService extends BaseService<AgencyTreeModel, AgencyTree, AgencyTreeMapper> {
/**
* 列表查询 示例
* 列表查询
*/
public List<AgencyTreeModel> queryForAgencyTreeList() {
return this.queryForList("" , false);
......
src/main/java/com/yeejoin/amos/api/tool/face/service/AmosDemoService.java
View file @ 5120e09f
......@@ -31,7 +31,7 @@ public class AmosDemoService extends BaseService<AmosDemoModel,AmosDemo,AmosDemo
}
/**
* 列表查询 示例
* 列表查询
*/
public List<AmosDemoModel> queryForAmosDemoList(String agencyCode) {
return this.queryForList("" , false, agencyCode);
......
src/main/java/com/yeejoin/amos/api/tool/face/service/ApiInfoService.java
View file @ 5120e09f
......@@ -3,18 +3,16 @@ package com.yeejoin.amos.api.tool.face.service;
import com.yeejoin.amos.api.tool.face.orm.entity.ApiInfo;
import com.yeejoin.amos.api.tool.face.orm.dao.ApiInfoMapper;
import com.yeejoin.amos.api.tool.face.model.ApiInfoModel;
import org.apache.commons.beanutils.ConvertUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.ArrayList;
import java.util.List;
@Service
public class ApiInfoService extends BaseService<ApiInfoModel,ApiInfo,ApiInfoMapper> {
@Autowired
ApiSourceService apiSourceService;
/**
* 分页查询
......@@ -24,29 +22,30 @@ public class ApiInfoService extends BaseService<ApiInfoModel,ApiInfo,ApiInfoMapp
}
/**
* 列表查询 示例
* 列表查询
*/
public List<ApiInfoModel> queryForApiInfoList() {
return this.queryForList("" , false);
}
/**
* 列表查询 示例
* 根据来源获取Api列表
*/
public List<ApiInfoModel> queryForApiInfoListByApiSource(String apiSource) {
public List<ApiInfoModel> selectByApiSource(String apiSource) {
return this.queryForList("" , false,apiSource);
}
/**
* 删除多个模板
* 根据来源获取Api列表主键
*/
public Boolean[] deleteByIds(String sequenceNbr){
String[] arr = sequenceNbr.split(",");
Long[] seq = (Long[]) ConvertUtils.convert(arr, Long.class);
Boolean[] arr2 = new Boolean[arr.length];
for (int i = 0;i < arr.length;i++){
arr2[i] = this.removeById(seq[i]);
public List<String> selectSeqByApiSource(String apiSource) {
List<String> sequenceNbrs = new ArrayList<>();
for(ApiInfoModel model : this.selectByApiSource(apiSource)){
sequenceNbrs.add(Long.toString(model.getSequenceNbr()));
}
return arr2;
return sequenceNbrs;
}
}
src/main/java/com/yeejoin/amos/api/tool/face/service/ApiSourceService.java
View file @ 5120e09f
......@@ -13,12 +13,15 @@ public class ApiSourceService extends BaseService<ApiSourceModel, ApiSource, Api
/**
* 列表查询 示例
* 列表查询
*/
public List<ApiSourceModel> queryForApiSourceList() {
return this.queryForList("", false);
}
/**
* 根据机构ID获取机构编码
*/
public String queryCodeById(Long sequenceNbr){
ApiSourceModel model = this.queryModelByParams(sequenceNbr);
return model.getCode();
......
src/main/java/com/yeejoin/amos/api/tool/face/service/DataBaseService.java → src/main/java/com/yeejoin/amos/api/tool/face/service/DataBaseLinkService.java
View file @ 5120e09f
......@@ -2,10 +2,11 @@ package com.yeejoin.amos.api.tool.face.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.api.tool.face.model.DataBaseModel;
import com.yeejoin.amos.api.tool.face.orm.dao.DataBaseMapper;
import com.yeejoin.amos.api.tool.face.orm.entity.DataBase;
import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel;
import com.yeejoin.amos.api.tool.face.orm.dao.DataBaseLinkMapper;
import com.yeejoin.amos.api.tool.face.orm.entity.DataBaseLink;
import com.yeejoin.amos.api.tool.utils.AESUtils;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
......@@ -23,38 +24,28 @@ import java.util.List;
@Service
public class DataBaseService extends BaseService<DataBaseModel, DataBase, DataBaseMapper> {
public class DataBaseLinkService extends BaseService<DataBaseLinkModel, DataBaseLink, DataBaseLinkMapper> {
@Autowired
private DataBaseMapper dataBaseMapper;
private DataBaseLinkMapper dataBaseLinkMapper;
/**
* 分页查询
*/
public Page<DataBaseModel> queryForDataBasePage(Page<DataBaseModel> page) {
public Page<DataBaseLinkModel> queryForDataBasePage(Page<DataBaseLinkModel> page) {
return this.queryForPage(page, null, false);
}
/**
* 列表查询 示例
* 列表查询
*/
public List<DataBaseModel> queryForDataBaseList() {
public List<DataBaseLinkModel> queryForDataBaseList() {
return this.queryForList("", false);
}
public List<DataBaseModel> queryForDbInfoListByApiSource(String apiSource) {
return this.queryForList("", false, apiSource);
}
public Long[] stringToLong(String sequenceNbrs) {
String[] seqs = sequenceNbrs.split(",");
Long[] seq = new Long[seqs.length];
for (int i = 0; i < seqs.length; i++) {
seq[i] = Long.parseLong(seqs[i]);
}
return seq;
}
public String[] getDataBaseName(Connection connection) throws ClassNotFoundException, SQLException {
/**
* 获取数据库名称
*/
public String[] getDataBaseName(Connection connection) throws SQLException {
Statement stmt = connection.createStatement();
ResultSet rs = stmt.executeQuery("SHOW DATABASES");
String[] result = new String[1000];
......@@ -65,43 +56,52 @@ public class DataBaseService extends BaseService<DataBaseModel, DataBase, DataBa
return result;
}
public List<DataBaseModel> refreshDataBase(DataBaseModel dataBaseModel) throws Exception {
/**
* 初始化数据库连接表
*/
public List<DataBaseLinkModel> refreshDataBase(DataBaseLinkModel dataBaseLinkModel) throws Exception {
//清空表单
this.remove(new QueryWrapper<>());
//连接数据库
String url = "jdbc:mysql://" + dataBaseModel.getIp() + ":" + dataBaseModel.getPort() + "/";
String user = dataBaseModel.getUserName();
String pwd = dataBaseModel.getPassWord();
Class.forName("com.mysql.cj.jdbc.Driver");
Connection connection = DriverManager.getConnection(url, user, pwd);
Connection connection = this.connectNewDatabase(dataBaseLinkModel);
pwd = AESUtils.encrypt(pwd);
if (connection == null)
return null;
List<DataBaseModel> dataBaseModels = new ArrayList<>();
Collection<DataBase> dataBases = new ArrayList<>();
String[] dataBaseName = this.getDataBaseName(connection);
for (String name : dataBaseName) {
List<DataBaseLinkModel> dataBaseLinkModels = new ArrayList<>();
Collection<DataBaseLink> dataBaseLinks = new ArrayList<>();
for (String name : this.getDataBaseName(connection)) {
if (name == null)
break;
DataBaseModel model = new DataBaseModel(name, dataBaseModel.getIp(), dataBaseModel.getPort(), name, user, pwd);
dataBaseModels.add(model);
DataBase dataBase = this.prepareEntity(model);
dataBases.add(dataBase);
DataBaseLinkModel model = new DataBaseLinkModel();
BeanUtils.copyProperties(model, dataBaseLinkModel);
model.setDbName(name);
model.setDataName(name);
dataBaseLinkModels.add(model);
dataBaseLinks.add(this.prepareEntity(model));
}
this.saveBatch(dataBases);
this.saveBatch(dataBaseLinks);
connection.close();
return dataBaseModels;
return dataBaseLinkModels;
}
public Connection connectNewDatabase(DataBaseModel dataBaseModel) throws Exception {
/**
* 连接数据库
*/
public Connection connectNewDatabase(DataBaseLinkModel model) throws Exception {
// 加载数据库驱动
Class.forName("com.mysql.cj.jdbc.Driver");
// 连接新增的数据库
String dbUrl = "jdbc:mysql://" + dataBaseModel.getIp() + ":" + dataBaseModel.getPort() + "/" + dataBaseModel.getDbName();
dataBaseModel.setPassWord(AESUtils.decrypt(dataBaseModel.getPassWord()));
return DriverManager.getConnection(dbUrl, dataBaseModel.getUserName(), dataBaseModel.getPassWord());
String dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" + model.getDbName();
// 解密pwd，并连接
return DriverManager.getConnection(dbUrl, model.getUserName(),AESUtils.decrypt(model.getPassWord()));
}
/**
* 加密model里的密码
*/
public DataBaseLinkModel encryptPwd(DataBaseLinkModel model) throws Exception {
model.setPassWord(AESUtils.encrypt(model.getPassWord()));
return model;
}
}
src/main/java/com/yeejoin/amos/api/tool/face/service/RelationService.java
View file @ 5120e09f
package com.yeejoin.amos.api.tool.face.service;
import com.yeejoin.amos.api.tool.face.model.DataBaseLinkModel;
import com.yeejoin.amos.api.tool.face.model.RelationModel;
import com.yeejoin.amos.api.tool.face.model.RelationTreeModel;
import com.yeejoin.amos.api.tool.face.orm.dao.RelationMapper;
import com.yeejoin.amos.api.tool.face.orm.entity.Relation;
import org.apache.commons.beanutils.ConvertUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.foundation.utils.StringUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.sql.*;
......@@ -18,20 +21,33 @@ import java.util.List;
public class RelationService extends BaseService<RelationModel, Relation, RelationMapper> {
@Autowired
DataBaseService dataBaseService;
private RelationMapper relationMapper;
@Autowired
private DataBaseLinkService dataBaseLinkService;
@Autowired
private AgencyTreeService agencyTreeService;
/**
* 根据机构删除
*/
public void deleteAgency(Long agencyCodeId, String sequenceNbrs) throws Exception {
for (Long seq : (Long[]) ConvertUtils.convert(StringUtil.string2Array(sequenceNbrs),Long.class)) {
DataBaseLinkModel model = dataBaseLinkService.queryBySeq(seq);
Connection connection = dataBaseLinkService.connectNewDatabase(model);
this.deleteDataBase(
connection, agencyTreeService.queryForAgencyCodeById(agencyCodeId), model.getDbName());
}
}
/**
* 删除数据库
*/
public String deleteDataBase(Connection connection, String agencyCode) throws SQLException {
public String deleteDataBase(Connection connection, String agencyCode, String dbName) 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(dbName);
for (RelationTreeModel tree : trees) {
//根据根节点获得根节点相关列表
List<RelationTreeModel> array = this.createList(tree);
......@@ -39,8 +55,7 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
System.out.println(this.createSqlByArray(array,agencyCode));
System.out.println(statementSql(this.createSqlByArray(array, agencyCode),connection));
}
} catch (ClassNotFoundException | SQLException e) {
} catch (SQLException e) {
e.printStackTrace();
}
connection.close();
......@@ -66,20 +81,10 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
/**
* 获取关系表转化为map
*/
public List<HashMap<String, String>> queryRelation(Connection connection) throws SQLException {
Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery("SELECT * FROM relation ;");
ResultSetMetaData data = resultSet.getMetaData();
List<HashMap<String, String>> maps = new ArrayList<>();
while (resultSet.next()) {
HashMap<String, String> map = new HashMap<>();
for (int i = 1; i <= data.getColumnCount(); i++) {
map.put(data.getColumnName(i), resultSet.getString(data.getColumnName(i)));
}
maps.add(map);
}
resultSet.close();
statement.close();
public List<HashMap<String, String>> queryRelation(String dbName) throws SQLException {
StringBuilder sql = new StringBuilder("SELECT * FROM ");
sql.append(dbName).append("_relation;");
List<HashMap<String,String>> maps = relationMapper.getPublicItems(sql.toString());
return maps;
}
......@@ -103,11 +108,12 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
public List<RelationTreeModel> createNodes(List<HashMap<String, String>> maps) {
List<RelationTreeModel> relationTreeModels = new ArrayList<>();
for (HashMap<String, String> map : maps) {
RelationTreeModel model = new RelationTreeModel();
RelationTreeModel model = new RelationTreeModel(
map.get("TABLE2"), map.get("TABLE2_FIELD"), map.get("TABLE1_FIELD"));
if (map.get("TABLE1") == null)
model = new RelationTreeModel(map.get("TABLE2"), map.get("TABLE2_FIELD"), map.get("TABLE1_FIELD"), "", null);
model.setParentName("");
else
model = new RelationTreeModel(map.get("TABLE2"), map.get("TABLE2_FIELD"), map.get("TABLE1_FIELD"), map.get("TABLE1"), null);
model.setParentName(map.get("TABLE1"));
relationTreeModels.add(model);
}
return relationTreeModels;
......@@ -116,8 +122,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(String dbName) throws SQLException {
List<HashMap<String, String>> maps = this.queryRelation(dbName);
List<RelationTreeModel> trees = new ArrayList<>();
trees.addAll(createTree(createNodes(maps), ""));
return trees;
......@@ -130,7 +136,8 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
StringBuilder sql = new StringBuilder();
if (array.size() == 1) {
sql.append("DELETE FROM ").append(array.get(0).getName()).append(" WHERE ");
sql.append(array.get(0).getName()).append(".").append(array.get(0).getField()).append(" = '").append(agencyCode).append("' ;");
sql.append(array.get(0).getName()).append(".").append(array.get(0).getField());
sql.append(" = '").append(agencyCode).append("' ;");
} else {
sql.append("DELETE ").append(array.get(0).getName());
for (RelationTreeModel model : array) {
......@@ -145,7 +152,8 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
sql.append(model.getName()).append(".").append(model.getField());
}
}
sql.append(" WHERE ").append(array.get(0).getName()).append(".").append(array.get(0).getField()).append(" = '").append(agencyCode).append("' ;");
sql.append(" WHERE ").append(array.get(0).getName()).append(".").append(array.get(0).getField());
sql.append(" = '").append(agencyCode).append("' ;");
}
return sql;
}
......
src/main/java/com/yeejoin/amos/api/tool/face/service/TemplateCategoryService.java 0 → 100644
View file @ 5120e09f
package com.yeejoin.amos.api.tool.face.service;
import com.yeejoin.amos.api.tool.face.model.TemplateCategoryModel;
import com.yeejoin.amos.api.tool.face.model.TemplateCategoryTreeModel;
import com.yeejoin.amos.api.tool.face.orm.dao.TemplateCategoryMapper;
import com.yeejoin.amos.api.tool.face.orm.entity.TemplateCategory;
import org.springframework.beans.factory.annotation.Autowired;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
@Service
public class TemplateCategoryService extends BaseService<TemplateCategoryModel, TemplateCategory, TemplateCategoryMapper> {
@Autowired
private VisualDesignerService visualDesignerService;
/**
* 列表查询
*/
public List<TemplateCategoryModel> queryForTplCateList() {
return this.queryForList("", false);
}
/**
* 模板分类表单数据转化为树形节点
*/
public List<TemplateCategoryTreeModel> tplCateToNode(List<TemplateCategoryModel> templateCategoryModels){
List<TemplateCategoryTreeModel> nodes = new ArrayList<>();
for (TemplateCategoryModel model : templateCategoryModels){
TemplateCategoryTreeModel node = new TemplateCategoryTreeModel();
node.setName(model.getCateName());
node.setSequenceNbr(model.getSequenceNbr());
node.setParentId(1L);
node.setDesignerType(model.getDesignerType());
nodes.add(node);
}
return nodes;
}
/**
* 获得模板分类树
*/
public List<TemplateCategoryTreeModel> getTree() {
List<TemplateCategoryTreeModel> nodes = this.tplCateToNode(this.queryForTplCateList());
nodes.addAll(visualDesignerService.VisualDesignerToNode(visualDesignerService.queryForVisualDesignerList()));
return getChildren(nodes, "", 0L);
}
/**
* 获得模板分类子节点（递归）
*/
public List<TemplateCategoryTreeModel> getChildren(List<TemplateCategoryTreeModel> nodes, String parent, Long id){
List<TemplateCategoryTreeModel> tree = new ArrayList<>();
for (TemplateCategoryTreeModel node : nodes){
if(node.getParentId() == 0L && parent.equals("")){
node.setChildren(getChildren(nodes, node.getDesignerType(), node.getSequenceNbr()));
tree.add(node);
}
else {
if (parent.equals(node.getDesignerType()) && node.getParentId() != 0L) {
node.setParentId(id);
tree.add(node);
}
}
}
return tree;
}
}
src/main/java/com/yeejoin/amos/api/tool/face/service/TplService.java → src/main/java/com/yeejoin/amos/api/tool/face/service/TemplateService.java
View file @ 5120e09f
package com.yeejoin.amos.api.tool.face.service;
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.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.utils.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.utils.ConvertUtil;
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.rdbms.service.BaseService;
......@@ -22,64 +22,67 @@ import java.util.List;
import java.util.UUID;
@Service
public class TplService extends BaseService<TplModel, Tpl, TplMapper> {
@Autowired
TplService tplService;
@Autowired
TplCateService tplCateService;
@Autowired
VisualDesignerService visualDesignerService;
public class TemplateService extends BaseService<TemplateModel, Template, TemplateMapper> {
/**
* 分页查询
*/
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);
}
/**
* 根据模板分类ID获取模板sequenceNb's
*/
public List<String> selectSeqsByCategorySeq(Long categorySeq){
List<String> strings = new ArrayList<>();
for (TemplateModel model : this.queryForTplListByCategorySeq(categorySeq)){
strings.add(Long.toString(model.getSequenceNbr()));
}
return strings;
}
/**
* 列表查询
*/
public List<TplModel> queryForTplList() {
public List<TemplateModel> queryForTplList() {
return this.queryForList("", false);
}
/**
* TplVoModel转化TplModel
* 根据sequenceNbr获取模板并转化为VO
*/
public TplModel convertModel(TplVoModel tplVoModel, TplModel tplModel) throws NoSuchFieldException, IllegalAccessException {
BeanUtils.copyProperties(tplVoModel, tplModel, "thumbs", "sketches", "contentStr");
//判定thumbs为空
if (tplVoModel.getThumbs().size() != 0)
tplModel.setThumb(PicUtil.objectListToUrl(tplVoModel.getThumbs()));
// tplModel.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;
public TemplateVoModel queryForTplVo(Long sequenceNbr){
TemplateModel templateModel = this.queryBySeq(sequenceNbr);
TemplateVoModel templateVoModel = this.convertVoModel(templateModel);
if (templateModel.getContent() != null) {
templateVoModel.setContentStr(templateModel.getContent().toString());
}
return templateVoModel;
}
/**
* 删除多个模板
* TplVoModel转化TplModel
*/
public void deleteByIds(String sequenceNbr) {
String[] seqs = sequenceNbr.split(",");
Long[] seq = new Long[seqs.length];
for (int i = 0; i < seq.length; i++) {
seq[i] = Long.parseLong(seqs[i]);
this.removeById(seq[i]);
public TemplateModel convertModel(TemplateVoModel tplVoModel) throws NoSuchFieldException, IllegalAccessException {
TemplateModel templateModel = new TemplateModel();
BeanUtils.copyProperties(tplVoModel, templateModel, "thumbs", "sketches", "contentStr");
//判定thumbs为空
if (tplVoModel.getThumbs().size() != 0) {
templateModel.setThumb(ConvertUtil.objectListToUrl(tplVoModel.getThumbs()));
}
//判定sketch为空
if (tplVoModel.getSketches().size() != 0) {
templateModel.setSketch(ConvertUtil.objectListToUrl(tplVoModel.getSketches()));
}
templateModel.setContent(JSON.parseObject(tplVoModel.getContentStr()));
return templateModel;
}
/**
......@@ -96,28 +99,46 @@ 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()));
/**
* 通过json文件建立空白模板
*/
public TemplateModel fileToTpl(MultipartFile multipartFile) throws IOException {
JSONObject content = JSON.parseObject(this.readMultipartFile(multipartFile));
String str = "1668429235251548162";
return new TemplateModel(content, Long.parseLong(str));
}
/**
* model转化VO
*/
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;
}
/**
* 生成随机UID
*/
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;
/**
* url转化图片
*/
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/TplCateService.java deleted 100644 → 0
View file @ b82e4f86
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 org.springframework.beans.factory.annotation.Autowired;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
import java.util.List;
@Service
public class TplCateService extends BaseService<TplCateModel, TplCate, TplCateMapper> {
@Autowired
VisualDesignerService visualDesignerService;
/**
* 列表查询 示例
*/
public List<TplCateModel> queryForTplCateList() {
return this.queryForList("", false);
}
}
src/main/java/com/yeejoin/amos/api/tool/face/service/VisualDesignerService.java
View file @ 5120e09f
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.TemplateCategoryTreeModel;
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService;
......@@ -17,40 +15,30 @@ import java.util.List;
@Service
public class VisualDesignerService extends BaseService<VisualDesignerModel, VisualDesigner, VisualDesignerMapper> {
@Autowired
TplCateService tplCateService;
@Autowired
VisualDesignerService visualDesignerService;
/**
* 列表查询 示例
* 列表查询
*/
// 父List
public List<VisualDesignerModel> queryForVisualDesignerList() {
return this.queryForList("", false);
}
public List<TplCateTreeModel> getList() {
List<TplCateTreeModel> treeList = new ArrayList<>();
List<TplCateModel> tplCateModels = tplCateService.queryForTplCateList();
List<VisualDesignerModel> visualDesignerModels = visualDesignerService.queryForVisualDesignerList();
for(int i = 0; i < visualDesignerModels.size();i++){
TplCateTreeModel tplCateTreeModel1 = new
TplCateTreeModel(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);
}
}
treeList.add(i,tplCateTreeModel1);
/**
* 设计器表单数据转化为树形节点
*/
public List<TemplateCategoryTreeModel> VisualDesignerToNode (List<VisualDesignerModel> visualDesignerModels){
List<TemplateCategoryTreeModel> nodes = new ArrayList<>();
for (VisualDesignerModel model : visualDesignerModels){
TemplateCategoryTreeModel node = new TemplateCategoryTreeModel();
node.setSequenceNbr(model.getSequenceNbr());
node.setName(model.getDesignerName());
node.setDesignerType(model.getDesignerType());
nodes.add(node);
}
return treeList;
return nodes;
}
}
\ No newline at end of file
src/main/java/com/yeejoin/amos/api/tool/utils/PicUtil.java → src/main/java/com/yeejoin/amos/api/tool/utils/ConvertUtil.java
View file @ 5120e09f
package com.yeejoin.amos.api.tool.utils;
import org.apache.commons.beanutils.ConvertUtils;
import java.lang.reflect.Field;
import java.util.List;
public class PicUtil {
public class ConvertUtil {
/**
* 图像对象列表提取url
*/
public static <Object> String objectListToUrl(List<Object> objectList) throws IllegalAccessException, NoSuchFieldException {
if (objectList.isEmpty()) {
......@@ -19,13 +25,6 @@ public class PicUtil {
return field.get(objectList.get(0)).toString();
}
// 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");
// picUtils.add(picUtil);
// return picUtils;
// }
}
src/main/resources/application-dev.properties
View file @ 5120e09f
#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
View file @ 5120e09f
spring.application.name=DemoProject
server.servlet.context-path=/atl
server.port=30201
#server.port=30201
server.port=20000
spring.profiles.active=dev
management.health.elasticsearch.enabled=false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment