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

字典微服务调整

Browse Source 
定时任务优化
yun-zuoyi
yunhao.wang 6 years ago
parent b2873e80ae
commit 76c234ced3
3 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -55,7 +55,7 @@ public class SysDictionaryController extends CoreBaseController{
ValidatorBean.beginValid(sysDictionary)
.notNull("id",sysDictionary.getId())
.notNull("name",sysDictionary.getName())
.notNull("softType",sysDictionary.getSoftType())
.notNull("dictionarySoftType",sysDictionary.getDictionarySoftType())
.notNull("dictionaryCode",sysDictionary.getDictionaryCode())
.notNull("dictionaryValue",sysDictionary.getDictionaryValue());
@ -81,7 +81,7 @@ public class SysDictionaryController extends CoreBaseController{
// 条件验证
ValidatorBean.beginValid(sysDictionary)
.notNull("name",sysDictionary.getName())
.notNull("softType",sysDictionary.getSoftType())
.notNull("dictionarySoftType",sysDictionary.getDictionarySoftType())
.notNull("dictionaryCode",sysDictionary.getDictionaryCode())
.notNull("dictionaryValue",sysDictionary.getDictionaryValue());
@ -275,7 +275,7 @@ public class SysDictionaryController extends CoreBaseController{
public ResultBean findSysDictionaryTree(){
try {
// 根据软件类型分组
Map group = sysDictionaryService.findSysDictionaryByTop().stream().collect(Collectors.groupingBy(SysDictionary::getSoftType));
Map group = sysDictionaryService.findSysDictionaryByTop().stream().collect(Collectors.groupingBy(SysDictionary::getDictionarySoftType));
List<Map<String,Object>> dictTree = new ArrayList<>();
Map child;

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

@ -4,12 +4,11 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
import cn.estsh.i3plus.icloud.wms.sdk.IWmsScheduleJobCloud;
import cn.estsh.i3plus.platform.common.tool.StringTool;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
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.platform.bean.SysTask;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
@ -98,24 +97,49 @@ public class SysTaskPlanController extends CoreBaseController{
ValidatorBean.checkNotNull(sysTask,"任务不存在");
// 设置冗余信息
sysTaskPlan.setTaskPlanExecNum(0);
sysTaskPlan.setTaskNameRdd(sysTask.getName());
sysTaskPlan.setTaskSoftTypeRdd(sysTask.getTaskSoftType());
sysTaskPlan.setTaskCycleNameRdd(sysTaskCycle.getName());
sysTaskPlan.setTaskCycleExpsRdd(sysTaskCycle.getTaskCycleExps());
sysTaskPlan.setTaskCycleStartDateTimeRdd(sysTaskCycle.getTaskCycleStartDatetime());
sysTaskPlan.setTaskCycleEndDateTimeRdd(sysTaskCycle.getTaskCycleEndDatetime());
sysTaskPlan.setTaskPlanExecNum(0);
sysTaskPlan.setTaskPlanStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
sysTaskPlan = sysTaskPlanService.insertSysTaskPlan(sysTaskPlan);
// 唯一检查
BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).checkJobExists(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
if(baseResultBean.isSuccess()){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode())
.setErrorDetail("定时任务已存在")
.build();
}
// 添加至对应模块调度器中
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).addTask(sysTask.getTaskPackage(),sysTask.getTaskClass(),sysTaskPlan.getName()
,sysTaskPlan.getGroupName(),sysTaskCycle.getTaskCycleExps(),sysTaskPlan.getTaskPlanDescription());
baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).addTask(sysTask.getTaskPackage(),
sysTask.getTaskClass(),sysTaskPlan.getName(),sysTaskPlan.getGroupName(),sysTaskCycle.getTaskCycleExps(),
sysTaskPlan.getTaskPlanDescription());
if (!baseResultBean.isSuccess()) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode())
.setErrorDetail("定时任务添加失败")
.build();
}
sysTaskPlan = sysTaskPlanService.insertSysTaskPlan(sysTaskPlan);
// 立即执行
if(isExecute != null && isExecute){
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
if (!baseResultBean.isSuccess()) {
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode())
.setErrorDetail("定时任务执行失败")
.build();
}
}
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTaskPlan);
}catch(ImppBusiException busExcep){

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

@ -40,10 +40,10 @@ public class SysDictionaryService implements ISysDictionaryService {
@Override
@ApiOperation(value = "添加字典")
public void insertSysDictionary(SysDictionary sysDictionary) {
long repeatCodeCount = sysDictionaryRDao.findByPropertyCount(new String[]{"dictionaryCode", "softType"},
new Object[]{sysDictionary.getDictionaryCode(), sysDictionary.getSoftType()});
long repeatValueCount = sysDictionaryRDao.findByPropertyCount(new String[]{"parentId", "dictionaryValue", "softType"},
new Object[]{sysDictionary.getParentId(), sysDictionary.getDictionaryValue(), sysDictionary.getSoftType()});
long repeatCodeCount = sysDictionaryRDao.findByPropertyCount(new String[]{"dictionaryCode", "dictionarySoftType"},
new Object[]{sysDictionary.getDictionaryCode(), sysDictionary.getDictionarySoftType()});
long repeatValueCount = sysDictionaryRDao.findByPropertyCount(new String[]{"parentId", "dictionaryValue", "dictionarySoftType"},
new Object[]{sysDictionary.getParentId(), sysDictionary.getDictionaryValue(), sysDictionary.getDictionarySoftType()});
if (repeatCodeCount > 0 || repeatValueCount > 0){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
@ -96,6 +96,7 @@ public class SysDictionaryService implements ISysDictionaryService {
// 数据反填
SysDictionary newSysDict = sysDictionaryRDao.getById(sysDictionary.getId());
newSysDict.setName(sysDictionary.getName());
newSysDict.setDictionarySoftType(sysDictionary.getDictionarySoftType());
newSysDict.setDictionaryCode(sysDictionary.getDictionaryCode());
newSysDict.setParentId(sysDictionary.getParentId());
newSysDict.setDictionarySort(sysDictionary.getDictionarySort());

Write Preview
Loading…
Cancel
Save