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

Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev

Browse Source
yun-zuoyi
crish 6 years ago
parent 0a61d16157 4d4b977f13
commit 507cd718e4
11 changed files with 65 additions and 35 deletions
Show Stats Download Patch File Download Diff File

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

@ -77,4 +77,12 @@ public interface ISysTaskService {
*/
@ApiOperation(value = "任务管理复杂查询，分页，排序",notes = "任务管理复杂查询，分页，排序")
ListPager<SysTask> querySysTaskByPager(SysTask sysTask, Pager pager);
/**
* 根据code查询任务
* @param code
* @return
*/
@ApiOperation(value = "根据code查询任务",notes = "根据code查询任务")
SysTask getSysTaskByCode(String code);
}

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

@ -245,4 +245,25 @@ public class SysTaskController extends CoreBaseController {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
/**
* 根据code查询任务
* @return
*/
@GetMapping(value = "/get-code")
@ApiOperation(value = "根据code查询任务", notes = "根据code查询任务")
public ResultBean<SysTask> getSysTaskByCode(String code) {
try {
ValidatorBean.checkNotNull(code, "任务代码不能为空");
SysTask sysTask = sysTaskService.getSysTaskByCode(code);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultObject(sysTask);
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
} catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

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

@ -166,12 +166,12 @@ public class SysTaskCycleController extends CoreBaseController {
for (SysRefTaskCyclePlan item : taskCyclePlans) {
// 查找关联任务计划
sysTaskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(item.getTaskPlanName(), item.getTaskPlanGroupName());
ValidatorBean.checkNotNull(sysTaskPlan, "任务计划不存在，" +
"组名称：【" + item.getTaskPlanGroupName() + "】,名称：【" + item.getTaskPlanName() + "】");
// 查找任务
sysTask = sysTaskService.getSysTaskById(sysTaskPlan.getTaskId());
ValidatorBean.checkNotNull(sysTask, "任务不存在：【" + sysTaskPlan.getTaskNameRdd() + "】");
if(sysTaskPlan == null || sysTask == null){
continue;
}
sysTaskPlan.setTaskCycleNameRdd(sysTaskCycle.getName());
sysTaskPlan.setTaskCycleExpsRdd(sysTaskCycle.getTaskCycleExps());
@ -231,7 +231,7 @@ public class SysTaskCycleController extends CoreBaseController {
*/
@GetMapping(value = "/list")
@ApiOperation(value = "查询所有任务周期信息", notes = "查询所有任务周期信息")
public ResultBean findSysTaskCycle() {
public ResultBean<SysTaskCycle> findSysTaskCycle() {
try {
List<SysTaskCycle> list = sysTaskCycleService.listSysTaskCycle();
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);

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

@ -30,13 +30,8 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
@ -115,7 +110,7 @@ public class SysTaskPlanController extends CoreBaseController {
*/
@PostMapping(value = "/insert")
@ApiOperation(value = "新增任务计划", notes = "任务计划")
public ResultBean insertSysTaskTime(SysTaskPlan sysTaskPlan, Integer isExecute) {
public ResultBean<SysTaskPlan> insertSysTaskTime(@RequestBody SysTaskPlan sysTaskPlan, Integer isExecute) {
try {
startMultiService();
@ -184,6 +179,7 @@ public class SysTaskPlanController extends CoreBaseController {
.build();
}
}
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTaskPlan);
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
@ -201,7 +197,7 @@ public class SysTaskPlanController extends CoreBaseController {
*/
@PutMapping(value = "/update")
@ApiOperation(value = "修改任务计划", notes = "任务计划")
public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Integer isExecute) {
public ResultBean<SysTaskPlan> updateSysTaskTime(@RequestBody SysTaskPlan sysTaskPlan, Integer isExecute) {
try {
startMultiService();

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

@ -23,7 +23,9 @@ import java.util.Date;
* @Modify:
**/
public class CoreLogClearJob extends BaseImppScheduleJob {
public static final Logger LOGGER = LoggerFactory.getLogger(CoreLogClearJob.class);
private static final long serialVersionUID = 2706787898778108791L;
public CoreLogClearJob() {
super(CoreLogClearJob.class,"日志清除");

6
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreMessagePushJob.java
Unescape Escape View File

@ -19,10 +19,12 @@ import org.springframework.beans.factory.annotation.Autowired;
**/
@ApiOperation("通用消息推送job")
public class CoreMessagePushJob extends BaseImppScheduleJob {
public static final Logger LOGGER = LoggerFactory.getLogger(CoreMessagePushJob.class);
private static final long serialVersionUID = -8458291754519027369L;
public CoreMessagePushJob() {
super(CoreMessagePushJob.class,"通用消息推送job");
super(CoreMessagePushJob.class, "通用消息推送job");
}
/**
@ -33,6 +35,6 @@ public class CoreMessagePushJob extends BaseImppScheduleJob {
@Override
public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) {
rabbitTemplate.convertAndSend(getJobParam(),CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
rabbitTemplate.convertAndSend(getJobParam(), CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
}
}

1
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoCloudJob.java
Unescape Escape View File

@ -17,6 +17,7 @@ import org.slf4j.LoggerFactory;
@ApiOperation("测试微服定时任务demo")
public class DemoCloudJob extends BaseImppScheduleJob {
public static final Logger LOGGER = LoggerFactory.getLogger(DemoJob.class);
private static final long serialVersionUID = 6565382987595461305L;
public DemoCloudJob() {
super(DemoJob.class, "测试微服定时任务demo");

27
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java
Unescape Escape View File

@ -1,16 +1,13 @@
package cn.estsh.i3plus.core.apiservice.schedulejob;
import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
import cn.estsh.i3plus.platform.common.tool.TimeTool;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.init.ApplicationProperties;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.quartz.JobExecutionContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -26,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
@ApiOperation("定时任务demo")
public class DemoJob extends BaseImppScheduleJob {
public static final Logger LOGGER = LoggerFactory.getLogger(DemoJob.class);
private static final long serialVersionUID = 2582480740831583839L;
public DemoJob() {
super(DemoJob.class,"定时任务demo");
@ -44,19 +42,14 @@ public class DemoJob extends BaseImppScheduleJob {
.setErrorSolution("请检查异常通知邮件")
.build();
}
try {
if(getJobParam() != null && StringUtils.isNotBlank(getJobParam())) {
Thread.sleep(Long.parseLong(getJobParam()));
}
} catch (InterruptedException e) {
e.printStackTrace();
}
System.out.println("定时任务被执行");
LOGGER.info("projectName：{},port:{}", applicationProperties.getApplicationName(),applicationProperties.getServerPort());
SysMessage sysMessage = new SysMessage();
sysMessage.setMessageTitle("定时邮件发送");
sysMessage.setMessageContent("定时任务name："+context.getJobDetail().getKey().getName() +
"定时任务groupName："+context.getJobDetail().getKey().getGroup() +
"定时邮件内容"+TimeTool.getNowTime(true));
sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue());
sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue());
sysMessage.setMessageReceiversId(PlatformConstWords.CONTACT_MAIL);
sysMessage.setMessageReceiversNameRdd(PlatformConstWords.CONTACT_MAIL);
sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.URGENT.getValue());
sysMessageService.doSendSysMessage(sysMessage);
}
}

1
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/TestCRUDPressure.java
Unescape Escape View File

@ -35,6 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
**/
public class TestCRUDPressure extends BaseImppScheduleJob {
private static final long serialVersionUID = -5611654157756961800L;
@Autowired
private ISysToolService sysToolService;

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

@ -18,6 +18,7 @@ import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSFile;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -51,7 +52,7 @@ public class SysFileServiceImpl implements ISysFileService {
@ApiOperation(value = "新增资源信息")
public SysFile insertSysFile(SysFile sysFile) {
LOGGER.info("文件资源 SYS_FILE :{}", sysFile);
if (sysFile.getFileCode() != null) {
if (StringUtils.isNotBlank(sysFile.getFileCode())) {
SysFile fileCode = sysFileRDao.getByProperty("fileCode", sysFile.getFileCode());
if (fileCode != null) {
throw ImppExceptionBuilder.newInstance()
@ -81,7 +82,7 @@ public class SysFileServiceImpl implements ISysFileService {
}
// 文件代码唯一校验
if (sysFile.getFileCode() != null) {
if (StringUtils.isNotBlank(sysFile.getFileCode())) {
List list = sysFileRDao.findByHqlWhere(CoreHqlPack.packHqlSysFileCode(sysFile));
if (list != null && list.size() > 0) {
throw ImppExceptionBuilder.newInstance()

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

@ -135,4 +135,9 @@ public class SysTaskService implements ISysTaskService {
return new ListPager(sysTaskRDao.findByHqlWherePage(hqlPack + sysTask.orderBy(),pager),pager);
}
}
@Override
public SysTask getSysTaskByCode(String code) {
return sysTaskRDao.getByProperty("taskCode",code);
}
}

Write Preview
Loading…
Cancel
Save