Commit e63bea1e authored by chenzai's avatar chenzai

换数据库

parent d028040d
......@@ -206,6 +206,7 @@
<artifactId>log4j-to-slf4j</artifactId>
<version>2.17.0</version>
</dependency>
</dependencies>
</dependencyManagement>
......
package com.yeejoin.amos.api.tool;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyModel;
public class Test {
public static void main(String[] args) {
}
}
......@@ -9,9 +9,9 @@ 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.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.doc.TycloudResource;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
......@@ -20,9 +20,11 @@ import java.util.Map;
@CrossOrigin
@RestController
@Api(tags = "机构管理Api")
@Api(tags = "atl-机构管理")
@RequestMapping(value = "/agency")
@TycloudResource(module = "atl", value = "agency")
public class AgencyManagementResource {
@Autowired
private RelationService relationService;
@Autowired
......@@ -38,7 +40,7 @@ public class AgencyManagementResource {
* @param sequenceNbrs 多个主键
* @return String
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/relation/{agencyCode}/{sequenceNbrs}")
@ApiOperation(httpMethod = "DELETE", value = "机构删除", notes = "机构删除")
public ResponseModel<String> deleteDataBase(
......@@ -53,7 +55,7 @@ public class AgencyManagementResource {
*
* @return String
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/export/{agencyCode}/{ipSeq}/{dbSeqs}")
@ApiOperation(httpMethod = "GET", value = "导出", notes = "导出")
public void generateSQL(
......
......@@ -2,8 +2,8 @@ package com.yeejoin.amos.api.tool.controller;
import com.yeejoin.amos.api.tool.face.model.AmosDemoModel;
import com.yeejoin.amos.api.tool.face.service.AmosDemoService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.feign.privilege.Privilege;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.logging.log4j.LogManager;
......@@ -36,7 +36,7 @@ public class AmosDemoResource {
private AmosDemoService simpleService;
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "创建")
@RequestMapping(value = "", method = RequestMethod.POST)
public ResponseModel<AmosDemoModel> create(@RequestBody AmosDemoModel model) {
......@@ -44,7 +44,7 @@ public class AmosDemoResource {
return ResponseHelper.buildResponse(model);
}
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "更新")
@RequestMapping(value = "/{sequenceNbr}", method = RequestMethod.PUT)
public ResponseModel<AmosDemoModel> update(
......@@ -54,7 +54,7 @@ public class AmosDemoResource {
return ResponseHelper.buildResponse(simpleService.updateWithModel(model));
}
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询单个对象")
@RequestMapping(value = "/{sequenceNbr}", method = RequestMethod.GET)
public ResponseModel<AmosDemoModel> seleteOne(@PathVariable Long sequenceNbr) {
......@@ -62,7 +62,7 @@ public class AmosDemoResource {
}
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "分页查询")
@RequestMapping(value = "/page", method = RequestMethod.GET)
public ResponseModel<Page<AmosDemoModel>> queryForPage(
......@@ -76,7 +76,7 @@ public class AmosDemoResource {
}
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "列表查询")
@RequestMapping(value = "/list", method = RequestMethod.GET)
public ResponseModel selectForList(@RequestParam(value = "agencyCode") String agencyCode) {
......
......@@ -11,6 +11,7 @@ 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.doc.TycloudResource;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -20,7 +21,8 @@ import java.util.List;
@CrossOrigin
@RestController
@RequestMapping(value = "/scene")
@Api(tags = "场景展示Api")
@Api(tags = "atl-场景案例")
@TycloudResource(module = "atl", value = "scene")
public class AmosToolTemplateController {
@Autowired
......@@ -29,7 +31,7 @@ public class AmosToolTemplateController {
/**
* 添加单个记录
*/
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping("/save")
@ApiOperation(value = "新增", notes = "新增")
public ResponseModel<AmosToolTemplateModel> create(@RequestBody AmosToolTemplateVoModel amosToolTplVoModel) throws NoSuchFieldException, IllegalAccessException {
......@@ -39,7 +41,7 @@ public class AmosToolTemplateController {
/**
* 根据 sequenceNbr 删除
*/
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping("/{sequenceNbr}")
@ApiOperation(value = "删除")
public ResponseModel<Boolean> deleteById(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
......@@ -49,7 +51,7 @@ public class AmosToolTemplateController {
/**
* 根据 sequenceNbr 批量删除
*/
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/delete/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr批量删除", notes = "根据sequenceNbr批量删除")
public ResponseModel<Boolean> deleteModelsBySequenceNbr(@PathVariable(value = "sequenceNbr") String sequenceNbr) {
......@@ -59,7 +61,7 @@ public class AmosToolTemplateController {
/**
* 根据 sequenceNbr 编辑单个记录
*/
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "编辑")
@RequestMapping(value = "/{sequenceNbr}", method = RequestMethod.PUT)
public ResponseModel<AmosToolTemplateModel> update(
......@@ -72,7 +74,7 @@ public class AmosToolTemplateController {
/**
* 根据 sequenceNbr 查询单个记录
*/
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询单个对象")
@RequestMapping(value = "/{sequenceNbr}", method = RequestMethod.GET)
public ResponseModel<AmosToolTemplateVoModel> selectOne(@PathVariable Long sequenceNbr) {
......@@ -83,7 +85,7 @@ public class AmosToolTemplateController {
/**
* 根据字段查询
*/
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "查询大全")
@PostMapping("/select/all")
public ResponseModel<List<AmosToolTemplateModel>> query(@RequestParam(value = "categoryScene") String categoryScene,
......@@ -94,7 +96,7 @@ public class AmosToolTemplateController {
/**
* 列表所有记录
*/
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation("查询所有")
@GetMapping("/every")
public ResponseModel<List<AmosToolTemplateModel>> selectForList() {
......@@ -104,7 +106,7 @@ public class AmosToolTemplateController {
/**
* 列表分页查询
*/
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "分页查询")
@GetMapping(value = "/page")
public ResponseModel<Page<AmosToolTemplateModel>> queryForPage(
......@@ -119,7 +121,7 @@ public class AmosToolTemplateController {
/**
* 点击后根据 sequenceNbr 查看次数加一
*/
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "点击查看次数加一")
@PutMapping("/update")
public ResponseModel<Boolean> updateById(@RequestParam(value = "templateId") Long sequenceNbr) {
......
......@@ -33,7 +33,7 @@ public class ApiInfoResource {
* @param apiInfoModel API信息
* @return ApiInfoModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<ApiInfoModel> save(@RequestBody ApiInfoModel apiInfoModel) {
......@@ -46,7 +46,7 @@ public class ApiInfoResource {
* @param sequenceNbr 主键
* @return ApiInfoModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<ApiInfoModel> updateBySequenceNbrApiInfo(@RequestBody ApiInfoModel model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
......@@ -59,7 +59,7 @@ public class ApiInfoResource {
* @param sequenceNbr 主键
* @return Boolean
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr){
......@@ -71,7 +71,7 @@ public class ApiInfoResource {
* @param sequenceNbr 主键
* @return Boolean
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/delete/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除多项", notes = "根据sequenceNbr删除多项")
public ResponseModel<Boolean> deleteModelsBySequenceNbr(@PathVariable(value = "sequenceNbr")String sequenceNbr){
......@@ -83,7 +83,7 @@ public class ApiInfoResource {
* @param sequenceNbr 主键
* @return ApiInfoModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<ApiInfoModel> selectOne(@PathVariable Long sequenceNbr) throws Exception {
......@@ -98,7 +98,7 @@ public class ApiInfoResource {
* @param sequenceNbr 主键
* @return Page<ApiInfoModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
public ResponseModel<Page<ApiInfoModel>> queryForPage(
......@@ -117,7 +117,7 @@ public class ApiInfoResource {
* 列表全部数据查询
* @return List<ApiInfoModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<ApiInfoModel>> selectForList() {
......
......@@ -31,7 +31,7 @@ public class ApiSourceResource {
* @param model API来源信息
* @return ApiSourceDto
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<ApiSourceModel> save(@RequestBody ApiSourceModel model) {
......@@ -45,7 +45,7 @@ public class ApiSourceResource {
* @param sequenceNbr 编码
* @return ApiSourceDto
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<ApiSourceModel> updateBySeqApiSource(
......@@ -60,7 +60,7 @@ public class ApiSourceResource {
* @param sequenceNbr 编码
* @return Boolean
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
......@@ -72,7 +72,7 @@ public class ApiSourceResource {
* @param sequenceNbr 物理主键
* @return ApiSourceDto
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<ApiSourceModel> selectOne(@PathVariable Long sequenceNbr) {
......@@ -83,7 +83,7 @@ public class ApiSourceResource {
* 列表全部数据查询
* @return List<ApiSourceDto>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<ApiSourceModel>> selectForList() {
......
......@@ -49,7 +49,7 @@ public class DataApiResource {
*
* @throws SQLException
*/
@TycloudOperation(ApiLevel = UserType.ANONYMOUS, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "导出应用快搭增量脚本")
@RequestMapping(value = "/generateSQL", method = RequestMethod.GET)
public void generateSQL(
......@@ -75,7 +75,7 @@ public class DataApiResource {
/**
* 获取项目列表
*/
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "项目列表")
@GetMapping("/project/list")
public ResponseModel<List<ProjectModel>> selectByIpAgency(
......@@ -85,7 +85,7 @@ public class DataApiResource {
return ResponseHelper.buildResponse(studioResourceService.getProjectList(ipSeq, agencyCode));
}
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "应用列表")
@GetMapping("application/page/project")
public ResponseModel<Page<ProjectModel>> selectApp(
......@@ -100,7 +100,7 @@ public class DataApiResource {
DatabaseUtils.listToPage(studioResourceService.getAppList(sequenceNbr, projectNbr), current, size));
}
@TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(value = "数据列表")
@GetMapping("idx/page")
public ResponseModel<Page<ProjectModel>> selectIdx(
......
......@@ -11,6 +11,7 @@ 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.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.doc.TycloudResource;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -23,7 +24,8 @@ import java.util.List;
* @author r
*/
@RestController
@Api(tags = "数据库信息")
@Api(tags = "atl-数据库信息")
@TycloudResource(module = "atl", value = "database_link")
@RequestMapping(value = "/database_link")
public class DatabaseConnectionResource {
......@@ -36,7 +38,7 @@ public class DatabaseConnectionResource {
* @param dataBaseConnectionModel 数据库连接
* @return DataBaseLinkModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<DatabaseConnectionModel> save(@RequestBody DatabaseConnectionModel dataBaseConnectionModel) throws Exception {
......@@ -49,7 +51,7 @@ public class DatabaseConnectionResource {
* @param model 数据库连接
* @return DataBaseLinkModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<DatabaseConnectionModel> updateBySeq(
......@@ -65,7 +67,7 @@ public class DatabaseConnectionResource {
* @param sequenceNbr 主键
* @return Boolean
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
......@@ -77,7 +79,7 @@ public class DatabaseConnectionResource {
* @param sequenceNbr 主键
* @return TemplateVoModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<DatabaseConnectionModel> selectOne(@PathVariable Long sequenceNbr) throws Exception {
......@@ -94,7 +96,7 @@ public class DatabaseConnectionResource {
* @param size 分页大小
* @return Page<AgencyModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "机构分页查询", notes = "分页查询")
public ResponseModel<Page<AgencyModel>> queryForPage(
......@@ -112,7 +114,7 @@ public class DatabaseConnectionResource {
*
* @return List<DataBaseLinkModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<DatabaseConnectionModel>> selectForList() {
......@@ -124,7 +126,7 @@ public class DatabaseConnectionResource {
*
* @return Page<AgencyModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/agency/list")
@ApiOperation(httpMethod = "GET", value = "机构列表查询", notes = "列表查询")
public ResponseModel<List<AgencyModel>> queryForList() throws SQLException, IOException {
......
......@@ -9,6 +9,7 @@ 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.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.doc.TycloudResource;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -16,7 +17,8 @@ import java.sql.SQLException;
import java.util.List;
@RestController
@Api(tags = "数据库名称表")
@Api(tags = "atl-数据库名称表")
@TycloudResource(module = "atl", value = "database_name")
@RequestMapping(value = "/database_name")
public class DatabaseNameListResource {
......@@ -29,7 +31,7 @@ public class DatabaseNameListResource {
* @param ipSeq 数据库连接seq
* @return List<DataBaseLinkModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/refresh/{ipSeq}")
@ApiOperation(httpMethod = "POST", value = "数据库初始化", notes = "数据库初始化")
public ResponseModel<List<String>> refresh(@PathVariable Long ipSeq) throws Exception {
......@@ -43,7 +45,7 @@ public class DatabaseNameListResource {
* @param size 分页大小
* @return Page<DataBaseNameListModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<DataBaseNameListModel>> queryForPage(
......
......@@ -22,8 +22,8 @@ import java.io.IOException;
*/
@Controller
@TycloudResource(module = "atl", value = "dataApi")
@Api(tags = "场景案例跳转")
@TycloudResource(module = "atl", value = "forward")
@Api(tags = "atl-场景案例跳转")
public class LoginForwardResource {
@Autowired
......@@ -31,7 +31,7 @@ public class LoginForwardResource {
@RequestMapping("/forward")
@ApiOperation(value = "获取场景大屏点击后的登录token")
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ResponseBody
public ResponseModel<String> getSceneLoginToken(){
return ResponseHelper.buildResponse(loginForwardService.querySceneLoginToken());
......
......@@ -12,14 +12,16 @@ 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.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.doc.TycloudResource;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.List;
@CrossOrigin
@RestController
@Api(tags = "模板分类管理Api")
@Api(tags = "atl-模板分类管理")
@RequestMapping(value = "/tpl_cate")
@TycloudResource(module = "atl", value = "tpl_cate")
public class TemplateCategoryResource {
@Autowired
......@@ -35,7 +37,7 @@ public class TemplateCategoryResource {
* @param templateCategoryModel 模板分类信息
* @return ApiSourceDto
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save/{sequenceNbr}")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<TemplateCategoryModel> save(
......@@ -51,7 +53,7 @@ public class TemplateCategoryResource {
* @param sequenceNbr 编码
* @return ApiSourceDto
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<TemplateCategoryModel> updateBySeqTplCate(@RequestBody TemplateCategoryModel templateCategoryModel, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
......@@ -64,7 +66,7 @@ public class TemplateCategoryResource {
* @param sequenceNbr 编码
* @return Boolean
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
......@@ -76,7 +78,7 @@ public class TemplateCategoryResource {
* @param sequenceNbr 物理主键
* @return ApiSourceDto
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<TemplateCategoryModel> selectOne(@PathVariable Long sequenceNbr){
......@@ -87,7 +89,7 @@ public class TemplateCategoryResource {
* 列表全部数据查询
* @return List<ApiSourceDto>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<TemplateCategoryModel>> selectForList(){
......@@ -97,7 +99,7 @@ public class TemplateCategoryResource {
* 列表树形结构查询
* @return List<ApiSourceDto>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表树形结构查询", notes = "列表树形结构查询")
@GetMapping(value = "/tree")
public ResponseModel<List<TemplateCategoryTreeModel>> selectForTree(){
......
......@@ -12,6 +12,7 @@ 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.doc.TycloudResource;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -20,8 +21,9 @@ import java.util.*;
@CrossOrigin
@RestController
@Api(tags = "模板管理Api")
@Api(tags = "atl-模板管理")
@RequestMapping(value = "/tpl")
@TycloudResource(module = "atl", value = "tpl")
public class TemplateResource {
@Autowired
......@@ -32,7 +34,7 @@ public class TemplateResource {
* @param tplVoModel 页面表单数据
* @return TemplateModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/save")
@ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
public ResponseModel<TemplateModel> save(@RequestBody TemplateVoModel tplVoModel) throws Exception {
......@@ -46,7 +48,7 @@ public class TemplateResource {
* @param sequenceNbr 主键
* @return TemplateModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PutMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
public ResponseModel<TemplateModel> updateBySequenceNbrTpl(
......@@ -63,7 +65,7 @@ public class TemplateResource {
* @param sequenceNbr 主键
* @return Boolean
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
public ResponseModel<Boolean> deleteBySequenceNbr(@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
......@@ -75,7 +77,7 @@ public class TemplateResource {
* @param sequenceNbr 主键
* @return String
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@DeleteMapping(value = "/delete/{sequenceNbr}")
@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除多项", notes = "根据sequenceNbr删除多项")
public ResponseModel<Boolean> deleteModelsBySequenceNbr(@PathVariable(value = "sequenceNbr") String sequenceNbr) {
......@@ -87,7 +89,7 @@ public class TemplateResource {
* @param sequenceNbr 主键
* @return TemplateVoModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
public ResponseModel<TemplateVoModel> selectOne(@PathVariable Long sequenceNbr) {
......@@ -102,7 +104,7 @@ public class TemplateResource {
* @param displayName 模板名称
* @return Page<TemplateModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@ApiOperation(httpMethod = "GET", value = "分页查询", notes = "分页查询")
public ResponseModel<Page<TemplateModel>> queryForPage(
......@@ -120,7 +122,7 @@ public class TemplateResource {
* 列表全部数据查询
* @return List<TemplateModel>
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
@GetMapping(value = "/list")
public ResponseModel<List<TemplateModel>> selectForList() {
......@@ -132,7 +134,7 @@ public class TemplateResource {
* @param multipartFile 文件
* @return TemplateModel
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "根据sequenceNbr导入content", notes = "根据sequenceNbr导入content")
@PostMapping(value = "/import")
@CrossOrigin(methods = RequestMethod.POST)
......
......@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.api.tool.face.model.ToolLibraryDetailModel;
import com.yeejoin.amos.api.tool.face.model.ToolLibraryTreeModel;
import com.yeejoin.amos.api.tool.face.service.ToolLibraryService;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -20,7 +23,7 @@ import java.util.List;
@RestController
@TycloudResource(module = "atl", value = "dataApi")
@TycloudResource(module = "atl", value = "component")
@RequestMapping(value = "/component")
@Api(tags = "atl-组件库")
public class ToolLibraryResource {
......@@ -30,7 +33,7 @@ public class ToolLibraryResource {
@GetMapping("/detailList")
@ApiOperation(value = "组件库设计器节点详情")
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
public ResponseModel<Page<ToolLibraryDetailModel>> listComponentToolsDetails(
@RequestParam(value = "sequenceNbr") String sequenceNbr,
@RequestParam(value = "current") int current,
......@@ -42,7 +45,7 @@ public class ToolLibraryResource {
@GetMapping("/list")
@ApiOperation(value = "组件库设计器节点列表")
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
public ResponseModel<List<ToolLibraryTreeModel>> listComponentTools(@RequestParam("designer") String designer) throws SQLException, ClassNotFoundException {
return ResponseHelper.buildResponse(toolLibraryService.queryForComponentList(designer));
}
......@@ -51,7 +54,7 @@ public class ToolLibraryResource {
* 导出SQL脚本 一级功能
* {id}表示前端传递的设计器类型
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/export/designer")
@ApiOperation(httpMethod = "GET", value = "导出", notes = "导出")
public void exportDesignerSQL(@RequestParam("id") String id, HttpServletResponse httpServletResponse){
......@@ -62,7 +65,7 @@ public class ToolLibraryResource {
* 导出SQL脚本 二级功能
* @param sequenceNbr 组件在数据库表中的键
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/export/component")
@ApiOperation(httpMethod = "GET", value = "导出", notes = "导出二级组件中的所有工具的SQL")
public void exportComponentSQL(
......@@ -75,7 +78,7 @@ public class ToolLibraryResource {
* 导出SQL脚本 三级功能
* {sequenceNbrs}表示前端传递需要导出的插入sql的主键
*/
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/export/tool")
@ApiOperation(httpMethod = "GET", value = "导出", notes = "导出")
public void exportToolSQL( @RequestParam(value = "sequenceNbrs") String sequenceNbrs, HttpServletResponse httpServletResponse){
......
package com.yeejoin.amos.api.tool.face.orm.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import lombok.EqualsAndHashCode;
......@@ -11,7 +9,7 @@ import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
@EqualsAndHashCode(callSuper = true)
@Data
@TableName("amos_tool_template")
@TableName("scene_case")
public class AmosToolTemplate extends BaseEntity {
/**
......
......@@ -99,10 +99,8 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
JSONObject deleteSqlsJson = JSON.parseObject(deleteSqlsStr);
String deleteSqls = deleteSqlsJson.getString("agencyCode");
deleteSqls = deleteSqls.replace("#{agencyCode}", agencyCode);
System.out.println(deleteSqls);
// 检查删除是否成功?
List<Map<String, Object>> deleteRes = DatabaseUtils.getMaps(deleteSqls, conn);
System.out.println(deleteRes);
}
else {
// 全表遍历后删除的逻辑
......@@ -119,7 +117,6 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
" FROM " + tableName +
" WHERE AGENCY_CODE = '" + agencyCode + "';";
List<Map<String, Object>> deleteRes = getMaps(sql, conn);
System.out.println(deleteRes);
}
}
......@@ -148,16 +145,15 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
*/
public String deleteDataBase(Connection connection, String agencyCode, String dbName) throws SQLException {
try {
if (!connection.isClosed())
System.out.println("Succeeded connecting to the Database!");
if (!connection.isClosed()){}
//通过连接获取relation表树形结构
List<RelationTreeModel> trees = this.createRelationTree(dbName);
for (RelationTreeModel tree : trees) {
//根据根节点获得根节点相关列表
List<RelationTreeModel> array = this.createList(tree);
//根据列表获取sql语句
System.out.println(this.createSqlByArray(array, agencyCode));
System.out.println(statementSql(this.createSqlByArray(array, agencyCode).toString(), connection));
this.createSqlByArray(array, agencyCode);
statementSql(this.createSqlByArray(array, agencyCode).toString(), connection);
}
} catch (SQLException e) {
e.printStackTrace();
......@@ -304,9 +300,7 @@ public class RelationService extends BaseService<RelationModel, Relation, Relati
print(seq.toString(),"开始查询"+model.getName()+"表","running");
List<Map<String, Object>> dataList = DatabaseUtils.getMaps(selectSQL, connection);
print(seq.toString(),"开始创建"+model.getName()+"表insert语句","running");
System.out.println(selectSQL);
StringBuffer insertSQL = DatabaseUtils.getInsertSQL(dataList, columns, model.getName());
System.out.println(insertSQL);
if (!ObjectUtils.isEmpty(insertSQL)) insertSql.append(insertSQL);
}
}
......
......@@ -277,7 +277,6 @@ public class StudioResourceService extends BaseService<StudioResourceModel, Stud
}
fis.close();
} else {
System.out.println("File not found: " + filePath);
}
}
zos.closeEntry(); // 关闭压缩文件条目
......@@ -557,7 +556,6 @@ public class StudioResourceService extends BaseService<StudioResourceModel, Stud
Statement sql = connection.createStatement();
String sqlStr = "select SEQUENCE_NBR,PROJECT_NAME,AGENCY_CODE from " + model.getPrefix() + "amos_studio" + model.getSuffix() + ".studio_project " +
"where AGENCY_CODE = " + "'" + agencyCode + "'";
// System.out.println(sqlStr);
ResultSet resultSet = sql.executeQuery(sqlStr);
ResultSetMetaData md = resultSet.getMetaData(); // 获得结果集结构信息,元数据
List<ProjectModel> listPm = new ArrayList<>(); // 实例化一个list作为容器
......@@ -589,7 +587,6 @@ public class StudioResourceService extends BaseService<StudioResourceModel, Stud
Statement sql = connection.createStatement();
String sqlStr = "select SEQUENCE_NBR,APP_NAME,DESIGNER_TYPE from " + model.getPrefix() + "amos_studio" + model.getSuffix() + ".studio_application " +
"where PROJECT_SEQ = " + "'" + projectNbr + "'";
// System.out.println(sqlStr);
ResultSet resultSet = sql.executeQuery(sqlStr);
ResultSetMetaData md = resultSet.getMetaData(); // 获得结果集结构信息,元数据
List<ProjectModel> listPm = new ArrayList<>(); // 实例化一个list作为容器
......@@ -620,7 +617,6 @@ public class StudioResourceService extends BaseService<StudioResourceModel, Stud
Statement sql = connection.createStatement();
String sqlStr = "select id,agencyCode,name,type from amos_idx.idx_explorer " +
"where agencyCode = '" + agencyCode + "' and type = 'project'";
// System.out.println(sqlStr);
ResultSet resultSet = sql.executeQuery(sqlStr);
ResultSetMetaData md = resultSet.getMetaData(); // 获得结果集结构信息,元数据
List<ProjectModel> listPm = new ArrayList<>(); // 实例化一个list作为容器
......
......@@ -4,6 +4,7 @@ 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 com.yeejoin.amos.feign.privilege.Privilege;
import org.springframework.beans.factory.annotation.Autowired;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.springframework.stereotype.Service;
......@@ -57,7 +58,11 @@ public class TemplateCategoryService extends BaseService<TemplateCategoryModel,
* 获得模板分类树
*/
public List<TemplateCategoryTreeModel> getTree() {
List<TemplateCategoryTreeModel> nodes = this.tplCateToNode(this.queryForTplCateList());
/**
* 此处需要改
*/
List<TemplateCategoryModel> templateCategoryModels = this.queryForTplCateList();
List<TemplateCategoryTreeModel> nodes = this.tplCateToNode(templateCategoryModels);
nodes.addAll(visualDesignerService.VisualDesignerToNode(visualDesignerService.queryForVisualDesignerList()));
return getChildren(nodes, "", 0L);
}
......
......@@ -149,7 +149,6 @@ public class TemplateService extends BaseService<TemplateModel, Template, Templa
tplVoModel.setSketches(this.urlToPicModel(templateModel.getSketch()));
if (templateModel.getThumb() != null)
tplVoModel.setThumbs(this.urlToPicModel(templateModel.getThumb()));
System.out.println(tplVoModel.getThumbs());
return tplVoModel;
}
......
......@@ -95,19 +95,27 @@ public class DatabaseUtils {
/**
* 上一步有set操作,不确定是否修改过数据库名为需要导出的数据库名
* 修改后不会有重复拼接问题或者拼接前缀导致查询不到数据库
*
* 现在还存在一点问题,当需要导出的数据库与连接源database_link存储的数据库名称一致(amos_project)
* 并且prefix不为空
* 会导致拼接前缀。。。
*/
// 连接新增的数据库
String dbUrl="";
String backUpUrl="";
DatabaseConnectionModel changeModel = databaseConnectionService.queryBySeq(model.getSequenceNbr());
if (!model.getDbName().equals(changeModel.getDbName())){
dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" + model.getDbName();
backUpUrl=dbUrl;
}else {
dbUrl = "jdbc:mysql://" + model.getIp() + ":" + model.getPort() + "/" +
model.getPrefix() + model.getDbName() + model.getSuffix();
}
// 解密pwd,并连接
return DriverManager.getConnection(dbUrl, model.getUserName(), AESUtils.decrypt(model.getPassWord()));
Connection connection=DriverManager.getConnection(dbUrl, model.getUserName(), AESUtils.decrypt(model.getPassWord()));
return connection;
// 解密pwd,并连接
// return connection==null?DriverManager.getConnection(backUpUrl, model.getUserName(), AESUtils.decrypt(model.getPassWord())):connection;
} catch (ClassNotFoundException e) {
// 处理数据库驱动加载异常
e.printStackTrace();
......
spring.application.name=AMOS-ATL
server.servlet.context-path=/atl
#server.servlet.context-path=/jcs
server.port=30002
server.port=6666
#server.port=20000
spring.profiles.active=dev
#spring.profiles.active=qa
......
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