I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

功能细节调整

Browse Source
yun-zuoyi
yunhao.wang 7 years ago
parent 1e6b4719fe
commit 3840dea649
7 changed files with 104 additions and 109 deletions
Show Stats Download Patch File Download Diff File

13
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeExpressionService.java
Unescape Escape View File

@ -2,10 +2,8 @@ package cn.estsh.i3plus.core.api.iservice.busi;
import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysFile;
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
import io.swagger.annotations.ApiOperation;
import java.util.List; import java.util.List;
@ -22,12 +20,14 @@ public interface ISysTaskTimeExpressionService {
* 修改数据 * 修改数据
* @param taskTimeExpression * @param taskTimeExpression
*/ */
@ApiOperation(value = "修改数据")
void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression); void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression);
/** /**
* 根据Key 删除数据 * 根据id删除数据
* @param id * @param id
*/ */
@ApiOperation(value = "根据id删除数据")
void deleteSysTaskTimeExpressionById(Long id); void deleteSysTaskTimeExpressionById(Long id);
/** /**
@ -35,12 +35,14 @@ public interface ISysTaskTimeExpressionService {
* @param taskTimeExpression * @param taskTimeExpression
* @return * @return
*/ */
@ApiOperation(value = "新增数据")
SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression); SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression);
/** /**
* 查询所有数据 * 查询所有数据
* @return * @return
*/ */
@ApiOperation(value = "查询所有数据")
List<SysTaskTimeExpression> listSysTaskTimeExpression(); List<SysTaskTimeExpression> listSysTaskTimeExpression();
/** /**
@ -48,6 +50,7 @@ public interface ISysTaskTimeExpressionService {
* @param id * @param id
* @return * @return
*/ */
@ApiOperation(value = "根据ID 查询任务表达式")
SysTaskTimeExpression getSysTaskTimeExpressionById(Long id); SysTaskTimeExpression getSysTaskTimeExpressionById(Long id);
/** /**
@ -56,11 +59,13 @@ public interface ISysTaskTimeExpressionService {
* @param pager * @param pager
* @return * @return
*/ */
@ApiOperation(value = "任务表达式查询，分页，排序")
ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager); ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager);
/** /**
* 任务表达式批量删除 * 任务表达式批量删除
* @param ids * @param ids
*/ */
@ApiOperation(value = "任务表达式批量删除")
void deleteSysTaskTimeExpressionByIds(Long[] ids); void deleteSysTaskTimeExpressionByIds(Long[] ids);
} }

18
modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeService.java
Unescape Escape View File

@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
import io.swagger.annotations.ApiOperation;
import java.util.List; import java.util.List;
@ -18,16 +19,18 @@ import java.util.List;
public interface ISysTaskTimeService { public interface ISysTaskTimeService {
/** /**
* 新增数据 * 新增定时任务
* @param taskTime * @param taskTime
* @return * @return
*/ */
@ApiOperation(value = "新增定时任务")
SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression); SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression);
/** /**
* 修改数据 * 修改定时任务
* @param taskTime * @param taskTime
*/ */
@ApiOperation(value = "修改定时任务")
void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression); void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression);
/** /**
@ -36,18 +39,21 @@ public interface ISysTaskTimeService {
* @param status 任务状态 * @param status 任务状态
* @param user 当前会话用户 * @param user 当前会话用户
*/ */
@ApiOperation(value = "修改任务状态")
void updateSysTaskTimeStatus(Long id, int status, SessionUser user); void updateSysTaskTimeStatus(Long id, int status, SessionUser user);
/** /**
* 根据Key 删除数据 * 根据根据id删除数据
* @param id * @param id
*/ */
@ApiOperation(value = "根据根据id删除数据")
void deleteSysTaskTimeById(Long id); void deleteSysTaskTimeById(Long id);
/** /**
* 查询所有数据 * 查询所有数据
* @return * @return
*/ */
@ApiOperation(value = "查询所有数据")
List<SysTaskTime> listSysTaskTime(); List<SysTaskTime> listSysTaskTime();
/** /**
@ -55,6 +61,7 @@ public interface ISysTaskTimeService {
* @param id * @param id
* @return * @return
*/ */
@ApiOperation(value = "根据id 数据")
SysTaskTime getSysTaskTimeById(Long id); SysTaskTime getSysTaskTimeById(Long id);
/** /**
@ -63,12 +70,14 @@ public interface ISysTaskTimeService {
* @param pager * @param pager
* @return * @return
*/ */
@ApiOperation(value = "定时任务复制查询，分页，排序")
ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager); ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager);
/** /**
* 根据id批量删除定时任务 * 根据id批量删除定时任务
* @param ids * @param ids
*/ */
@ApiOperation(value = "根据id批量删除定时任务")
void deleteSysTaskTimeByIds(Long[] ids); void deleteSysTaskTimeByIds(Long[] ids);
/** /**
@ -76,6 +85,7 @@ public interface ISysTaskTimeService {
* @param ids * @param ids
* *
*/ */
@ApiOperation(value = "批量修改定时任务状态")
void updateSysTaskTimeStatusByIds(Long[] ids, Integer status); void updateSysTaskTimeStatusByIds(Long[] ids, Integer status);
/** /**
@ -84,11 +94,13 @@ public interface ISysTaskTimeService {
* @param name * @param name
* @param groupName * @param groupName
*/ */
@ApiOperation(value = "修改最后时间")
void doSysTaskTimeLastDateByNameAndGroupName(String lastDate,String name,String groupName); void doSysTaskTimeLastDateByNameAndGroupName(String lastDate,String name,String groupName);
/** /**
* 立即执行 * 立即执行
* @param id * @param id
*/ */
@ApiOperation(value = "立即执行")
void executeSysTaskTimeById(Long id); void executeSysTaskTimeById(Long id);
} }

83
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java
Unescape Escape View File

@ -2,14 +2,13 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.base.controller.CoreBaseController;
import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
@ -75,12 +74,10 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.executeSysTaskTimeById(taskTime.getId()); taskTimeService.executeSysTaskTimeById(taskTime.getId());
} }
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime);
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -113,12 +110,10 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.executeSysTaskTimeById(taskTime.getId()); taskTimeService.executeSysTaskTimeById(taskTime.getId());
} }
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime);
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -131,12 +126,10 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.deleteSysTaskTimeById(Long.parseLong(id)); taskTimeService.deleteSysTaskTimeById(Long.parseLong(id));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -148,12 +141,10 @@ public class SysTaskTimeController extends CoreBaseController{
return ResultBean.success("操作成功") return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list); .setResultList(list);
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -169,31 +160,27 @@ public class SysTaskTimeController extends CoreBaseController{
return ResultBean.success("操作成功") return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(taskTime); .setResultObject(taskTime);
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@PutMapping(value = "/status") @PutMapping(value = "/status/{id}/{status}")
@ApiOperation(value = "修改定时任务状态", notes = "根据ID修改定时任务状态") @ApiOperation(value = "修改定时任务状态", notes = "根据ID修改定时任务状态")
public ResultBean updateQuartzStatus(String id,int status) { public ResultBean updateQuartzStatus(@PathVariable("id") String idStr,@PathVariable("status") Integer status) {
try { try {
// 数据校验 // 数据校验
ValidatorBean.checkNotNull(id, "功能id 不能为空"); ValidatorBean.checkNotNull(idStr, "id 不能为空");
ValidatorBean.checkNotZero(status, "功能状态不能为空"); ValidatorBean.checkNotZero(status, "状态不能为空");
taskTimeService.updateSysTaskTimeStatus(Long.parseLong(id),status,AuthUtil.getSessionUser()); taskTimeService.updateSysTaskTimeStatus(Long.parseLong(idStr),status,AuthUtil.getSessionUser());
return new ResultBean(true); return new ResultBean(true);
} catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
} }
} }
@ -204,11 +191,9 @@ public class SysTaskTimeController extends CoreBaseController{
ListPager taskTimeListPager = taskTimeService.querySysTaskTimeByPager(taskTime,pager); ListPager taskTimeListPager = taskTimeService.querySysTaskTimeByPager(taskTime,pager);
return ResultBean.success("查询成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("查询成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -227,11 +212,9 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.deleteSysTaskTimeByIds(StringTool.getArrayLong(ids)); taskTimeService.deleteSysTaskTimeByIds(StringTool.getArrayLong(ids));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -251,12 +234,10 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.updateSysTaskTimeStatusByIds(StringTool.getArrayLong(ids),status); taskTimeService.updateSysTaskTimeStatusByIds(StringTool.getArrayLong(ids),status);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode());
} }
} }
@ -269,12 +250,10 @@ public class SysTaskTimeController extends CoreBaseController{
taskTimeService.executeSysTaskTimeById(Long.parseLong(id)); taskTimeService.executeSysTaskTimeById(Long.parseLong(id));
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
} }

63
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java
Unescape Escape View File

@ -50,14 +50,11 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
.notNull("expressionStartDatetime",timeExpression.getExpressionStartDatetime()); .notNull("expressionStartDatetime",timeExpression.getExpressionStartDatetime());
taskTimeExpressionService.insertSysTaskTimeExpression(timeExpression); taskTimeExpressionService.insertSysTaskTimeExpression(timeExpression);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -74,12 +71,10 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
taskTimeExpressionService.updateSysTaskTimeExpression(timeExpression); taskTimeExpressionService.updateSysTaskTimeExpression(timeExpression);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -92,12 +87,10 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
taskTimeExpressionService.deleteSysTaskTimeExpressionById(Long.parseLong(id)); taskTimeExpressionService.deleteSysTaskTimeExpressionById(Long.parseLong(id));
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -106,15 +99,11 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
public ResultBean findSysTaskTimeExpressionAll() { public ResultBean findSysTaskTimeExpressionAll() {
try { try {
List<SysTaskTimeExpression> list = taskTimeExpressionService.listSysTaskTimeExpression(); List<SysTaskTimeExpression> list = taskTimeExpressionService.listSysTaskTimeExpression();
return ResultBean.success("操作成功") return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) }catch(ImppBusiException busExcep){
.setResultList(list);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -127,15 +116,11 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
SysTaskTimeExpression taskTimeExpression = taskTimeExpressionService.getSysTaskTimeExpressionById(Long.parseLong(id)); SysTaskTimeExpression taskTimeExpression = taskTimeExpressionService.getSysTaskTimeExpressionById(Long.parseLong(id));
return ResultBean.success("操作成功") return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTimeExpression);
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) }catch(ImppBusiException busExcep){
.setResultObject(taskTimeExpression);
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
} catch (Exception e) { }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@ -146,19 +131,17 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
ListPager taskTimeExpressionListPager = taskTimeExpressionService.querySysTaskTimeExpressionByPager(taskTimeExpression,pager); ListPager taskTimeExpressionListPager = taskTimeExpressionService.querySysTaskTimeExpressionByPager(taskTimeExpression,pager);
return ResultBean.success("查询成功").setListPager(taskTimeExpressionListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("查询成功").setListPager(taskTimeExpressionListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
@DeleteMapping("/batch-delete") @DeleteMapping("/batch-delete")
@ApiOperation(value = "根据id批量删除时间表达式",notes = "根据id批量删除时间表达式") @ApiOperation(value = "根据id批量删除时间表达式",notes = "根据id批量删除时间表达式")
public ResultBean deleteSysTaskTimeExpressionByIds(String[] ids){ public ResultBean deleteSysTaskTimeExpressionByIds(String[] idsStr){
try{ try{
if(ids.length == 0){ if(idsStr.length == 0){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
@ -166,14 +149,12 @@ public class SysTaskTimeExpressionController extends CoreBaseController{
.build(); .build();
} }
taskTimeExpressionService.deleteSysTaskTimeExpressionByIds(StringTool.getArrayLong(ids)); taskTimeExpressionService.deleteSysTaskTimeExpressionByIds(StringTool.getArrayLong(idsStr));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ }catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
} }
} }
} }

5
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java
Unescape Escape View File

@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.Message; import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -44,7 +43,7 @@ public class LetterQueueReceiver {
* @param message * @param message
* 发送：rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_QUEUE, new SysMessage(....)); * 发送：rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_QUEUE, new SysMessage(....));
*/ */
@RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE) //@RabbitListener(queues = I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE)
public void processImppMessage(SysMessage msg, Channel channel, Message message) { public void processImppMessage(SysMessage msg, Channel channel, Message message) {
try { try {
LOGGER.info("【MQ-IMPP_MESSAGE_LETTER_QUEUE】数据接收成功：{}",msg); LOGGER.info("【MQ-IMPP_MESSAGE_LETTER_QUEUE】数据接收成功：{}",msg);
@ -82,7 +81,7 @@ public class LetterQueueReceiver {
); );
} }
msg.setMessageSenderNameRdd(StringUtils.join(receiverName, ",")); msg.setMessageReceiversNameRdd(StringUtils.join(receiverName, ","));
sysMessageService.updateSysMessage(msg); sysMessageService.updateSysMessage(msg);

10
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeExpressionService.java
Unescape Escape View File

@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysTaskTimeRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -37,36 +38,42 @@ public class SysTaskTimeExpressionService implements ISysTaskTimeExpressionServi
private SysTaskTimeRepository taskTimeRDao; private SysTaskTimeRepository taskTimeRDao;
@Override @Override
@ApiOperation(value = "修改数据")
public void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) { public void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) {
LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression); LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression);
taskTimeExpressionRDao.update(taskTimeExpression); taskTimeExpressionRDao.update(taskTimeExpression);
} }
@Override @Override
@ApiOperation(value = "根据id删除数据")
public void deleteSysTaskTimeExpressionById(Long id) { public void deleteSysTaskTimeExpressionById(Long id) {
LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", id); LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", id);
taskTimeExpressionRDao.deleteById(id); taskTimeExpressionRDao.deleteById(id);
} }
@Override @Override
@ApiOperation(value = "新增数据")
public SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) { public SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) {
LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression); LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression);
return taskTimeExpressionRDao.insert(taskTimeExpression); return taskTimeExpressionRDao.insert(taskTimeExpression);
} }
@Override @Override
@ApiOperation(value = "查询所有数据")
public List<SysTaskTimeExpression> listSysTaskTimeExpression() { public List<SysTaskTimeExpression> listSysTaskTimeExpression() {
LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION list"); LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION list");
return taskTimeExpressionRDao.list(); return taskTimeExpressionRDao.list();
} }
@Override @Override
@ApiOperation(value = "根据ID 查询任务表达式")
public SysTaskTimeExpression getSysTaskTimeExpressionById(Long id) { public SysTaskTimeExpression getSysTaskTimeExpressionById(Long id) {
LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}" ,id); LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}" ,id);
return taskTimeExpressionRDao.getById(id); return taskTimeExpressionRDao.getById(id);
} }
@Override @Override
@ApiOperation(value = "任务表达式查询，分页，排序")
public ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager) { public ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager) {
LOGGER.info("文件表达式 TASK_TIME_EXPRESSION taskTimeExpression:{}，Pager:{}",taskTimeExpression,pager); LOGGER.info("文件表达式 TASK_TIME_EXPRESSION taskTimeExpression:{}，Pager:{}",taskTimeExpression,pager);
if(taskTimeExpression == null) { if(taskTimeExpression == null) {
@ -80,9 +87,10 @@ public class SysTaskTimeExpressionService implements ISysTaskTimeExpressionServi
} }
@Override @Override
@ApiOperation(value = "任务表达式批量删除")
public void deleteSysTaskTimeExpressionByIds(Long[] ids) { public void deleteSysTaskTimeExpressionByIds(Long[] ids) {
LOGGER.info("文件表达式 SYS_MENU ids:{}", ids); LOGGER.info("文件表达式 SYS_MENU ids:{}", ids);
long count = taskTimeRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("timeId",ids)); long count = taskTimeRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("timeExpressionId",ids));
if(count >= 1){ if(count >= 1){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())

21
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java
Unescape Escape View File

@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ValidatorBean; import cn.estsh.impp.framework.boot.util.ValidatorBean;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.quartz.*; import org.quartz.*;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -36,7 +37,7 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@Service @Service
public class SysTaskTimeService implements ISysTaskTimeService { public class SysTaskTimeService implements ISysTaskTimeService{
public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeService.class); public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeService.class);
@ -50,16 +51,16 @@ public class SysTaskTimeService implements ISysTaskTimeService {
private Scheduler scheduler; private Scheduler scheduler;
@Override @Override
@ApiOperation(value = "修改定时任务")
public void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) { public void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
SysTaskTime oldSysTaskTime = taskTimeRDao.getById(taskTime.getId()); SysTaskTime oldSysTaskTime = taskTimeRDao.getById(taskTime.getId());
// 更新关系表 // 更新关系表
refExpressionTriggerRDao.updateByProperties( refExpressionTriggerRDao.updateByProperties(new String[]{"triggerName","triggerGroupName"},
"expressionId",oldSysTaskTime.getTimeExpressionId(), new String[]{oldSysTaskTime.getName(),taskTime.getGroupName()},
new String[]{"name","groupName"}, "expressionId",oldSysTaskTime.getTimeExpressionId()
new String[]{oldSysTaskTime.getName(),taskTime.getGroupName()}
); );
taskTimeRDao.update(taskTime); taskTimeRDao.update(taskTime);
@ -106,6 +107,7 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "修改任务状态")
public void updateSysTaskTimeStatus(Long id, int status, SessionUser user) { public void updateSysTaskTimeStatus(Long id, int status, SessionUser user) {
LOGGER.info("定时任务 SYS_MENU id:{} status:{} user:{}", id,status,user); LOGGER.info("定时任务 SYS_MENU id:{} status:{} user:{}", id,status,user);
SysTaskTime taskTime = taskTimeRDao.getById(id); SysTaskTime taskTime = taskTimeRDao.getById(id);
@ -130,6 +132,7 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "根据根据id删除数据")
public void deleteSysTaskTimeById(Long id) { public void deleteSysTaskTimeById(Long id) {
try { try {
SysTaskTime taskTime = taskTimeRDao.getById(id); SysTaskTime taskTime = taskTimeRDao.getById(id);
@ -160,6 +163,7 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "新增定时任务")
public SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) { public SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) {
try { try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@ -226,18 +230,21 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "查询所有数据")
public List<SysTaskTime> listSysTaskTime() { public List<SysTaskTime> listSysTaskTime() {
LOGGER.info("定时任务 TASK_TIME find All"); LOGGER.info("定时任务 TASK_TIME find All");
return taskTimeRDao.findAll(); return taskTimeRDao.findAll();
} }
@Override @Override
@ApiOperation(value = "根据id 数据")
public SysTaskTime getSysTaskTimeById(Long id) { public SysTaskTime getSysTaskTimeById(Long id) {
LOGGER.info("定时任务 TASK_TIME find id:{}", id); LOGGER.info("定时任务 TASK_TIME find id:{}", id);
return taskTimeRDao.getOne(id); return taskTimeRDao.getOne(id);
} }
@Override @Override
@ApiOperation(value = "定时任务复制查询，分页，排序")
public ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager) { public ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager) {
LOGGER.info("定时任务 TASK_TIME SysTaskTime:{}，Pager:{}",taskTime,pager); LOGGER.info("定时任务 TASK_TIME SysTaskTime:{}，Pager:{}",taskTime,pager);
if(taskTime == null) { if(taskTime == null) {
@ -251,12 +258,14 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "根据id批量删除定时任务")
public void deleteSysTaskTimeByIds(Long[] ids) { public void deleteSysTaskTimeByIds(Long[] ids) {
LOGGER.info("定时任务 TASK_TIME ids:{}", ids.toString()); LOGGER.info("定时任务 TASK_TIME ids:{}", ids.toString());
taskTimeRDao.deleteByIds(ids); taskTimeRDao.deleteByIds(ids);
} }
@Override @Override
@ApiOperation(value = "批量修改定时任务状态")
public void updateSysTaskTimeStatusByIds(Long[] ids, Integer status) { public void updateSysTaskTimeStatusByIds(Long[] ids, Integer status) {
LOGGER.info("定时任务 TASK_TIME ids：{}，status：{}",ids,status); LOGGER.info("定时任务 TASK_TIME ids：{}，status：{}",ids,status);
StringBuffer where = new StringBuffer(); StringBuffer where = new StringBuffer();
@ -266,6 +275,7 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "修改最后时间")
public void doSysTaskTimeLastDateByNameAndGroupName(String lastDate, String name, String groupName) { public void doSysTaskTimeLastDateByNameAndGroupName(String lastDate, String name, String groupName) {
taskTimeRDao.updateByProperties( taskTimeRDao.updateByProperties(
new String[]{"name","groupName"},new String[]{name,groupName}, new String[]{"name","groupName"},new String[]{name,groupName},
@ -273,6 +283,7 @@ public class SysTaskTimeService implements ISysTaskTimeService {
} }
@Override @Override
@ApiOperation(value = "立即执行")
public void executeSysTaskTimeById(Long id) { public void executeSysTaskTimeById(Long id) {
SysTaskTime taskTime = taskTimeRDao.getById(id); SysTaskTime taskTime = taskTimeRDao.getById(id);
JobKey jobKey = JobKey.jobKey(taskTime.getName(),taskTime.getGroupName()); JobKey jobKey = JobKey.jobKey(taskTime.getName(),taskTime.getGroupName());

Write Preview
Loading…
Cancel
Save