Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-admin/pom.xml

@@ -43,6 +43,14 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <!-- 达梦驱动包 -->
+        <dependency>
+            <groupId>com.dm</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>1.8</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/src/main/resources/lib/DmJdbcDriver18.jar</systemPath>
+        </dependency>
         <!-- 核心模块-->
         <dependency>
             <groupId>com.zkqy</groupId>

zkqy-common/src/main/java/com/zkqy/common/utils/StringUtils.java

@@ -26,13 +26,29 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     /** 下划线 */
     private static final char SEPARATOR = '_';
 
-    private static final String DATE_TIME_PATTERN = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}";
+    /**
+     * 不带T
+     */
+    private static final String DATE_TIME_PATTERN1 = "\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2}";
+
+    /**
+     * 带T的
+     */
+    private static final String DATE_TIME_PATTERN2 = "\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}";
+
+    /**
+     * 只有年月日的
+     */
+    private static final String DATE_PATTERN = "^\\d{4}-\\d{2}-\\d{2}$";
+
 
+    private static final Pattern pattern1 = Pattern.compile(DATE_TIME_PATTERN1);
+    private static final Pattern pattern2 = Pattern.compile(DATE_TIME_PATTERN2);
 
     public static boolean isValidDateTimeFormat(String input) {
-        Pattern pattern = Pattern.compile(DATE_TIME_PATTERN);
-        Matcher matcher = pattern.matcher(input);
-        return matcher.matches();
+        Matcher matcher1 = pattern1.matcher(input);
+        Matcher matcher2 = pattern2.matcher(input);
+        return matcher1.matches() || matcher2.matches();
     }
 
     /**

zkqy-framework/src/main/java/com/zkqy/framework/aspectj/SqlInterceptor.java

@@ -34,7 +34,7 @@ public class SqlInterceptor implements Interceptor {
          * //System.out.println(name);
          */
         String sql = statementHandler.getBoundSql().getSql();
-        if(sql.contains("{DBNAME}.")){
+        if (sql.contains("{DBNAME}.")) {
             String modifiedSql = modifySql(sql);
             if (modifiedSql.equals("error")) {
                 return AjaxResult.error("当前用户没有数据源信息！");
@@ -42,7 +42,13 @@ public class SqlInterceptor implements Interceptor {
                 ReflectUtils.setFieldValue(statementHandler.getBoundSql(), "sql", modifiedSql);
                 return invocation.proceed();
             }
-        }else {
+        } else {
+            // 达梦数据源下 ``不识别
+            if (sql.contains("m.`query`")) {
+                String endsql = sql.replace("m.`query`", "m.query");
+                ReflectUtils.setFieldValue(statementHandler.getBoundSql(), "sql", endsql);
+                return invocation.proceed();
+            }
             // 如果不在指定路径下，直接放行
             return invocation.proceed();
         }
@@ -57,8 +63,19 @@ public class SqlInterceptor implements Interceptor {
         }
         if (SecurityUtils.getDatabaseType().equals("sqlserver"))
             return "USE `" + SecurityUtils.getDatabaseName() + "`; " + sql;
-        if (SecurityUtils.getDatabaseType().equals("dm"))
+        if (SecurityUtils.getDatabaseType().equals("dm")) {
+            String endSQl;
+            if (sql.contains("{DBNAME}.")) {
+
+                // 如果sql中出现  ` 符号
+//                if (sql.contains("`")) {
+//                    sql.replace("`", "");
+//                }
+                return sql.replace("{DBNAME}", SecurityUtils.getDatabaseName()).replace("`", "");
+            }
             return "set schema " + SecurityUtils.getDatabaseName() + "; " + sql;
+        }
+
         if (SecurityUtils.getDatabaseType().equals("mysql")) {
             if (sql.contains("{DBNAME}.")) {
                 return sql.replace("{DBNAME}.", "`" + SecurityUtils.getDatabaseName() + "`.");
@@ -112,4 +129,14 @@ public class SqlInterceptor implements Interceptor {
     @Override
     public void setProperties(Properties properties) {
     }
-}
+}
+/*
+
+关系对应
+name:code
+age:asd
+state:staue
+默认值：
+state:1
+
+ */

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/controller/BpmExecuteNodeController.java

@@ -74,7 +74,7 @@ public class BpmExecuteNodeController extends BaseController {
     /**
      * 修改节点执行（记录）
      */
-    @PreAuthorize("@ss.hasPermi('system:node:edit')")
+    //@PreAuthorize("@ss.hasPermi('system:node:edit')")
     @Log(title = "节点执行日志", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BpmExecuteNode bpmExecuteNode) {

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/CommonServiceImpl.java

@@ -288,10 +288,18 @@ public class CommonServiceImpl implements ICommonService {
                     //正则匹配成功
                     boolean validDateTimeFormat = isValidDateTimeFormat(v.toString());
                     if(validDateTimeFormat){
-                        LocalDateTime localDateTime = DateUtils.toLocalDateTime(v.toString(), "yyyy-MM-dd HH:mm:ss");
-                        DateTimeFormatter fmt = DateTimeFormatter.ofPattern(tableFormat);
-                        String dateStr = localDateTime.format(fmt);
-                        resultMap.put(k,dateStr);
+                        if(v.toString().indexOf("T")>0){
+                            DateTimeFormatter formatter = DateTimeFormatter.ISO_LOCAL_DATE_TIME; // 默认支持这种格式
+                            LocalDateTime dateTime = LocalDateTime.parse(v.toString(), formatter);
+                            DateTimeFormatter fmt = DateTimeFormatter.ofPattern(tableFormat);
+                            String dateStr = dateTime.format(fmt);
+                            resultMap.put(k,dateStr);
+                        }else {
+                            LocalDateTime localDateTime = DateUtils.toLocalDateTime(v.toString(), "yyyy-MM-dd HH:mm:ss");
+                            DateTimeFormatter fmt = DateTimeFormatter.ofPattern(tableFormat);
+                            String dateStr = localDateTime.format(fmt);
+                            resultMap.put(k,dateStr);
+                        }
                     }
                 }
             });

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

@@ -78,7 +78,7 @@
 		left join sys_tenant_menu tm on tm.menu_id = m.menu_id
 		where tm.tenant_id = #{tenantId}
 		and m.menu_name not in ('数据引擎','流程引擎','表单引擎')
-		and parent_id not in (select menu_id from  sys_menu where menu_name in ("数据引擎","流程引擎","表单引擎"))
+		and parent_id not in (select menu_id from  sys_menu where menu_name in ('数据引擎','流程引擎','表单引擎'))
 		<if test="menu.menuName != null and menu.menuName != ''">
 			AND m.menu_name like concat('%', #{menu.menuName}, '%')
 		</if>
@@ -101,7 +101,7 @@
 		left join sys_menu m on tm.menu_id = m.menu_id
 		where m.menu_type in ('M', 'C') and m.status = 0 and tm.tenant_id = #{tenantId}
 		and m.menu_name not in ('数据引擎','流程引擎','表单引擎')
-		and parent_id not in (select menu_id from  sys_menu where menu_name in ("数据引擎","流程引擎","表单引擎"))
+		and parent_id not in (select menu_id from  sys_menu where menu_name in ('数据引擎','流程引擎','表单引擎'))
 		order by m.parent_id, m.order_num
 	</select>