From 18b04a720eff52222345d89c18dc55dc45b71783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 20 May 2019 13:45:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=96=87=E6=9C=AC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ITestService.java | 9 +++++ modules/i3plus-core-apiservice/pom.xml | 18 ++++++++++ .../controller/DemoDdlPackController.java | 39 ++++++++++++++++++++-- .../controller/busi/SysFileController.java | 2 +- .../apiservice/mq/MessageLetterQueueReceiver.java | 3 ++ .../core/apiservice/mq/ScheduleQueueReceiver.java | 4 +++ .../apiservice/serviceimpl/busi/TestService.java | 15 +++++++++ pom.xml | 22 ++++++++++++ 8 files changed, 108 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITestService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITestService.java index e48c209..9e1651f 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITestService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITestService.java @@ -25,4 +25,13 @@ public interface ITestService { @ApiOperation(value = "in条件封装查询") List querySysUserByPack(DdlPackBean packBean); + + @ApiOperation(value = "添加用户") + void insertSysUser(SysUser sysUser); + + @ApiOperation(value = "修改用户") + void updateSysUser(SysUser sysUser); + + @ApiOperation(value = "查询用户") + List listSysUser(); } diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index 3e4de62..9c4153e 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -77,17 +77,35 @@ mysql-connector-java + + com.oracle + ojdbc6 + + org.apache.tomcat.embed tomcat-embed-jasper + org.apache.commons commons-lang3 + + + com.microsoft.sqlserver + sqljdbc4 + + + + + org.postgresql + postgresql + + org.apache.shiro diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java index a9890a1..dc2c3b6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java @@ -15,9 +15,7 @@ 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.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; @@ -101,4 +99,39 @@ public class DemoDdlPackController { ListPager listPager = testService.querySysUserByPager(user,pager); return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } + + /** + * 测试添加长文本数据 + * @param sysUser + * @return + */ + @PostMapping(value="/test-insert") + @ApiOperation(value="测试添加长文本数据") + public BaseResultBean testInsertSysUserLob(SysUser sysUser){ + testService.insertSysUser(sysUser); + return ResultBean.success("操作成功").setResultObject(sysUser).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } + /** + * 测试添加长文本数据 + * @param sysUser + * @return + */ + @PutMapping(value="/test-update") + @ApiOperation(value="测试添加长文本数据") + public BaseResultBean testUpdateSysUserLob(SysUser sysUser){ + testService.updateSysUser(sysUser); + return ResultBean.success("操作成功").setResultObject(sysUser).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } + /** + * 测试查询长文本数据 + * @return + */ + @PutMapping(value="/test-list") + @ApiOperation(value="测试添加长文本数据") + public BaseResultBean testListSysUserLob(){ + List sysUserList = testService.listSysUser(); + return ResultBean.success("操作成功").setResultList(sysUserList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } + + } 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 737944a..cc44e9d 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 @@ -132,7 +132,7 @@ public class SysFileController extends CoreBaseController{ @ApiOperation(value = "根据id查询文件资源", notes = "根据id查询文件资源") public ResultBean getSysFileById(@PathVariable("id") String id){ try { - ValidatorBean.checkIsNumber(id, "id必须为数字"); + ValidatorBean.checkIsNumber(id, "id必须为数字[" + id + "]"); SysFile sysFile = sysFileService.getSysFileById(Long.parseLong(id)); ValidatorBean.checkNotNull(sysFile, "文件信息不存在"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java index 2d5d5e2..6a8720d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.apiservice.websocket.MessageWebSocket; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.JsonUtilTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -68,6 +69,7 @@ public class MessageLetterQueueReceiver { LOGGER.info("【MQ-{}】 数据接收成功：{}", PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, data); SysMessage msg = JsonUtilTool.decode(data, SysMessage.class); try { + ConvertBean.serviceModelInitialize(msg, "system"); msg = sysMessageService.insertSysMessage(msg); if (!StringUtils.isBlank(msg.getMessageReceiversId())) { @@ -92,6 +94,7 @@ public class MessageLetterQueueReceiver { refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue()); refUserMessage.setReceiverTime(TimeTool.getNowTime(true)); refUserMessage.setIsUrgent(msg.getIsUrgent()); + ConvertBean.serviceModelInitialize(refUserMessage, "system"); insertList.add(refUserMessage); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java index 273a919..cd8ec35 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.mq; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService; import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.JsonUtilTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -73,6 +74,7 @@ public class ScheduleQueueReceiver { logTaskTime.setTaskSoftTypeRdd(taskPlan.getTaskSoftTypeRdd()); logTaskTime.setTaskCycleNameRdd(taskPlan.getTaskCycleNameRdd()); logTaskTime.setTaskCycleExpsRdd(taskPlan.getTaskCycleExpsRdd()); + ConvertBean.serviceModelInitialize(logTaskTime, "system"); sysTaskPlanService.logInsertSysLogTaskTime(logTaskTime); // 定时任务失败通知 @@ -91,6 +93,8 @@ public class ScheduleQueueReceiver { sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue()); sysMessage.setMessageSendTime(TimeTool.getNowTime(true)); sysMessage.setIsSystem(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + // 初始数据 + ConvertBean.serviceModelInitialize(sysMessage, "system"); // 是否内部成员 if (CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == taskPlan.getIsInternalUser()) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java index 40d5e4d..af80f07 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestService.java @@ -87,4 +87,19 @@ public class TestService implements ITestService { public List querySysUserByPack(DdlPackBean packBean) { return sysUserRDao.findByHqlWhere(packBean); } + + @Override + public void insertSysUser(SysUser sysUser) { + sysUserRDao.insert(sysUser); + } + + @Override + public void updateSysUser(SysUser sysUser) { + sysUserRDao.update(sysUser); + } + + @Override + public List listSysUser() { + return sysUserRDao.list(); + } } diff --git a/pom.xml b/pom.xml index 636c3f8..12a5500 100644 --- a/pom.xml +++ b/pom.xml @@ -136,6 +136,28 @@ 5.1.39 + + + com.oracle + ojdbc6 + 12.1.0.1.0 + + + + + com.microsoft.sqlserver + sqljdbc4 + 4.0 + + + + + org.postgresql + postgresql + 42.2.5 + + + org.apache.commons