From 74472c9d22dddcb41383794caf0011043b20f817 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期二, 31 三月 2020 13:25:47 +0800
Subject: [PATCH] fix 数据权限
---
src/main/java/com/highdatas/mdm/controller/AssembleController.java | 88 ++++++++++++++++++++++++++++++++++---------
1 files changed, 69 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/AssembleController.java b/src/main/java/com/highdatas/mdm/controller/AssembleController.java
index 32a0729..59c9750 100644
--- a/src/main/java/com/highdatas/mdm/controller/AssembleController.java
+++ b/src/main/java/com/highdatas/mdm/controller/AssembleController.java
@@ -7,10 +7,8 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.highdatas.mdm.entity.*;
-import com.highdatas.mdm.pojo.CodeMsg;
-import com.highdatas.mdm.pojo.Result;
-import com.highdatas.mdm.pojo.SysAssembleStatus;
-import com.highdatas.mdm.pojo.SysAssembleUpdateType;
+import com.highdatas.mdm.job.JobClient;
+import com.highdatas.mdm.pojo.*;
import com.highdatas.mdm.pojo.kettle.BigDataDataSourceInfo;
import com.highdatas.mdm.pojo.kettle.DataSourceInfo;
import com.highdatas.mdm.pojo.kettle.UnBigDataDataSourceInfo;
@@ -60,13 +58,42 @@
BigDataDataSourceInfo bigDataDataSourceInfo;
@Autowired
UnBigDataDataSourceInfo unBigDataDataSourceInfo;
+ @Autowired
+ JobClient client;
@RequestMapping(value = "run/{id}", method = RequestMethod.GET)
- public Result delete(@PathVariable String id, HttpServletRequest request) {
- Result run = assembleService.run(id, request.getSession());
- return run;
+ public Result trigger(@PathVariable String id, HttpServletRequest request) {
+ SysAssemble assemble = assembleService.selectById(id);
+ if (assemble == null) {
+ return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
+ }
+ boolean trigger = client.trigger(assemble);
+ if (trigger) {
+ return Result.success(null);
+ }else {
+ return Result.error(CodeMsg.OPERATR_ERROR);
+ }
}
+ @RequestMapping(value = "saveJobGroup", method = RequestMethod.GET)
+ public Result saveJobGroup(HttpServletRequest request) {
+ boolean b = client.saveJobGroup();
+ if (b) {
+ return Result.success(null);
+ }else {
+ return Result.error(CodeMsg.OPERATR_ERROR);
+ }
+ }
+
+ @RequestMapping(value = "deleteJobGroup", method = RequestMethod.GET)
+ public Result deleteJobGroup(HttpServletRequest request) {
+ boolean b = client.saveJobGroup();
+ if (b) {
+ return Result.success(null);
+ }else {
+ return Result.error(CodeMsg.OPERATR_ERROR);
+ }
+ }
@RequestMapping(value = "new", method = RequestMethod.GET)
@@ -74,7 +101,7 @@
SysAssemble assemble = new SysAssemble();
TUser user = (TUser) request.getSession().getAttribute(Constant.USER);
assemble.setStatus(SysAssembleStatus.edit).setCreateTime(new Date()).setUserId(user.getUserId()).setUpdateType(SysAssembleUpdateType.All);
- boolean insert = assemble.setId(DbUtils.getUUID()).insert();
+ boolean insert = assemble.setId(DbUtils.getUUID()).setEmptyData(true).insert();
if (insert) {
String assembleId = assemble.getId();
// 鍒涘缓job鐨勬椂鍊欏皢鎵�鏈� 閫氱敤鍙傛暟鎼竴浠借繃鍘�
@@ -98,12 +125,13 @@
@RequestMapping(value = "/saveCommon/{id}", method = RequestMethod.GET)
- public Result add(@PathVariable String id, @RequestParam String menuId, @RequestParam SysAssembleUpdateType updateType, @RequestParam Boolean bigData, @RequestParam String updateFields, HttpServletRequest request) {
+ public Result saveCommon(@PathVariable String id, @RequestParam String menuId, @RequestParam SysAssembleUpdateType updateType, @RequestParam Boolean bigData, @RequestParam String updateFields, HttpServletRequest request) {
SysAssemble assemble = assembleService.selectById(id);
if (assemble == null) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
}
assemble.setUpdateType(updateType).setUpdateFields(updateFields);
+ assemble.setEmptyData(false);
assemble.setBigdata(Boolean.valueOf(bigData));
TUser user = (TUser) request.getSession().getAttribute(Constant.USER);
boolean insert = assemble.setUserId(user.getUserId()).setMenuId(menuId).setUpdateTime(new Date()).updateById();
@@ -117,7 +145,7 @@
@Transactional(rollbackFor=Exception.class)
@RequestMapping(value = "delete/{id}", method = RequestMethod.GET)
- public Result add(@PathVariable String id) {
+ public Result delete(@PathVariable String id) throws Exception {
SysAssemble assemble = assembleService.selectById(id);
if (assemble == null) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
@@ -156,7 +184,14 @@
apiService.delete(new EntityWrapper<SysAssembleApi>().eq(Constant.PARENT_ID, id));
//delete param
paramsService.delete(new EntityWrapper<SysAssembleParams>().eq(Constant.PARENT_ID, id));
-
+ boolean b = true;
+ String jobId = assemble.getJobId();
+ if (!StringUtils.isEmpty(jobId)) {
+ b = client.deleteJob(jobId);
+ }
+ if (!b) {
+ throw new Exception("xxljob 鍒犻櫎澶辫触");
+ }
boolean deleted = assemble.deleteById();
if (deleted) {
return Result.success(assemble);
@@ -165,15 +200,20 @@
}
}
-
-
- @RequestMapping(value = "updateJob/{id}", method = RequestMethod.GET)
- public Result updateStatus(@RequestParam String jobId,@RequestParam String id) {
+ @RequestMapping(value = "saveCheckType/{id}", method = RequestMethod.GET)
+ public Result saveUpdateType(@RequestParam SysAssembleCheckType type, @PathVariable String id,HttpServletRequest request) {
SysAssemble assemble = assembleService.selectById(id);
if (assemble == null) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
}
- assemble.setJobId(jobId);
+ assemble.setCheckType(type);
+ if (type.equals(SysAssembleCheckType.partSuccessAdd)) {
+ String fields = request.getParameter("fields");
+ if (StringUtils.isEmpty(fields)) {
+ return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
+ }
+ assemble.setCheckFields(fields);
+ }
boolean updated = assemble.updateById();
if (updated) {
return Result.success(assemble);
@@ -245,8 +285,9 @@
return Result.success(result);
}
+ @Transactional(rollbackFor=Exception.class)
@RequestMapping(value = "saveCorn/{id}", method = RequestMethod.GET)
- public Result add(@RequestParam String cron,@PathVariable String id) {
+ public Result add(@RequestParam String cron,@PathVariable String id) throws Exception {
SysAssemble assemble = assembleService.selectById(id);
if (assemble == null) {
return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
@@ -261,6 +302,17 @@
return Result.error(new CodeMsg(6007, "corn 琛ㄨ揪寮忔洿鏂板�奸敊璇�"));
}
assemble.setStatus(SysAssembleStatus.working);
+ String jobId = assemble.getJobId();
+ boolean xxljobStatus = true;
+ if (StringUtils.isEmpty(jobId)) {
+ xxljobStatus = client.addJob(assemble);
+ }
+ else {
+ xxljobStatus = client.updateJob(assemble);
+ }
+ if (!xxljobStatus) {
+ throw new Exception("add or update xxxljob fail");
+ }
boolean updated = assemble.updateById();
if (updated) {
@@ -345,8 +397,6 @@
List<SysMenu> sysMenus = menuService.selectBatchIds(byParentId);
o.fluentPut("menuList", sysMenus);
}
-
-
List<SysAssembleDb> dbList = dbService.selectList(new EntityWrapper<SysAssembleDb>().eq(Constant.PARENT_ID, record.getId()));
o.fluentPut("dbList", dbList);
--
Gitblit v1.8.0