diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java index 83f4827..de7897c 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java @@ -57,6 +57,13 @@ public interface ISysUserInfoService { void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName); /** + * 刷新用户账号信息 + * @param userInfoId + */ + @ApiOperation(value = "刷新用户账号信息",notes = "根据UserInfoId 刷新用户账号信息") + void refreshUserInfoUserNum(Long userInfoId); + + /** * 根据Key 删除数据 * @param id */ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index c4d7c13..29b90dc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -98,12 +98,20 @@ public class SysDictionaryController extends CoreBaseController{ @DeleteMapping("/delete/{id}") @ApiOperation(value = "根据id删除字典",notes = "根据id删除字典") - public ResultBean updateSysDictionary(@PathVariable("id") String id) { + public ResultBean updateSysDictionary(@PathVariable("id") String idStr) { try { // 条件验证 - ValidatorBean.checkNotNull(id,"id不能为空"); + ValidatorBean.checkNotNull(idStr,"id不能为空"); + if(sysDictionaryService.getSysDictionaryById(Long.parseLong(idStr)) == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("字典不存在") + .setErrorSolution("请重新输入字典id") + .build(); + } - sysDictionaryService.deleteSysDictionaryById(Long.parseLong(id)); + sysDictionaryService.deleteSysDictionaryById(Long.parseLong(idStr)); return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java index 859f9e0..0336db1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java @@ -92,11 +92,19 @@ public class SysToolTypeController extends CoreBaseController{ @DeleteMapping("/delete/{id}") @ApiOperation(value = "根据id删除硬件类型",notes = "根据id删除硬件类型") - public ResultBean deleteSysToolType(@PathVariable String id){ + public ResultBean deleteSysToolType(@PathVariable String idStr){ try { - ValidatorBean.checkNotNull(id,"id不能为空"); + ValidatorBean.checkNotNull(idStr,"id不能为空"); + if(toolTypeService.getSysToolTypeById(Long.parseLong(idStr)) == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) + .setErrorDetail("硬件类型不存在") + .setErrorSolution("请重新输入硬件类型id") + .build(); + } - toolTypeService.deleteSysToolTypeById(Long.parseLong(id)); + toolTypeService.deleteSysToolTypeById(Long.parseLong(idStr)); return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java index 18f3bf9..17445ae 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java @@ -1,11 +1,22 @@ package cn.estsh.i3plus.core.apiservice.schedulejob; +import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService; +import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +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.init.ApplicationProperties; +import com.netflix.discovery.converters.Auto; import io.swagger.annotations.ApiOperation; import org.quartz.JobExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import java.text.SimpleDateFormat; /** * @Description : 定时任务 @@ -22,9 +33,29 @@ public class DemoJob extends BaseImppScheduleJob { super(DemoJob.class,"定时任务demo"); } + @Autowired + private ISysTaskTimeService taskTimeService; + @Autowired + private ISysMessageService sysMessageService; + @Autowired + private ISysConfigService sysConfigService; + @Override public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { System.out.println("定时任务被执行"); LOGGER.info("projectName：{},port:{}",applicationProperties.getApplicationName(),applicationProperties.getServerPort()); + + SysMessage sysMessage = new SysMessage(); + sysMessage.setMessageTitle("定时邮件发送"); + sysMessage.setMessageContent("定时邮件内容"+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); + sysMessageService.doSendSysMessage(sysMessage); + + taskTimeService.doSysTaskTimeLastDateByNameAndGroupName(TimeTool.getNowTime(true), + context.getJobDetail().getKey().getName(), + context.getJobDetail().getKey().getGroup()); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java index d97589a..bd8bd7c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java @@ -177,4 +177,25 @@ public class SysMessageService implements ISysMessageService { public void deleteSysRefUserMessageStatusByIds(Long[] ids) { sysRefUserMessageRDao.deleteByIds(ids); } + + @Resource(name="redisRes") + private ImppRedis redisRes; + + @Override + public void insertRedis() { + + // 放入缓存 + HashMap resource = new HashMap(); + resource.put("test","test110"); +// redisRes.multi(); + redisRes.putHashMap("junit3",resource,1000 * 60); + System.out.println(redisRes.getHashMap("junit3")); +// System.out.println(redisRes.commit()); +// System.out.println(redisRes.getHashMap("junit3")); + } + + @Override + public void getRedis() { + System.out.println(redisRes.getHashMap("junit3")); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java index 81e3580..ba42e9f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java @@ -198,7 +198,7 @@ public class SysTaskTimeService implements ISysTaskTimeService{ .withDescription(taskTimeExpression.getExpressionDescription()) .withSchedule(schedBuilder) .startAt(sdf.parse(taskTimeExpression.getExpressionStartDatetime())); - if(taskTimeExpression.getExpressionEndDatetime() != null){ + if(taskTimeExpression.getExpressionEndDatetime() != null && taskTimeExpression.getExpressionEndDatetime().length() != 0){ trigger = trigger.endAt(sdf.parse(taskTimeExpression.getExpressionEndDatetime())); }