Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

base-common/src/main/java/com/ozs/common/utils/StringUtils.java

@@ -42,6 +42,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 
     //为null,为"",为 "   " --- sunhh
     public static boolean isEmptySunhh(final Object obj) {
+
         int strLen;
         if (obj == null) {
             return true;

base-common/src/main/java/com/ozs/common/utils/poi/ExcelUtil.java

@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.ozs.common.constant.HttpStatus;
 import com.ozs.common.exception.ServiceException;
-import com.sun.org.apache.regexp.internal.RE;
+//import com.sun.org.apache.regexp.internal.RE;
 import lombok.val;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.ObjectUtils;

base-framework/pom.xml

@@ -60,6 +60,12 @@
             <artifactId>base-system</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.dm</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>1.8</version>
+        </dependency>
+
     </dependencies>
 
 </project>

base-framework/src/main/java/com/ozs/framework/config/CipherMybatisPlusConfig.java

@@ -36,6 +36,11 @@ public class CipherMybatisPlusConfig {
             interceptor.addInnerInterceptor(new KindBaseSqlMybatisIntercepts(dbname));
         }
 
+        // 自定义拦截器，先添加先执行。
+        if (type.equals(DbType.DM.getDb())) {
+            interceptor.addInnerInterceptor(new DMSqlMybatisIntercepts(dbname));
+        }
+
         // 自带分页拦截器
 //        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.getDbType(type)));
         return interceptor;

base-framework/src/main/java/com/ozs/framework/config/DMSqlMybatisIntercepts.java

@@ -0,0 +1,84 @@
+package com.ozs.framework.config;
+
+import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
+import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
+import com.baomidou.mybatisplus.core.toolkit.TableNameParser;
+import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.statement.StatementHandler;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.SqlCommandType;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Slf4j
+public class DMSqlMybatisIntercepts implements InnerInterceptor {
+
+    private String dbname;
+
+    // 重写查询方法修改表名
+    @Override
+    public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
+        PluginUtils.MPBoundSql mpBs = PluginUtils.mpBoundSql(boundSql);
+        if (!InterceptorIgnoreHelper.willIgnoreDynamicTableName(ms.getId())) {
+            // 非忽略执行
+            mpBs.sql(this.changeTable(mpBs.sql()));
+        }
+    }
+
+    // 重写 插入、删除、修改方法的表名
+    @Override
+    public void beforePrepare(StatementHandler sh, Connection connection, Integer transactionTimeout) {
+        PluginUtils.MPStatementHandler mpSh = PluginUtils.mpStatementHandler(sh);
+        MappedStatement ms = mpSh.mappedStatement();
+        SqlCommandType sct = ms.getSqlCommandType();
+        if (sct == SqlCommandType.INSERT || sct == SqlCommandType.UPDATE || sct == SqlCommandType.DELETE) {
+            if (!InterceptorIgnoreHelper.willIgnoreDynamicTableName(ms.getId())) {
+                // 非忽略执行
+                PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql();
+                mpBs.sql(this.changeTable(mpBs.sql()));
+            }
+        }
+    }
+
+    protected String changeTable(String sql) {
+        TableNameParser parser = new TableNameParser(sql);
+        List<TableNameParser.SqlToken> names = new ArrayList<>();
+        parser.accept(names::add);
+        StringBuilder builder = new StringBuilder();
+        int last = 0;
+        for (TableNameParser.SqlToken name : names) {
+            String tname = name.toString();
+            int start = name.getStart();
+            if (start != last) {
+                builder.append(sql, last, start);
+                builder.append(dbname + ".");
+                builder.append("\"");
+                builder.append(tname);
+                builder.append("\"");
+            }
+            last = name.getEnd();
+        }
+
+
+        if (last != sql.length()) {
+            builder.append(sql.substring(last));
+        }
+
+        return builder.toString();
+    }
+}

base-system/src/main/resources/mapper/system/SysDictTypeMapper.xml

@@ -54,7 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectDictTypeAll" resultMap="SysDictTypeResult">
 		<include refid="selectDictTypeVo"/>
-		where data_type =#{dataType}
+		<where>
+		<if test="dataType != null and dataType != ''">
+			and UPPER(data_type) = UPPER(CONCAT('%',#{dataType},'%'))
+		</if>
+		</where>
 	</select>
 
 	<select id="selectDictTypeById" parameterType="Long" resultMap="SysDictTypeResult">

base-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -28,7 +28,7 @@
     </resultMap>
 
     <sql id="selectMenuVo">
-        select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
+        select menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time
 		from sys_menu
     </sql>
 
@@ -54,7 +54,7 @@
 						m.menu_name,
 						m.path,
 						m.component,
-						m.`query`,
+						m.query,
 						m.visible,
 						m.status,
 						ifnull(m.perms, '') as perms,
@@ -71,7 +71,7 @@
 	</select>
 
     <select id="selectMenuListByUserId" parameterType="SysMenu" 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
@@ -92,7 +92,7 @@
     </select>
 
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-		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
+		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
 			 left join sys_user_role ur on rm.role_id = ur.role_id
@@ -155,7 +155,7 @@
     </select>
     <select id="selectMenu" parameterType="Long" resultType="Long">
 		select distinct m.menu_id from sys_menu m
-		join sys_role_menu rm on m.menu_id = rm.menu_id 
+		join sys_role_menu rm on m.menu_id = rm.menu_id
 		join sys_role ro on rm.role_id = ro.role_id
         where ro.role_id=#{roleId}
 	</select>
@@ -168,7 +168,7 @@
             <if test="orderNum != null">order_num = #{orderNum},</if>
             <if test="path != null and path != ''">path = #{path},</if>
             <if test="component != null">component = #{component},</if>
-            <if test="query != null">`query` = #{query},</if>
+            <if test="query != null">query = #{query},</if>
             <if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
             <if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
             <if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
@@ -191,7 +191,7 @@
         <if test="orderNum != null">order_num,</if>
         <if test="path != null and path != ''">path,</if>
         <if test="component != null and component != ''">component,</if>
-        <if test="query != null and query != ''">`query`,</if>
+        <if test="query != null and query != ''">query,</if>
         <if test="isFrame != null and isFrame != ''">is_frame,</if>
         <if test="isCache != null and isCache != ''">is_cache,</if>
         <if test="menuType != null and menuType != ''">menu_type,</if>