长文本数据调整

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<SysUser> querySysUserByPack(DdlPackBean packBean);
+
+    @ApiOperation(value = "添加用户")
+    void insertSysUser(SysUser sysUser);
+
+    @ApiOperation(value = "修改用户")
+    void updateSysUser(SysUser sysUser);
+
+    @ApiOperation(value = "查询用户")
+    List<SysUser> listSysUser();
 }

modules/i3plus-core-apiservice/pom.xml

@@ -77,17 +77,35 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.oracle</groupId>
+            <artifactId>ojdbc6</artifactId>
+        </dependency>
+
         <!--用于编译jsp-->
         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-jasper</artifactId>
         </dependency>
 
+        <!-- oracle -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
 
+        <!-- sqlserver -->
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>sqljdbc4</artifactId>
+        </dependency>
+
+        <!-- postgresql -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+        </dependency>
+
         <!-- shiro -->
         <dependency>
             <groupId>org.apache.shiro</groupId>

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.*;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -101,4 +99,39 @@ public class DemoDdlPackController {
         ListPager<SysUser> 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<SysUser> sysUserList = testService.listSysUser();
+        return ResultBean.success("操作成功").setResultList(sysUserList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+    }
+
+
 }

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, "文件信息不存在");

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);
                         }

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()) {

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<SysUser> 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<SysUser> listSysUser() {
+        return sysUserRDao.list();
+    }
 }

pom.xml

@@ -136,6 +136,28 @@
                 <version>5.1.39</version>
             </dependency>
 
+            <!-- oracle -->
+            <dependency>
+                <groupId>com.oracle</groupId>
+                <artifactId>ojdbc6</artifactId>
+                <version>12.1.0.1.0</version>
+            </dependency>
+
+            <!-- sqlserver -->
+            <dependency>
+                <groupId>com.microsoft.sqlserver</groupId>
+                <artifactId>sqljdbc4</artifactId>
+                <version>4.0</version>
+            </dependency>
+
+            <!-- postgresql -->
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>42.2.5</version>
+            </dependency>
+
+
             <!-- 常用string方法 -->
             <dependency>
                 <groupId>org.apache.commons</groupId>