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

Merge branches 'dev', 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test

Browse Source
yun-zuoyi
wei.peng 6 years ago
parent b7bf845853 0955b9ac13 c6e88bf0e6
commit 87e15fcd13
6 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File

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

@ -175,6 +175,21 @@ public class SysDictionaryController extends CoreBaseController{
}
}
@GetMapping(value = "/find/{code}")
@ApiOperation(value = "根据父级code查询平台字典项", notes = "根据父级code查询平台字典项")
public ResultBean findSysDictionaryByParentCode(@PathVariable("code") String code) {
try {
List<SysDictionary> sysDictionaryList = sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode(
CommonEnumUtil.SOFT_TYPE.CORE.getValue(),code
);
return ResultBean.success("操作成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@GetMapping(value = "/find/user-info")
@ApiOperation(value = "查询跟用户相关所有字典")
public ResultBean findSysDictionaryUserInfo() {
@ -282,7 +297,7 @@ public class SysDictionaryController extends CoreBaseController{
if(group.containsKey(softType.getValue())){
child = new HashMap();
child.put("id",softType.getValue());
child.put("name",softType.getCode());
child.put("name",softType.getDescription());
child.put("childList",group.get(softType.getValue()));
dictTree.add(child);
}

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

@ -163,8 +163,7 @@ public class SysTaskPlanController extends CoreBaseController{
try {
ResultBean resultBean = ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(sysTaskPlan)
.build();
.setResultObject(sysTaskPlan);
// 数据校验
ValidatorBean.beginValid(sysTaskPlan)
.notNull("name", sysTaskPlan.getName())
@ -188,6 +187,7 @@ public class SysTaskPlanController extends CoreBaseController{
sysTaskPlanService.updateSysTaskPlan(sysTaskPlan);
// 调用对应微服务的检查接口
LOGGER.info("微服定时任务数据校验：name:{}, groupName:{}", sysTaskPlan.getName(), sysTaskPlan.getGroupName());
BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd())
.checkJobExists(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
@ -201,15 +201,13 @@ public class SysTaskPlanController extends CoreBaseController{
resultBean = ResultBean.fail(baseResultBean.getErrorMsg());
}
// 修改对应模块中的定时任务
// 修改对应微服务的定时任务
LOGGER.info("微服修改定时任务数据：taskPlan", sysTaskPlan.toString());
baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd())
.editTask(sysTask.getTaskPackage(), sysTask.getTaskClass(), sysTaskPlan.getName(),
sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanParam());
if(!baseResultBean.isSuccess()){
resultBean = ResultBean.fail(baseResultBean.getErrorMsg());
} else {
}
// 是否立即执行
@ -240,7 +238,7 @@ public class SysTaskPlanController extends CoreBaseController{
sysTaskPlanService.deleteSysTaskPlanById(Long.parseLong(id));
getJobService(sysTaskPlan.getTaskSoftTypeRdd()).deleteTask(sysTaskPlan.getName(),sysTaskPlan.getGroupName());
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).build();
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
}catch(Exception e){
@ -328,7 +326,8 @@ public class SysTaskPlanController extends CoreBaseController{
SysTaskPlan sysTaskPlan = sysTaskPlanService.getSysTaskPlanById(Long.parseLong(id));
// 执行定时任务
BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd())
.executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName());
if(baseResultBean.isSuccess()){
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else{

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

@ -53,7 +53,7 @@ public class ScheduleQueueReceiver {
SysTaskPlan taskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(logTaskTime.getName(),logTaskTime.getGroupName());
if (taskPlan != null) {
taskPlan.setLastRunDateTime(logTaskTime.getCreateDatetime());
taskPlan.setTaskPlanExecNum(taskPlan.getTaskPlanExecNum() + 1);
taskPlan.setTaskPlanExecNum(taskPlan.getTaskPlanExecNumValue() + 1);
taskPlan.setTaskPlanStatus(logTaskTime.getTaskStatus());
// 更新任务状态以及最后执行时间
sysTaskPlanService.updateSysTaskPlan(taskPlan);

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

@ -134,7 +134,7 @@ public class SysDictionaryService implements ISysDictionaryService {
@ApiOperation(value = "根据父级代码查询字典项信息")
public List<SysDictionary> findSysDictionaryBySoftTypeAndParentCode(Integer softType, String parentCode) {
LOGGER.info("字典 SYS_DICTIONARY parentCode:{}", parentCode);
return sysDictionaryRDao.findByProperty(new String[]{"softType", "parentCodeRdd"}, new Object[]{softType, parentCode});
return sysDictionaryRDao.findByProperty(new String[]{"dictionarySoftType", "parentCodeRdd"}, new Object[]{softType, parentCode});
}
@Override

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

@ -55,7 +55,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
.setErrorSolution("请检查打印模板")
.build();
}
sysLabelTemplate.setOrganizeCode(AuthUtil.getSessionUser().getUserInfo().getOrganize().getOrganizeCode());
SysLabelTemplate insertResult = sysLabelTemplateRDao.insert(sysLabelTemplate);
// 新增打印模板成功
if (insertResult != null) {
@ -71,6 +71,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService {
templateParam.setTemplateId(insertResult.getId());
templateParam.setTemplateParam(paramItem);
templateParam.setTemplateParamText(paramItem);
templateParam.setOrganizeCode(AuthUtil.getSessionUser().getUserInfo().getOrganize().getOrganizeCode());
ConvertBean.serviceModelInitialize(templateParam, AuthUtil.getSessionUser().getUserName());
sysLabelTemplateParamRDao.insert(templateParam);
}

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

@ -83,10 +83,26 @@ public class SysTaskPlanService implements ISysTaskPlanService {
"taskCycleId", oldSysTaskPlan.getTaskCycleId()
);
sysTaskPlan.setTaskPlanExecNum(oldSysTaskPlan.getTaskPlanExecNum());
sysTaskPlan.setLastRunDateTime(oldSysTaskPlan.getLastRunDateTime());
sysTaskPlan.setTaskPlanStatus(oldSysTaskPlan.getTaskPlanStatus());
sysTaskPlanRDao.update(sysTaskPlan);
oldSysTaskPlan.setTaskCycleId(sysTaskPlan.getTaskCycleId());
oldSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd());
oldSysTaskPlan.setTaskCycleExpsRdd(sysTaskPlan.getTaskCycleExpsRdd());
oldSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd());
oldSysTaskPlan.setTaskPlanExecNum(sysTaskPlan.getTaskPlanExecNum());
oldSysTaskPlan.setTaskMethodType(sysTaskPlan.getTaskMethodType());
oldSysTaskPlan.setTaskId(sysTaskPlan.getTaskId());
oldSysTaskPlan.setTaskNameRdd(sysTaskPlan.getTaskNameRdd());
oldSysTaskPlan.setTaskSoftTypeRdd(sysTaskPlan.getTaskSoftTypeRdd());
oldSysTaskPlan.setTaskPlanParam(sysTaskPlan.getTaskPlanParam());
oldSysTaskPlan.setTaskCycleStartDateTimeRdd(sysTaskPlan.getTaskCycleStartDateTimeRdd());
oldSysTaskPlan.setTaskCycleEndDateTimeRdd(sysTaskPlan.getTaskCycleEndDateTimeRdd());
oldSysTaskPlan.setTaskPlanDescription(sysTaskPlan.getTaskPlanDescription());
oldSysTaskPlan.setLastRunDateTime(sysTaskPlan.getLastRunDateTime());
oldSysTaskPlan.setIsNotice(sysTaskPlan.getIsNotice());
oldSysTaskPlan.setIsInternalUser(sysTaskPlan.getIsInternalUser());
oldSysTaskPlan.setNoticeChannel(sysTaskPlan.getNoticeChannel());
oldSysTaskPlan.setNoticeMethod(sysTaskPlan.getNoticeMethod());
oldSysTaskPlan.setTaskPlanStatus(sysTaskPlan.getTaskPlanStatus());
sysTaskPlanRDao.update(oldSysTaskPlan);
}
@Override
@ -140,12 +156,10 @@ public class SysTaskPlanService implements ISysTaskPlanService {
@Override
@ApiOperation(value = "查询任务计划", notes = "根据任务计划名称与组名称查询")
public SysTaskPlan getSysTaskPlanByNameAndGroup(String name, String groupName) {
List<SysTaskPlan> sysTaskPlanList = sysTaskPlanRDao.findByProperty(new String[]{"name", "groupName"},
new Object[]{name, groupName});
if (sysTaskPlanList != null && sysTaskPlanList.isEmpty()) {
return sysTaskPlanList.get(0);
}
return null;
return sysTaskPlanRDao.getByProperty(
new String[]{"name", "groupName"},
new Object[]{name, groupName}
);
}
@Override

Write Preview
Loading…
Cancel
Save