andy 1 year ago
parent
commit
7728e97548

+ 3 - 5
mainFactory/pom.xml

@@ -11,13 +11,12 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>mainFactory</artifactId>
-
+    <version>1.0-SNAPSHOT</version>
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <java.version>17</java.version>
         <graalvm.version>22.3.1</graalvm.version>
-        <spring.webmvc>6.0.7</spring.webmvc>
     </properties>
 
     <dependencies>
@@ -78,9 +77,8 @@
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.33</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
         </dependency>
 
         <dependency>

+ 1 - 1
mainFactory/src/main/java/org/bfkj/application/DataProcess.java

@@ -159,7 +159,7 @@ public class DataProcess {//数据处理对象
                             {
 //                              过滤出需要写入的日志
                                 Object libraryId = it.get("library_id");
-                                return enableLogCalculationLibrary.contains(libraryId);
+                                return Objects.isNull(libraryId) || enableLogCalculationLibrary.contains(Integer.parseInt(libraryId.toString()));
                             }
                     ).collect(Collectors.toList());
 //            可能还保留一个索引为0的日志 若果只有这一条日志的情况则清空日志

+ 3 - 3
mainFactory/src/main/java/org/bfkj/utils/MapTools.java

@@ -32,9 +32,9 @@ public class MapTools implements Serializable {
     /*字符串转对象*/
     public static Object strToObj(String inStr) {
         try {
-            if (Pattern.compile("[0-9]{2}:[0-9]{2}:[0-9]{2}").matcher(inStr).find()) {
-                return mapStrToObj(inStr, null);
-            }
+//            if (Pattern.compile("[0-9]{2}:[0-9]{2}:[0-9]{2}").matcher(inStr).find()) {
+//                return mapStrToObj(inStr, null);
+//            }
             return AppConfig.mapper.readValue(inStr, Map.class);
         } catch (JsonProcessingException e) {
             return mapStrToObj(inStr, null);

+ 0 - 1
mainFactory/src/main/java/org/bfkj/utils/MyDbHelper.java

@@ -650,7 +650,6 @@ public class MyDbHelper {//目前只差主键的条件优化
                     }
                 }
             }
-
             if (signSql.lastIndexOf(")") >= signSql.lastIndexOf("limit")) {//如果是查询则进行翻页默认值处理,需要加入是否是数字的判断
                 String page = (Objects.isNull(inputData) || Objects.isNull(inputData.get("page"))) ? "1" : inputData.get("page").toString();
                 String pageSize = (Objects.isNull(inputData) || Objects.isNull(inputData.get("pageSize"))) ? "500" : inputData.get("pageSize").toString();