diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java index bce8695..7232b7d 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysFileService.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SysFile; import java.util.List; @@ -43,4 +45,12 @@ public interface ISysFileService { * @return */ SysFile getSysFileById(String id); + + /** + * 文件资源查询，分页，排序 + * @param sysFile + * @param pager + * @return + */ + ListPager querySysFileByPager(SysFile sysFile, Pager pager); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java index 0cd29f5..c5e33b3 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java @@ -47,10 +47,31 @@ public interface ISysMessageService { SysMessage getSysMessageById(String id); /** - * 系统消息复制查询，分页，排序 + * 系统消息复杂查询，分页，排序 * @param sysMessage * @param pager * @return */ ListPager querySysMessageByPager(SysMessage sysMessage, Pager pager); + + /** + * 根据id修改消息状态 + * @param id + * @param status + */ + void updateSysMessageStatusById(String id,Integer status); + + /** + * 批量删除系统消息 + * @param ids + */ + void deleteSysMessageByIds(String[] ids); + + + /** + * 批量修改消息状态 + * @param ids + * @param status + */ + void updateSysMessageStatusByIds(String[] ids,Integer status); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeExpressionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeExpressionService.java index 154b09e..4df32a6 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeExpressionService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITaskTimeExpressionService.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.core.api.iservice.busi; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +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.TaskTimeExpression; @@ -38,7 +41,7 @@ public interface ITaskTimeExpressionService { * 查询所有数据 * @return */ - List findTaskTimeExpressionAll(); + List listTaskTimeExpression(); /** * 根据ID 查询任务表达式 @@ -47,4 +50,11 @@ public interface ITaskTimeExpressionService { */ TaskTimeExpression getTaskTimeExpressionById(String id); + /** + * 任务表达式查询，分页，排序 + * @param taskTimeExpression + * @param pager + * @return + */ + ListPager queryTaskTimeExpressionByPager(TaskTimeExpression taskTimeExpression, Pager pager); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index b6b9717..ce8c5cf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -2,9 +2,12 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysFile; +import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; @@ -129,4 +132,19 @@ public class SysFileController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @GetMapping(value = "/query") + @ApiOperation(value = "文件资源复杂查询，分页，排序",notes = "文件资源复杂查询，分页，排序") + public ResultBean querySysFileByPager(SysFile sysFile, Pager pager){ + try { + ListPager sysFileListPager = sysFileService.querySysFileByPager(sysFile,pager); + return ResultBean.success("查询成功").setListPager(sysFileListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } } \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index 613bba4..9dba1bb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java @@ -4,12 +4,14 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; 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.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -57,7 +59,6 @@ public class SysMessageController { sysMessage.setMessageSendId(user.getUser().getId()); sysMessage.setRedSendName(user.getUser().getName()); sysMessage.setMessageStatusId(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue()); - // TODO 状态 status sysMessageService.insertSysMessage(sysMessage); return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -102,11 +103,8 @@ public class SysMessageController { .checkNotZero("messageType",sysMessage.getMessageTypeId()) .notNull("messageRecipientId",sysMessage.getMessageRecipientId()); - // 添加初始化 + // 修改初始化 ConvertBean.modelUpdate(sysMessage,user); - // sysMessage.setMessageSendId(user.getUser().getId()); - // sysMessage.setRedSendName(user.getUser().getName()); - // TODO 状态 status sysMessageService.updateSysMessage(sysMessage); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -163,4 +161,66 @@ public class SysMessageController { return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); } } + + @PutMapping("/status") + public ResultBean updateSysMessageStatusById(String id,Integer status){ + try { + // 条件校验 + ValidatorBean.checkNotNull(id,"id不能为空"); + ValidatorBean.checkNotZero(status,"修改状态值不能为空"); + + sysMessageService.updateSysMessageStatusById(id,status); + return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @DeleteMapping("/batch-delete") + @ApiOperation(value = "批量删除消息",notes = "批量删除消息") + public ResultBean deleteSysMessageByIds(String[] ids){ + try{ + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + sysMessageService.deleteSysMessageByIds(ids); + return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @DeleteMapping("/batch-status") + @ApiOperation(value = "批量切换消息状态",notes = "批量切换消息状态") + public ResultBean deleteSysMessageByIds(String[] ids,Integer status){ + try{ + if(ids.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要操作的资源。") + .build(); + } + sysMessageService.updateSysMessageStatusByIds(ids,status); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java index 25b97ed..40e9974 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java @@ -110,7 +110,7 @@ public class TaskTimeExpressionController { @ApiOperation(value = "查询时间表达式所有", notes = "查询所有系统时间表达式") public ResultBean findTaskTimeExpressionAll() { try { - List list = taskTimeExpressionService.findTaskTimeExpressionAll(); + List list = taskTimeExpressionService.listTaskTimeExpression(); return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultList(list); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java index 78d561b..da84501 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java @@ -162,7 +162,7 @@ public class ToolTypeController { } } - @DeleteMapping("/batch-delete") + @DeleteMapping(value = "/batch-delete") @ApiOperation(value = "批量删除硬件类型",notes = "批量删除硬件类型") public ResultBean deleteToolTypeByIds(String[] ids){ try{ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java index 8193977..2a43a63 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysFileServiceImpl.java @@ -1,8 +1,12 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.platform.bean.SysFile; import cn.estsh.i3plus.pojo.platform.repository.SysFileRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -53,4 +57,17 @@ public class SysFileServiceImpl implements ISysFileService { LOGGER.info("文件资源 SYS_FILE id:{}",id); return sysFileRDao.getById(Long.parseLong(id)); } + + @Override + public ListPager querySysFileByPager(SysFile sysFile, Pager pager) { + LOGGER.info("文件资源 SYS_FILE sysFile:{}，Pager:{}",sysFile,pager); + if(sysFile == null) { + pager = PagerHelper.getPager(pager, sysFileRDao.listCount()); + return new ListPager(sysFileRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlSysFile(sysFile); + pager = PagerHelper.getPager(pager, sysFileRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysFileRDao.findByHqlWherePage(hqlPack + sysFile.orderBy(),pager),pager); + } + } } 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 f4670a2..2a0c34f 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 @@ -4,11 +4,14 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.repository.SysMessageRepository; import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,4 +98,35 @@ public class SysMessageService implements ISysMessageService { return new ListPager(sysMessageRDao.findByHqlWherePage(hqlPack + sysMessage.orderBy(),pager),pager); } } + + @Override + public void updateSysMessageStatusById(String id, Integer status) { + LOGGER.info("消息 SYS_MESSAGE id:{}，status:{}",id,status); + SysMessage sysMessage = sysMessageRDao.getById(Long.parseLong(id)); + sysMessage.setMessageStatusId(status); + + sysMessageRDao.update(sysMessage); + } + + @Override + public void deleteSysMessageByIds(String[] ids) { + LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString()); + long[] array = new long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + + sysMessageRDao.deleteByIds(array); + } + + @Override + public void updateSysMessageStatusByIds(String[] ids,Integer status) { + LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString()); + long[] array = new long[ids.length]; + for (int i = 0; i < ids.length; i++) { + array[i] = Long.parseLong(ids[i]); + } + // TODO 批量修改消息状态 +// sysMessageRDao. + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeExpressionServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeExpressionServiceImpl.java index 3894475..37f2431 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeExpressionServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TaskTimeExpressionServiceImpl.java @@ -1,8 +1,12 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression; import cn.estsh.i3plus.pojo.platform.repository.TaskTimeExpressionRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -44,9 +48,9 @@ public class TaskTimeExpressionServiceImpl implements ITaskTimeExpressionService } @Override - public List findTaskTimeExpressionAll() { - LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION find All"); - return taskTimeRecordingRDao.findAll(); + public List listTaskTimeExpression() { + LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION list"); + return taskTimeRecordingRDao.list(); } @Override @@ -54,4 +58,17 @@ public class TaskTimeExpressionServiceImpl implements ITaskTimeExpressionService LOGGER.info("定时任务时间表达式 Task_TIME_EXPRESSION :{}" ,id); return taskTimeRecordingRDao.getById(Long.parseLong(id)); } + + @Override + public ListPager queryTaskTimeExpressionByPager(TaskTimeExpression taskTimeExpression, Pager pager) { + LOGGER.info("文件表达式 TaskTimeExpression taskTimeExpression:{}，Pager:{}",taskTimeExpression,pager); + if(taskTimeExpression == null) { + pager = PagerHelper.getPager(pager, taskTimeRecordingRDao.listCount()); + return new ListPager(taskTimeRecordingRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlSysFile(taskTimeExpression); + pager = PagerHelper.getPager(pager, taskTimeRecordingRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(taskTimeRecordingRDao.findByHqlWherePage(hqlPack + taskTimeExpression.orderBy(),pager),pager); + } + } } diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysFileService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysFileService.java new file mode 100644 index 0000000..0ca88b3 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysFileService.java @@ -0,0 +1,109 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; +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.platform.bean.SysFile; +import com.alibaba.fastjson.JSON; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.Rollback; + +import javax.transaction.Transactional; +import java.util.List; + +/** + * @Description : 测试 文件资源服务接口 + * @Reference : + * @Author : yunhao + * @Date : 2018-10-31 15:30 + * @Modify : + **/ +public class TestSysFileService extends TestBase { + + @Autowired + ISysFileService sysFileService; + + /** + * 测试 查询所有文件资源 + */ + @Test + @Transactional + public void testListSysFile() { + List list = sysFileService.listSysFile(); + System.out.println(JSON.toJSONString(list)); + } + + /** + * 测试 根据id查询文件资源 + */ + @Test + @Transactional + public void testGetSysFileById() { + SysFile sysFile = sysFileService.getSysFileById("1057110061127700480"); + System.out.println(JSON.toJSONString(sysFile)); + } + + /** + * 测试 添加文件资源 + */ + @Test + @Transactional + @Rollback(false) + public void testInsertSysFile() { + SysFile sysFile = new SysFile(); + sysFile.setName("文件doc"); + sysFile.setFileTypeId(1058251784058966016L); + sysFile.setFileTypeName("doc"); + sysFile.setDownloads(999); + sysFile.setFileSize(1024); + sysFile.setCreateUser("中国移动"); + sysFile.setCreateDatetime("2018-01-01 00:00:00"); + for (int i = 0; i < 50; i++) { + sysFile.setId(null); + sysFile.setName("文件"+ i +".doc"); + sysFile.setCreateDatetime("2018-01-01 " + (i % 10) + "0:00:00"); + sysFileService.insertSysFile(sysFile); + } + System.out.println(JSON.toJSONString(sysFile)); + } + + /** + * 测试 修改文件资源 + */ + @Test + @Transactional + public void testUpdateSysFile(){ + SysFile sysFile = sysFileService.getSysFileById("1057110613261684736"); + sysFile.setName("测试修改"); + + sysFileService.updateSysFile(sysFile); + } + + /** + * 测试 根据id删除文件资源 + */ + @Test + @Transactional + public void testDeleteSysFileById(){ + sysFileService.deleteSysFileById("1057111616417566720"); + } + + /** + * 测试 复杂查询 + */ + @Test + @Transactional + public void testQuerySysFileByPager(){ + SysFile sysFile = new SysFile(); + + Pager pager = new Pager(); + pager.setPageSize(10); + pager.setCurrentPage(5); + + ListPager list = sysFileService.querySysFileByPager(sysFile,pager); + System.out.println(list); + } +} diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java new file mode 100644 index 0000000..1da712a --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTaskTimeExpressionService.java @@ -0,0 +1,104 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService; +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.platform.bean.TaskTimeExpression; +import com.alibaba.fastjson.JSON; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.Rollback; + +import javax.transaction.Transactional; +import java.util.List; + +/** + * @Description : 测试 时间表达式 + * @Reference : + * @Author : yunhao + * @Date : 2018-10-31 15:30 + * @Modify : + **/ +public class TestTaskTimeExpressionService extends TestBase { + + @Autowired + ITaskTimeExpressionService taskTimeExpressionService; + + /** + * 测试 查询所有时间表达式 + */ + @Test + @Transactional + public void testListTaskTimeExpression() { + List list = taskTimeExpressionService.listTaskTimeExpression(); + System.out.println(JSON.toJSONString(list)); + } + + /** + * 测试 根据id查询时间表达式 + */ + @Test + @Transactional + public void testGetTaskTimeExpressionById() { + TaskTimeExpression taskTimeExpression = taskTimeExpressionService.getTaskTimeExpressionById("1057110061127700480"); + System.out.println(JSON.toJSONString(taskTimeExpression)); + } + + /** + * 测试 添加时间表达式 + */ + @Test + @Transactional + @Rollback(false) + public void testInsertTaskTimeExpression() { + TaskTimeExpression taskTimeExpression = new TaskTimeExpression(); + taskTimeExpression.setName("表达式"); + taskTimeExpression.setTimeExpression("0000000"); + taskTimeExpression.setTimeDescription("描述"); + + for (int i = 0; i < 50; i++) { + taskTimeExpression.setId(null); + taskTimeExpression.setName("表达式"+i); + taskTimeExpressionService.insertTaskTimeExpression(taskTimeExpression); + } + System.out.println(JSON.toJSONString(taskTimeExpression)); + } + + /** + * 测试 修改时间表达式 + */ + @Test + @Transactional + public void testUpdateTaskTimeExpression(){ + TaskTimeExpression taskTimeExpression = taskTimeExpressionService.getTaskTimeExpressionById("1057110613261684736"); + taskTimeExpression.setName("测试修改"); + + taskTimeExpressionService.updateTaskTimeExpression(taskTimeExpression); + } + + /** + * 测试 根据id删除时间表达式 + */ + @Test + @Transactional + public void testDeleteTaskTimeExpressionById(){ + taskTimeExpressionService.deleteTaskTimeExpressionById("1057111616417566720"); + } + + /** + * 测试 复杂查询 + */ + @Test + @Transactional + public void testQueryTaskTimeExpressionByPager(){ + TaskTimeExpression taskTimeExpression = new TaskTimeExpression(); + + Pager pager = new Pager(); + pager.setPageSize(10); + pager.setCurrentPage(5); + + ListPager list = taskTimeExpressionService.queryTaskTimeExpressionByPager(taskTimeExpression,pager); + System.out.println(list); + } +}