首次提交

.idea/compiler.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <annotationProcessing>
+      <profile default="true" name="Default" enabled="true" />
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

src/main/java/com/hshh/nation/menu/entity/Menu.java

@@ -50,7 +50,7 @@ public class Menu implements Serializable {
     /**
      * 顺序
      */
-    private Integer menuOrder;
+    private Integer menuOrder ;
     @TableField(exist = false)
     private List<Menu> children = new ArrayList<>();
 

src/main/java/com/hshh/nation/menu/service/impl/MenuServiceImpl.java

@@ -1,16 +1,15 @@
 package com.hshh.nation.menu.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hshh.nation.menu.entity.Menu;
 import com.hshh.nation.menu.mapper.MenuMapper;
 import com.hshh.nation.menu.service.MenuService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.hshh.nation.user.entity.User;
-import org.springframework.stereotype.Service;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.springframework.stereotype.Service;
 
 /**
  * <p>
@@ -22,6 +21,7 @@ import java.util.Map;
  */
 @Service
 public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements MenuService {
+
   /**
    * 获取用户菜单列表
    *
@@ -32,7 +32,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
   public List<Menu> getMenuByUserId(User user) {
     //根据用户ID查询所有菜单
     List<Menu> originalmenuList = this.baseMapper.getMenuByUser(user);
-        if(originalmenuList.isEmpty()){
+    if (originalmenuList.isEmpty()) {
       return new ArrayList<>();
     }
     //key为父ID,value为所有一致父ID的集合
@@ -54,16 +54,27 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
 
     for (Menu menu : topMenuList) {
       //递归设置子菜单
-            setChildren(menu,parentMenuMap);
+      setChildren(menu, parentMenuMap);
     }
+    topMenuList.sort((a, b) -> {
+          if (a.getMenuOrder() == null) {
+            a.setMenuOrder(Integer.MAX_VALUE);
+          }
+          if (b.getMenuOrder() == null) {
+            b.setMenuOrder(Integer.MAX_VALUE);
+          }
+          return Integer.compare(a.getMenuOrder(), b.getMenuOrder());
+        }
+    );
     return topMenuList;
   }
-    private void setChildren(Menu menu,Map<Integer, List<Menu>> parentMenuMap) {
 
-            if(parentMenuMap.containsKey(menu.getId())) {
+  private void setChildren(Menu menu, Map<Integer, List<Menu>> parentMenuMap) {
+
+    if (parentMenuMap.containsKey(menu.getId())) {
       menu.getChildren().addAll(parentMenuMap.get(menu.getId()));
       menu.getChildren().forEach(child -> {
-                    setChildren(child,parentMenuMap);
+        setChildren(child, parentMenuMap);
       });
     }
   }

src/main/resources/application.yaml

@@ -15,10 +15,15 @@ spring:
         min-idle: 0
         max-wait: -1ms
   datasource:
-    url: jdbc:mysql://localhost:3306/nation_defence?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+    # mysql
-    username: root
+#    url: jdbc:mysql://localhost:3306/nation_defence?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
-    password: 123456
+#    username: root
-    driver-class-name: com.mysql.cj.jdbc.Driver
+#    password: 123456
+#    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:dm://localhost:5236/NATION_DEFENCE
+    username: nation
+    password: Hshh123456
+    driver-class-name: dm.jdbc.driver.DmDriver
     hikari:
       minimum-idle: 5
       maximum-pool-size: 20
@@ -34,7 +39,8 @@ spring:
 mybatis-plus:
 
   mapper-locations: classpath:/mapper/**/*.xml
-
+  configuration:
+    database-id:  dm
   type-aliases-package: com.example.demo.system.**.entity
 
   global-config:

src/main/resources/mapper/CodeDictMapper.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hshh.nation.code.mapper.CodeDictMapper">
 
   <!-- 通用查询映射结果 -->
   <resultMap id="BaseResultMap" type="com.hshh.nation.code.entity.CodeDict">
-        <id column="id" property="id" />
+    <id column="id" property="id"/>
-        <result column="code_name_cn" property="codeNameCn" />
+    <result column="code_name_cn" property="codeNameCn"/>
-        <result column="code_name_en" property="codeNameEn" />
+    <result column="code_name_en" property="codeNameEn"/>
-        <result column="code_desc" property="codeDesc" />
+    <result column="code_desc" property="codeDesc"/>
   </resultMap>
 
   <!-- 通用查询结果列 -->
@@ -15,7 +16,8 @@
     id, code_name_cn, code_name_en, code_desc
   </sql>
 
-<select id="list" resultType="com.hshh.nation.code.entity.CodeDict" parameterType="com.hshh.nation.code.entity.CodeDict">
+  <select id="list" resultType="com.hshh.nation.code.entity.CodeDict"
+    parameterType="com.hshh.nation.code.entity.CodeDict" databaseId="mysql">
     SELECT
     @rownum := @rownum + 1 AS seq,
     t.*
@@ -26,10 +28,29 @@
         code_name_cn LIKE CONCAT('%', #{model.codeNameCn}, '%')
       </if>
     </where>
-    order by id asc ) t, ( SELECT @rownum := #{model.start} ) r limit #{model.start},#{model.pageSize}
+    order by id asc ) t, ( SELECT @rownum := #{model.start} ) r limit
-</select>
+    #{model.start},#{model.pageSize}
+  </select>
+  <select id="list" resultType="com.hshh.nation.code.entity.CodeDict"
+    parameterType="com.hshh.nation.code.entity.CodeDict" databaseId="dm">
+    SELECT
+    t.seq,
+    t.*
+    FROM (
+    SELECT
+    ROW_NUMBER() OVER (ORDER BY id ASC) AS seq,
+    a.*
+    FROM sys_code_dict a
+    <where>
+      <if test="model.codeNameCn != null and model.codeNameCn !='' ">
+        code_name_cn LIKE '%' || #{model.codeNameCn} || '%'
+      </if>
+    </where>
+    ) t
+    WHERE t.seq > #{model.start} AND t.seq &lt;= (#{model.start} + #{model.pageSize})
+  </select>
 
-<select id="count" resultType="java.lang.Long">
+  <select id="count" resultType="java.lang.Long">
     select count(id) from sys_code_dict
     <where>
       <if test="model.codeNameCn != null  and model.codeNameCn !=''">
@@ -38,7 +59,7 @@
     </where>
 
 
-</select>
+  </select>
 
 </mapper>
 

src/main/resources/mapper/TransportBoatMapper.xml

@@ -34,7 +34,7 @@
     <!-- 通用查询结果列 -->
 
 
-<select id="list" resultType="com.hshh.nation.transport.entity.TransportBoat" parameterType="com.hshh.nation.transport.entity.TransportBoat">
+<select id="list" resultType="com.hshh.nation.transport.entity.TransportBoat" parameterType="com.hshh.nation.transport.entity.TransportBoat" databaseId="mysql">
     SELECT
     @rownum := @rownum + 1 AS seq,
     t.*
@@ -47,7 +47,22 @@
     </where>
     order by id asc ) t, ( SELECT @rownum := #{model.start} ) r limit #{model.start},#{model.pageSize}
 </select>
+    <select id="list" resultType="com.hshh.nation.transport.entity.TransportBoat" parameterType="com.hshh.nation.transport.entity.TransportBoat" databaseId="dm">
+        SELECT * FROM (
+        SELECT
+        ROW_NUMBER() OVER (ORDER BY id ASC) AS seq,
+        t.*
+        FROM defence_transport_boat t
+        <where>
+            <if test="model.equipName != null and model.equipName !=''">
+                t.equip_name LIKE '%' || #{model.equipName} || '%'
+            </if>
+        </where>
+        ) tmp
+        WHERE seq > #{model.start} AND seq &lt;= #{model.start} + #{model.pageSize}
 
+
+    </select>
 <select id="count" resultType="java.lang.Long">
   select count(id) from defence_transport_boat
   <where>