新增达梦

pom.xml

@@ -23,7 +23,7 @@
     </modules>
     <properties>
         <java.version>1.8</java.version>
-        <mybatis.plus.version>3.4.2</mybatis.plus.version>
+        <mybatis.plus.version>3.5.3</mybatis.plus.version>
         <fastjson.version>2.0.25</fastjson.version>
     </properties>
     <dependencies>

webapidemo-api/pom.xml

@@ -88,6 +88,13 @@
             <artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>
             <version>5.1.1</version>
         </dependency>
+
+        <!-- 达梦驱动 -->
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>8.1.1.193</version>
+        </dependency>
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>

webapidemo-api/src/main/java/com/example/controller/HomeController.java

@@ -51,7 +51,6 @@ public class HomeController extends BaseController {
     @ApiOperation("Hello World")
     @GetMapping("/")
     public AjaxResult Info() {
-        System.out.println("Hello World");
         return Success("Hello World!", new Date());
     }
 

webapidemo-api/src/main/java/com/example/controller/system/RoleController.java

@@ -117,10 +117,10 @@ public class RoleController extends BaseController {
 
     @ApiOperation("编辑")
     @Log(title = "修改角色信息", businessType = BusinessType.UPDATE)
-    @PutMapping("/{id}")
-    public AjaxResult edit(@PathVariable("id") Long id, @RequestBody Role input) {
+    @PutMapping()
+    public AjaxResult edit(@RequestBody Role input) {
         LambdaQueryWrapper<Role> qw = new LambdaQueryWrapper<>();
-        qw.eq(Role::getRoleId, id);
+        qw.eq(Role::getRoleId, input.getRoleId());
         Role role = roleService.getEntity(qw);
 
         if (role == null) {
@@ -129,7 +129,7 @@ public class RoleController extends BaseController {
 
         LambdaQueryWrapper<Role> roleName = new LambdaQueryWrapper<>();
         roleName.eq(Role::getRoleName, input.getRoleName())
-                .ne(Role::getRoleId, id);
+                .ne(Role::getRoleId, input.getRoleId());
         Role entity = roleService.getEntity(roleName);
         if (entity != null) {
             return Error("角色名已存在!");
@@ -137,7 +137,7 @@ public class RoleController extends BaseController {
 
         LambdaQueryWrapper<Role> roleKey = new LambdaQueryWrapper<>();
         roleKey.eq(Role::getRoleKey, input.getRoleKey())
-                .ne(Role::getRoleId, id);
+                .ne(Role::getRoleId, input.getRoleId());
         Role key = roleService.getEntity(roleKey);
         if (key != null) {
             return Error("角色权限字符串已存在!");
@@ -217,8 +217,8 @@ public class RoleController extends BaseController {
      * 查询未分配用户角色列表
      */
     @Log(title = "查询未分配用户角色列表", businessType = BusinessType.QUERY)
-    @PostMapping("/authUser/unallocatedList")
-    public AjaxResult unallocatedList(@RequestBody User user) {
+    @GetMapping("/authUser/unallocatedList")
+    public AjaxResult unallocatedList(User user) {
         List<User> list = userService.selectUnallocatedList(user);
         return Success("查询成功", list);
     }

webapidemo-api/src/main/java/com/example/controller/wechat/KefuMessageContentController.java

@@ -21,7 +21,7 @@ import java.util.Date;
 /**
  * @author Administrator
  */
-@Api(value = "编辑kefu_message_content", tags = "编辑kefu_message_content")
+@Api(value = "kefu_message_content", tags = "kefu_message_content")
 @RestController
 @RequestMapping("/wechat/kefuMessageContent")
 public class KefuMessageContentController extends BaseController {

webapidemo-api/src/main/java/com/example/filter/GlobalExceptionHandler.java

@@ -49,6 +49,8 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(RuntimeException.class)
     public AjaxResult handleBindException(RuntimeException e)
     {
+        log.error("系统异常\n", e);
+
         String message = e.getMessage();
 
         AjaxResult result = new AjaxResult();
@@ -63,6 +65,7 @@ public class GlobalExceptionHandler {
     @ExceptionHandler(BindException.class)
     public AjaxResult handleBindException(BindException e)
     {
+        log.error("系统异常\n", e);
         String message = e.getAllErrors().get(0).getDefaultMessage();
 
         AjaxResult result = new AjaxResult();

webapidemo-api/src/main/resources/application-dev.yml

@@ -2,27 +2,39 @@ server:
   port: 8000
 swagger: true
 spring:
+#  datasource:
+#    type: com.alibaba.druid.pool.DruidDataSource
+#    driver-class-name: dm.jdbc.driver.DmDriver
+#    url: jdbc:dm://192.168.1.200:5236?schema=jiayi&compatibleMode=oracle&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+#    username: SYSDBA
+#    password: SYSDBA
+#    type: com.alibaba.druid.pool.DruidDataSource
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://192.168.1.200:3306/jiayi?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
+#    username: root
+#    password: 800100
+
   shardingsphere:
     datasource:
       names: master,slave0,slave1
       master:
         type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.1.200:3306/jiayi?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-        username: root
-        password: 800100
+        driver-class-name: dm.jdbc.driver.DmDriver
+        url: jdbc:dm://192.168.1.200:5236?schema=jiayi&compatibleMode=oracle&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+        username: SYSDBA
+        password: SYSDBA
       slave0:
         type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.1.200:3306/jiayi?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-        username: root
-        password: 800100
+        driver-class-name: dm.jdbc.driver.DmDriver
+        url: jdbc:dm://192.168.1.200:5236?schema=jiayi&compatibleMode=oracle&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+        username: SYSDBA
+        password: SYSDBA
       slave1:
         type: com.alibaba.druid.pool.DruidDataSource
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://192.168.1.200:3306/jiayi?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-        username: root
-        password: 800100
+        driver-class-name: dm.jdbc.driver.DmDriver
+        url: jdbc:dm://192.168.1.200:5236?schema=jiayi&compatibleMode=oracle&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8
+        username: SYSDBA
+        password: SYSDBA
 
 #    props:
 #      sql.show: true

webapidemo-api/src/main/resources/application.yml

@@ -37,7 +37,7 @@ flowable:
   # 关闭定时任务 job
   async-executor-activate: false
   # 库与数据库表结构不一致时，会自动将数据库表结构升级至新版本。
-  database-schema-update: false
+  database-schema-update: none
   idm:
     enabled: false
 

webapidemo-entity/pom.xml

@@ -42,11 +42,11 @@
             <artifactId>bson</artifactId>
             <version>4.0.5</version>
         </dependency>
+        <!-- flowable -->
         <dependency>
             <groupId>org.flowable</groupId>
-            <artifactId>flowable-engine</artifactId>
+            <artifactId>flowable-spring-boot-starter-process</artifactId>
             <version>6.8.0</version>
-            <scope>compile</scope>
         </dependency>
 
     </dependencies>

webapidemo-entity/src/main/java/com/example/entity/database/message/Message.java

@@ -1,7 +1,8 @@
 package com.example.entity.database.message;
 
 import com.example.entity.database.system.User;
-import com.sun.corba.se.spi.ior.ObjectId;
+//import com.sun.corba.se.spi.ior.ObjectId;
+import org.bson.types.ObjectId;
 import lombok.Data;
 
 import java.util.Date;

webapidemo-entity/src/main/java/com/example/entity/database/system/AsyncImportExportTask.java

@@ -28,7 +28,7 @@ public class AsyncImportExportTask {
     /**
      * 任务id
      */
-    @TableId(value = "task_id", type = IdType.ID_WORKER)
+    @TableId(value = "task_id", type = IdType.ASSIGN_ID)
     private String taskId;
 
     /**

webapidemo-mapper/src/main/resources/mapper/system/MenuMapper.xml

@@ -32,7 +32,7 @@
                order_num,
                path,
                component,
-               `query`,
+               query,
                is_frame,
                is_cache,
                menu_type,
@@ -61,7 +61,7 @@
     </select>
     <select id="selectMenuListByUserId" parameterType="com.example.entity.database.system.Menu"
             resultMap="SysMenuResult">
-        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status,
+        select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status,
         ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
         from sys_menu m
         left join sys_role_menu rm on m.menu_id = rm.menu_id
@@ -118,7 +118,7 @@
                         m.menu_name,
                         m.path,
                         m.component,
-                        m.`query`,
+                        m.query,
                         m.visible,
                         m.status,
                         ifnull(m.perms, '') as perms,
@@ -140,7 +140,7 @@
                         m.menu_name,
                         m.path,
                         m.component,
-                        m.`query`,
+                        m.query,
                         m.visible,
                         m.status,
                         ifnull(m.perms, '') as perms,

webapidemo-service/src/main/java/com/example/service/BaseServiceImpl.java

@@ -93,8 +93,8 @@ public class BaseServiceImpl<M extends BaseMapper<T>,T> extends ServiceImpl<M,T>
 
     //根据条件获取数量
     @Override
-    public int getCount(Wrapper<T> queryWrapper){
-        return this.count(queryWrapper);
+    public long getCount(Wrapper<T> queryWrapper){
+        return  this.count(queryWrapper);
     }
 
     //获取实体

webapidemo-service/src/main/java/com/example/service/IBaseService.java

@@ -32,7 +32,7 @@ public interface IBaseService<T> {
     //根据条件删除
     boolean delete(Wrapper<T> queryWrapper);
     //根据条件获取数量
-    int getCount(Wrapper<T> queryWrapper);
+    long getCount(Wrapper<T> queryWrapper);
     //获取实体
     T getEntity(Serializable id);
     //根据条件获取实体

webapidemo-service/src/main/java/com/example/service/system/IDeptService.java

@@ -21,7 +21,7 @@ public interface IDeptService extends IBaseService<Dept> {
      * @param deptId 部门ID
      * @return 子部门数
      */
-    public int selectNormalChildrenDeptById(Long deptId);
+    public long selectNormalChildrenDeptById(Long deptId);
     /**
      * 是否存在部门子节点
      *

webapidemo-service/src/main/java/com/example/service/system/impl/DeptServiceImpl.java

@@ -64,11 +64,11 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, Dept> implement
      * @return 子部门数
      */
     @Override
-    public int selectNormalChildrenDeptById(Long deptId) {
+    public long selectNormalChildrenDeptById(Long deptId) {
         LambdaQueryWrapper<Dept> qw = new LambdaQueryWrapper<>();
         qw.eq(Dept::getStatus, "0")
                 .eq(Dept::getDelFlag, "0")
-                .apply(deptId != null, "FIND_IN_SET('" + deptId + "',ancestors");
+                .apply(deptId != null, "FIND_IN_SET('" + deptId + "',ancestors)");
         return this.count(qw);
     }