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 b2cc056..0cd29f5 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 @@ -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.SysMessage; import java.util.List; @@ -17,7 +19,7 @@ public interface ISysMessageService { * 添加消息 * @param sysMessage */ - void insertSysMessage(SysMessage sysMessage); + SysMessage insertSysMessage(SysMessage sysMessage); /** * 删除消息 @@ -43,4 +45,12 @@ public interface ISysMessageService { * @return */ SysMessage getSysMessageById(String id); + + /** + * 系统消息复制查询,分页,排序 + * @param sysMessage + * @param pager + * @return + */ + ListPager querySysMessageByPager(SysMessage sysMessage, Pager pager); } 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 00a027e..613bba4 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 @@ -2,6 +2,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; 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.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; @@ -52,8 +54,8 @@ public class SysMessageController { // 添加初始化 ConvertBean.modelInitialize(sysMessage,user); - // sysMessage.setMessageSendId(user.getUser().getId()); - // sysMessage.setRedSendName(user.getUser().getName()); + sysMessage.setMessageSendId(user.getUser().getId()); + sysMessage.setRedSendName(user.getUser().getName()); sysMessage.setMessageStatusId(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue()); // TODO 状态 status @@ -122,9 +124,7 @@ public class SysMessageController { public ResultBean findSysConfigAll(){ try { List sysMessageList = sysMessageService.listSysMessage(); - return ResultBean.success("查询成功") - .setResultList(sysMessageList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("查询成功").setResultList(sysMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + ":{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep.getErrorShow()); @@ -134,14 +134,12 @@ public class SysMessageController { } } - @GetMapping(value = "/get-by-id") + @GetMapping(value = "/get/{id}") @ApiOperation(value = "根据id查询系统参数",notes = "根据id查询系统参数") public ResultBean getSysConfigById(String id){ try { SysMessage sysMessageList = sysMessageService.getSysMessageById(id); - return ResultBean.success("查询成功") - .setResultObject(sysMessageList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("查询成功").setResultObject(sysMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ LOGGER.error(busExcep.getErrorMsg() + ":{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep.getErrorShow()); @@ -151,4 +149,18 @@ public class SysMessageController { } } + @GetMapping(value = "/query") + @ApiOperation(value = "消息复杂查询,分页,排序",notes = "消息复杂查询,分页,排序") + public ResultBean querySysMessageByPager(SysMessage sysMessage, Pager pager){ + try { + ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(sysMessage,pager); + return ResultBean.success("查询成功").setListPager(sysMessageListPager).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/serviceimpl/busi/SysConfigServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java similarity index 96% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigServiceImpl.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java index 5799f3a..b95a082 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java @@ -22,8 +22,8 @@ import java.util.List; * @Modify : **/ @Service -public class SysConfigServiceImpl implements ISysConfigService { - public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigServiceImpl.class); +public class SysConfigService implements ISysConfigService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigService.class); @Autowired private SysConfigRepository SysConfigRDao; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java similarity index 97% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryServiceImpl.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index 9fe28f7..cf4e900 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -24,8 +24,8 @@ import java.util.List; * @Modify : **/ @Service -public class SysDictionaryServiceImpl implements ISysDictionaryService { - public static final Logger LOGGER = LoggerFactory.getLogger(SysDictionaryServiceImpl.class); +public class SysDictionaryService implements ISysDictionaryService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysDictionaryService.class); @Autowired private SysDictionaryRepository sysDictionaryRDao; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java similarity index 63% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageServiceImpl.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java index 4ac17db..f4670a2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java @@ -1,11 +1,14 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; -import cn.estsh.i3plus.pojo.platform.bean.Department; +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.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.util.ValidatorBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,8 +25,8 @@ import java.util.List; * @Modify : **/ @Service -public class SysMessageServiceImpl implements ISysMessageService { - public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageServiceImpl.class); +public class SysMessageService implements ISysMessageService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageService.class); @Autowired public SysMessageRepository sysMessageRDao; @@ -32,7 +35,7 @@ public class SysMessageServiceImpl implements ISysMessageService { public SysUserRepository sysUserRDao; @Override - public void insertSysMessage(SysMessage sysMessage) { + public SysMessage insertSysMessage(SysMessage sysMessage) { // 查询接收人名称 if (sysMessage.getMessageRecipientId() != null && sysMessage.getMessageRecipientId() > 0) { LOGGER.info("用户信息 SYSUSER id:{}", sysMessage.getMessageRecipientId()); @@ -42,13 +45,13 @@ public class SysMessageServiceImpl implements ISysMessageService { sysMessage.setRedMessageRecipientName(acceptUser.getName()); } - LOGGER.info("系统信息 SYS_MESSAGE :{}",sysMessage); - sysMessageRDao.insert(sysMessage); + LOGGER.info("消息 SYS_MESSAGE :{}",sysMessage); + return sysMessageRDao.insert(sysMessage); } @Override public void deleteSysMessageById(String id) { - LOGGER.info("系统信息 SYS_MESSAGE id:{}",id); + LOGGER.info("消息 SYS_MESSAGE id:{}",id); sysMessageRDao.deleteById(Long.parseLong(id)); } @@ -64,19 +67,32 @@ public class SysMessageServiceImpl implements ISysMessageService { sysMessage.setRedMessageRecipientName(acceptUser.getName()); } - LOGGER.info("系统信息 SYS_MESSAGE :{}",sysMessage); + LOGGER.info("消息 SYS_MESSAGE :{}",sysMessage); sysMessageRDao.update(sysMessage); } @Override public List listSysMessage() { - LOGGER.info("系统信息 SYS_MESSAGE list"); + LOGGER.info("消息 SYS_MESSAGE list"); return sysMessageRDao.list(); } @Override public SysMessage getSysMessageById(String id) { - LOGGER.info("系统信息 SYS_MESSAGE id:{}",id); + LOGGER.info("消息 SYS_MESSAGE id:{}",id); return sysMessageRDao.getById(Long.parseLong(id)); } + + @Override + public ListPager querySysMessageByPager(SysMessage sysMessage, Pager pager) { + LOGGER.info("消息 SYS_MESSAGE SysMessage:{},Pager:{}",sysMessage,pager); + if(sysMessage == null) { + pager = PagerHelper.getPager(pager, sysMessageRDao.listCount()); + return new ListPager(sysMessageRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlSysMessage(sysMessage); + pager = PagerHelper.getPager(pager, sysMessageRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysMessageRDao.findByHqlWherePage(hqlPack + sysMessage.orderBy(),pager),pager); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolService.java similarity index 96% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolServiceImpl.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolService.java index f79488a..f2e040a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolService.java @@ -5,7 +5,6 @@ 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.Organize; import cn.estsh.i3plus.pojo.platform.bean.Tool; import cn.estsh.i3plus.pojo.platform.bean.ToolType; import cn.estsh.i3plus.pojo.platform.repository.ToolRepository; @@ -27,8 +26,8 @@ import java.util.List; * @Modify : **/ @Service -public class ToolServiceImpl implements IToolService { - public static final Logger LOGGER = LoggerFactory.getLogger(ToolServiceImpl.class); +public class ToolService implements IToolService { + public static final Logger LOGGER = LoggerFactory.getLogger(ToolService.class); @Autowired private ToolRepository toolRDao; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeService.java similarity index 94% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeServiceImpl.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeService.java index 41005be..a50b2b8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/ToolTypeService.java @@ -1,19 +1,16 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; -import cn.estsh.i3plus.core.api.iservice.busi.IToolService; import cn.estsh.i3plus.core.api.iservice.busi.IToolTypeService; 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.Organize; import cn.estsh.i3plus.pojo.platform.bean.ToolType; import cn.estsh.i3plus.pojo.platform.repository.ToolRepository; import cn.estsh.i3plus.pojo.platform.repository.ToolTypeRepository; 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; import org.springframework.beans.factory.annotation.Autowired; @@ -29,8 +26,8 @@ import java.util.List; * @Modify : **/ @Service -public class ToolTypeServiceImpl implements IToolTypeService { - public static final Logger LOGGER = LoggerFactory.getLogger(ToolTypeServiceImpl.class); +public class ToolTypeService implements IToolTypeService { + public static final Logger LOGGER = LoggerFactory.getLogger(ToolTypeService.class); @Autowired private ToolTypeRepository toolTypeRDao; diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMessageServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMessageServiceImpl.java new file mode 100644 index 0000000..36fade5 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMessageServiceImpl.java @@ -0,0 +1,111 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; +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.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysMessage; +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 TestMessageServiceImpl extends TestBase { + + @Autowired + ISysMessageService sysMessageService; + + /** + * 测试 查询所有消息 + */ + @Test + @Transactional + public void testListSysMessage() { + List list = sysMessageService.listSysMessage(); + System.out.println(JSON.toJSONString(list)); + } + + /** + * 测试 根据id查询消息 + */ + @Test + @Transactional + public void testGetSysMessageById() { + SysMessage sysMessage = sysMessageService.getSysMessageById("1057110061127700480"); + System.out.println(JSON.toJSONString(sysMessage)); + } + + /** + * 测试 添加消息 + */ + @Test + @Transactional + @Rollback(false) + public void testInsertSysMessage() { + SysMessage sysMessage = new SysMessage(); + sysMessage.setMessageTitle("test-系统通知"); + sysMessage.setRedSendName("system"); + sysMessage.setMessageSendId(-1L); + sysMessage.setRedMessageRecipientName("admin"); + sysMessage.setMessageRecipientId(-1L); + sysMessage.setMessageTypeId(ImppEnumUtil.USER_MESSAGE_TYPE.NOTICE.getValue()); + sysMessage.setMessageStatusId(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue()); + sysMessage.setCreateDatetime("2018-11-01 16:58:00"); + + for (int i = 0; i < 50; i++) { + sysMessage.setId(null); + sysMessage.setMessageTitle("test-系统通知" + i); + sysMessageService.insertSysMessage(sysMessage); + } + System.out.println(JSON.toJSONString(sysMessage)); + } + + /** + * 测试 修改消息 + */ + @Test + @Transactional + public void testUpdateSysMessage(){ + SysMessage sysMessage = sysMessageService.getSysMessageById("1057110613261684736"); + sysMessage.setMessageTitle("测试修改"); + + sysMessageService.updateSysMessage(sysMessage); + } + + /** + * 测试 根据id删除消息 + */ + @Test + @Transactional + public void testDeleteSysMessageById(){ + sysMessageService.deleteSysMessageById("1057111616417566720"); + } + + /** + * 测试 复杂查询 + */ + @Test + @Transactional + public void testQuerySysMessageByPager(){ + SysMessage sysMessage = new SysMessage(); + + Pager pager = new Pager(); + pager.setPageSize(10); + pager.setCurrentPage(5); + + ListPager list = sysMessageService.querySysMessageByPager(sysMessage,pager); + System.out.println(list); + } +} diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java similarity index 97% rename from modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigServiceImpl.java rename to modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java index 8ecc87b..32db391 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java @@ -19,7 +19,7 @@ import java.util.List; * @Date : 2018-10-30 10:49 * @Modify : **/ -public class TestSysConfigServiceImpl extends TestBase { +public class TestSysConfigService extends TestBase { @Autowired private ISysConfigService sysConfigService; diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java similarity index 97% rename from modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryServiceImpl.java rename to modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java index 58ba7be..5fee332 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java @@ -19,7 +19,7 @@ import java.util.List; * @Date : 2018-10-30 18:52 * @Modify : **/ -public class TestSysDictionaryServiceImpl extends TestBase { +public class TestSysDictionaryService extends TestBase { @Autowired private ISysDictionaryService sysDictionaryService; diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolService.java similarity index 98% rename from modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolServiceImpl.java rename to modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolService.java index 3c8f330..cc14785 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolService.java @@ -22,7 +22,7 @@ import java.util.List; * @Date : 2018-10-31 15:30 * @Modify : **/ -public class TestToolServiceImpl extends TestBase { +public class TestToolService extends TestBase { @Autowired IToolService toolService; diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolTypeServiceImpl.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolTypeService.java similarity index 97% rename from modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolTypeServiceImpl.java rename to modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolTypeService.java index 4a58fa4..01e9fd1 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolTypeServiceImpl.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestToolTypeService.java @@ -20,7 +20,7 @@ import java.util.List; * @Date : 2018-10-30 20:36 * @Modify : **/ -public class TestToolTypeServiceImpl extends TestBase { +public class TestToolTypeService extends TestBase { @Autowired private IToolTypeService toolTypeService;