2025年06月16日 1.1.13 配置文件UserStaNO增加适配多个分公司编码，多个编码用英文,隔开

5 months ago · c9f2059076
parent cfc6b1067a
commit c9f2059076
9 changed files with 52 additions and 39 deletions
--- a/ManualSendOut/src/main/java/com/nm/gsgl/common/config/FilterConfig.java
+++ b/ManualSendOut/src/main/java/com/nm/gsgl/common/config/FilterConfig.java
@ -49,7 +49,7 @@ public class FilterConfig implements HandlerInterceptor {
            boolean result = TokenUtil.verify(token);
            //判断绑定
            if (result) {
-                log.info("通过拦截器");
+                //log.info("通过拦截器");
                response.setHeader("token", TokenUtil.reToken(token, request));
                return true;
            }
--- a/ManualSendOut/src/main/java/com/nm/gsgl/common/utils/MD5Util.java
+++ b/ManualSendOut/src/main/java/com/nm/gsgl/common/utils/MD5Util.java
@ -105,10 +105,13 @@ public class MD5Util {
    }

    public static void main(String[] args) throws FileNotFoundException {
-        String s = "123456";
-        System.out.println(MD5Util.md5(s));
-        File file = new File("D:\\file\\download\\notice_table.txt");
+        //String s = "123456";
+        //System.out.println(MD5Util.md5(s));
+        String filePath="D:\\桌面\\SQB_USETIME_20250513092705_d5c51c259529f5c22fde30ebf3b7b779.ZLIB";
+        File file = new File(filePath);
        String md5ByFile = MD5Util.getMd5ByFile(file);
        System.out.println(md5ByFile);
+        String md5ByFile2 = MD5Util.getMd5ByFilePath(filePath);
+        System.out.println(md5ByFile2);
    }
 }
--- a/ManualSendOut/src/main/java/com/nm/gsgl/mapper/NameTableDcomMapper.xml
+++ b/ManualSendOut/src/main/java/com/nm/gsgl/mapper/NameTableDcomMapper.xml
@ -209,7 +209,8 @@
        NAME_TABLE_DCOM
        <where>
            USERTYPE = ${userType}
-            AND stano = ${stano}
+--           AND stano = ${stano}
+            AND STANO  in (${stano})
        </where>

    </select>
--- a/ManualSendOut/src/main/java/com/nm/gsgl/mapper/TreeMapper.xml
+++ b/ManualSendOut/src/main/java/com/nm/gsgl/mapper/TreeMapper.xml
@ -28,7 +28,8 @@
                AND SUBCOMNO = ${SUBCOMNO}
            </if>
            <if test="STANO != null and STANO != ''">
-                AND STANO = ${STANO}
+--                 AND STANO = ${STANO}
+                AND STANO  in (${STANO})
            </if>
        </where>
    </select>
--- a/ManualSendOut/src/main/java/com/nm/gsgl/service/impl/HttpReceiveServiceImpl.java
+++ b/ManualSendOut/src/main/java/com/nm/gsgl/service/impl/HttpReceiveServiceImpl.java
@ -162,7 +162,7 @@ public class HttpReceiveServiceImpl implements HttpReceiveService {
        //1-站
        queryWrapper.eq("USERTYPE", 1)
                //配置文件中的当前分中心编码
-                .eq("SUBCOMNO", UserStaNO);
+                .in("SUBCOMNO", UserStaNO);

        //测试使用gsg
        //queryWrapper.eq("USERTYPE", 1)
--- a/ManualSendOut/src/main/java/com/nm/gsgl/service/impl/QueryParamsServiceImpl.java
+++ b/ManualSendOut/src/main/java/com/nm/gsgl/service/impl/QueryParamsServiceImpl.java
@ -94,7 +94,7 @@ public class QueryParamsServiceImpl implements QueryParamsService {
            mapList = nameTableDcomMapper.selectCurrentSubList(Constant.STR_ONE, subcomno);
        } else if (Constant.STR_TWO.equals(userType)) {
            //当前是分中心，只查询本分中心
-            mapList = nameTableDcomMapper.selectCurrentSubList(Constant.STR_ONE, UserStaNO);
+            mapList = nameTableDcomMapper.selectCurrentSubList(Constant.STR_ONE, subcomno);
        }
        return mapList;
    }
--- a/ManualSendOut/src/main/java/com/nm/gsgl/service/impl/WjtManualServiceImpl.java
+++ b/ManualSendOut/src/main/java/com/nm/gsgl/service/impl/WjtManualServiceImpl.java
@ -479,6 +479,13 @@ public class WjtManualServiceImpl implements WjtManualService {
                            if (paraId == 2 && sqlStr != null) {
                                sqlStr = sqlStr.replace("%ROADNO%", String.valueOf(info.getROADNO())).replace("%STANO%", String.valueOf(info.getSTANO()));
                                List<Map<String, Object>> mapList = sysMapper.selectList(sqlStr);
+                                try {
+                                    // 等待 1 秒钟（1000 毫秒）
+                                    Thread.sleep(1000);
+                                } catch (InterruptedException e) {
+                                    // 如果线程被中断，会抛出 InterruptedException
+                                    e.printStackTrace();
+                                }
                                Date date = new Date();
                                String version2 = DateTimeUtil.getFormateString(date, Constant.YYYYMMDDHHMMSS);
                                sqbName = Constant.SQB_ + paramName.split("\\.")[0].toUpperCase() + Constant.STR_ + version2 + Constant.STR_SQB;
--- a/ManualSendOut/src/main/resources/version/1.1.13.txt
+++ b/ManualSendOut/src/main/resources/version/1.1.13.txt
@ -26,3 +26,4 @@
 21     2025年02月17日    1.1.10      55-车道参数表IDX_TABLE表中version使用bak1
 22     2025年02月24日    1.1.11      55-车道参数表修改SQB文件的字段并将查询语句更改为SELECT BEGDATE, MINETCRATE, MAXETCRATE, MINCPCRATE, MAXCPCRATE, MAXHCRATE, USENEWTYPE, ALLOWCPU0, PAYRESTBAL, PERINSCPU, PEROUTSCPU, W0019MODE2, CANDISTIME, OPENFEE, BAK1, BAK2, BAK3, BAK4, BAK6, BAK7, BAK8, MAXONLINE, MAXHCONLIN from LaneInfo_Table
 23     2025年05月09日    1.1.12      适配达梦数据库
+24     2025年06月16日    1.1.13      配置文件UserStaNO增加适配多个分公司编码，多个编码用英文,隔开
--- a/vue_ManualSendOut/node_modules/.vite/deps/_metadata.json
+++ b/vue_ManualSendOut/node_modules/.vite/deps/_metadata.json
@ -1,6 +1,6 @@
 {
  "hash": "7a0e2aae",
-  "browserHash": "ec683dd5",
+  "browserHash": "24d2c489",
  "optimized": {
    "@element-plus/icons-vue": {
      "src": "../../@element-plus/icons-vue/dist/index.js",
@ -212,42 +212,18 @@
      "fileHash": "ff3c3c7c",
      "needsInterop": true
    },
-    "element-plus/es/components/row/style/css": {
-      "src": "../../element-plus/es/components/row/style/css.mjs",
-      "file": "element-plus_es_components_row_style_css.js",
-      "fileHash": "23b0ebb8",
-      "needsInterop": false
-    },
-    "element-plus/es/components/col/style/css": {
-      "src": "../../element-plus/es/components/col/style/css.mjs",
-      "file": "element-plus_es_components_col_style_css.js",
-      "fileHash": "c3ed36ab",
-      "needsInterop": false
-    },
-    "element-plus/es/components/menu/style/css": {
-      "src": "../../element-plus/es/components/menu/style/css.mjs",
-      "file": "element-plus_es_components_menu_style_css.js",
-      "fileHash": "2ea43185",
-      "needsInterop": false
-    },
-    "element-plus/es/components/menu-item/style/css": {
-      "src": "../../element-plus/es/components/menu-item/style/css.mjs",
-      "file": "element-plus_es_components_menu-item_style_css.js",
-      "fileHash": "69b2342f",
-      "needsInterop": false
-    },
-    "element-plus/es/components/icon/style/css": {
-      "src": "../../element-plus/es/components/icon/style/css.mjs",
-      "file": "element-plus_es_components_icon_style_css.js",
-      "fileHash": "c0781492",
-      "needsInterop": false
-    },
    "element-plus/es/components/button/style/css": {
      "src": "../../element-plus/es/components/button/style/css.mjs",
      "file": "element-plus_es_components_button_style_css.js",
      "fileHash": "9de75e26",
      "needsInterop": false
    },
+    "element-plus/es/components/row/style/css": {
+      "src": "../../element-plus/es/components/row/style/css.mjs",
+      "file": "element-plus_es_components_row_style_css.js",
+      "fileHash": "23b0ebb8",
+      "needsInterop": false
+    },
    "element-plus/es/components/checkbox-group/style/css": {
      "src": "../../element-plus/es/components/checkbox-group/style/css.mjs",
      "file": "element-plus_es_components_checkbox-group_style_css.js",
@ -266,6 +242,12 @@
      "fileHash": "b6a195ef",
      "needsInterop": false
    },
+    "element-plus/es/components/col/style/css": {
+      "src": "../../element-plus/es/components/col/style/css.mjs",
+      "file": "element-plus_es_components_col_style_css.js",
+      "fileHash": "c3ed36ab",
+      "needsInterop": false
+    },
    "element-plus/es/components/form/style/css": {
      "src": "../../element-plus/es/components/form/style/css.mjs",
      "file": "element-plus_es_components_form_style_css.js",
@ -284,6 +266,24 @@
      "fileHash": "5ac034ba",
      "needsInterop": false
    },
+    "element-plus/es/components/icon/style/css": {
+      "src": "../../element-plus/es/components/icon/style/css.mjs",
+      "file": "element-plus_es_components_icon_style_css.js",
+      "fileHash": "c0781492",
+      "needsInterop": false
+    },
+    "element-plus/es/components/menu/style/css": {
+      "src": "../../element-plus/es/components/menu/style/css.mjs",
+      "file": "element-plus_es_components_menu_style_css.js",
+      "fileHash": "2ea43185",
+      "needsInterop": false
+    },
+    "element-plus/es/components/menu-item/style/css": {
+      "src": "../../element-plus/es/components/menu-item/style/css.mjs",
+      "file": "element-plus_es_components_menu-item_style_css.js",
+      "fileHash": "69b2342f",
+      "needsInterop": false
+    },
    "element-plus/es/components/radio-group/style/css": {
      "src": "../../element-plus/es/components/radio-group/style/css.mjs",
      "file": "element-plus_es_components_radio-group_style_css.js",