From c8aee7b9bfd79cfd741d7e5692520f4f51a31a86 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期一, 18 五月 2020 18:30:01 +0800
Subject: [PATCH] bak 修改 获取版本数据前
---
src/main/java/com/highdatas/mdm/controller/AssembleController.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/AssembleController.java b/src/main/java/com/highdatas/mdm/controller/AssembleController.java
index 94cc314..f961222 100644
--- a/src/main/java/com/highdatas/mdm/controller/AssembleController.java
+++ b/src/main/java/com/highdatas/mdm/controller/AssembleController.java
@@ -75,9 +75,28 @@
}
}
+ @RequestMapping(value = "runTest/{id}", method = RequestMethod.GET)
+ public Result runTest(@PathVariable String id, HttpServletRequest request) {
+ SysAssemble assemble = assembleService.selectById(id);
+ if (assemble == null) {
+ return Result.error(CodeMsg.ERROR_PARAMS_NOT_MATHED);
+ }
+ return assembleService.run(id);
+ }
+
@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 = "saveAutoJobGroup", method = RequestMethod.GET)
+ public Result saveAutoJobGroup(HttpServletRequest request) {
+ boolean b = client.saveAutoJobGroup();
if (b) {
return Result.success(null);
}else {
@@ -99,9 +118,9 @@
@RequestMapping(value = "new", method = RequestMethod.GET)
public Result delete(HttpServletRequest request) {
SysAssemble assemble = new SysAssemble();
- TUser user = (TUser) request.getSession().getAttribute(Constant.USER);
+ TUser user = DbUtils.getUser(request);
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鐨勬椂鍊欏皢鎵�鏈� 閫氱敤鍙傛暟鎼竴浠借繃鍘�
@@ -131,8 +150,9 @@
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);
+ TUser user = DbUtils.getUser(request);
boolean insert = assemble.setUserId(user.getUserId()).setMenuId(menuId).setUpdateTime(new Date()).updateById();
if (insert) {
@@ -188,9 +208,7 @@
if (!StringUtils.isEmpty(jobId)) {
b = client.deleteJob(jobId);
}
- if (!b) {
- throw new Exception("xxljob 鍒犻櫎澶辫触");
- }
+
boolean deleted = assemble.deleteById();
if (deleted) {
return Result.success(assemble);
@@ -374,7 +392,7 @@
}else {
page = new Page(pageNo, 15);
}
-
+ wrapper.orderBy("update_time desc, create_time desc");
Page<SysAssemble> resultPage = assembleService.selectPage(page,wrapper);
List<SysAssemble> records = resultPage.getRecords();
@@ -385,8 +403,10 @@
JSONObject o = (JSONObject) JSON.toJSON(record);
SysAssembleParams sysAssembleParams = paramsService.selectOne(eq);
- String val = sysAssembleParams.getVal();
- o.fluentPut("nextTime", val);
+ if(sysAssembleParams != null) {
+ String val = sysAssembleParams.getVal();
+ o.fluentPut("nextTime", val);
+ }
String realMenuId = record.getMenuId();
if (!StringUtils.isEmpty(realMenuId)) {
@@ -396,8 +416,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