From 68e5dda2b8dd98e003fa5722bdcce36d6a41670e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BB=9D=E5=B0=98?= <237809796@qq.com>
Date: Tue, 16 Jan 2024 22:17:23 +0800
Subject: [PATCH] .

---
 logs-201904/sncp-log-20190428.log             | 98 -------------------
 root/metadata/dataList.html                   | 21 ++--
 root/metadata/metaService.html                |  9 +-
 .../java/net/tccn/base/dbq/DbExecutors.java   | 15 ++-
 4 files changed, 24 insertions(+), 119 deletions(-)
 delete mode 100644 logs-201904/sncp-log-20190428.log

diff --git a/logs-201904/sncp-log-20190428.log b/logs-201904/sncp-log-20190428.log
deleted file mode 100644
index 265db5d..0000000
--- a/logs-201904/sncp-log-20190428.log
+++ /dev/null
@@ -1,98 +0,0 @@
-四月 28, 2019 6:17:11 下午 [Transport-Thread-3] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error (retcode=1073741824, retinfo=Inner exception)
-四月 28, 2019 6:17:11 下午 [Transport-Thread-3] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error
-java.lang.RuntimeException: remote service(public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String)) deal error (retcode=1073741824, retinfo=Inner exception)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:437)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:396)
-	at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126)
-	at sun.nio.ch.Invoker$2.run(Invoker.java:218)
-	at sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
-	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
-	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
-	at java.lang.Thread.run(Thread.java:748)
-
-四月 28, 2019 6:18:34 下午 [Transport-Thread-6] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error (retcode=1073741824, retinfo=Inner exception)
-四月 28, 2019 6:18:34 下午 [Transport-Thread-6] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error
-java.lang.RuntimeException: remote service(public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String)) deal error (retcode=1073741824, retinfo=Inner exception)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:437)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:396)
-	at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126)
-	at sun.nio.ch.Invoker$2.run(Invoker.java:218)
-	at sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
-	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
-	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
-	at java.lang.Thread.run(Thread.java:748)
-
-四月 28, 2019 6:23:34 下午 [Transport-Thread-2] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error (retcode=1073741824, retinfo=Inner exception)
-四月 28, 2019 6:24:04 下午 [Transport-Thread-2] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error
-java.lang.RuntimeException: remote service(public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String)) deal error (retcode=1073741824, retinfo=Inner exception)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:437)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:396)
-	at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126)
-	at sun.nio.ch.Invoker$2.run(Invoker.java:218)
-	at sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
-	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
-	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
-	at java.lang.Thread.run(Thread.java:748)
-
-四月 28, 2019 6:24:44 下午 [Transport-Thread-4] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error (retcode=1073741824, retinfo=Inner exception)
-四月 28, 2019 6:24:44 下午 [Transport-Thread-4] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error
-java.lang.RuntimeException: remote service(public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String)) deal error (retcode=1073741824, retinfo=Inner exception)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:437)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:396)
-	at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126)
-	at sun.nio.ch.Invoker$2.run(Invoker.java:218)
-	at sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
-	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
-	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
-	at java.lang.Thread.run(Thread.java:748)
-
-四月 28, 2019 6:24:44 下午 [Transport-Thread-7] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error (retcode=1073741824, retinfo=Inner exception)
-四月 28, 2019 6:24:44 下午 [Transport-Thread-7] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error
-java.lang.RuntimeException: remote service(public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String)) deal error (retcode=1073741824, retinfo=Inner exception)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:437)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:396)
-	at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126)
-	at sun.nio.ch.Invoker$2.run(Invoker.java:218)
-	at sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
-	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
-	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
-	at java.lang.Thread.run(Thread.java:748)
-
-四月 28, 2019 6:24:47 下午 [Transport-Thread-3] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error (retcode=1073741824, retinfo=Inner exception)
-四月 28, 2019 6:24:47 下午 [Transport-Thread-3] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error
-java.lang.RuntimeException: remote service(public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String)) deal error (retcode=1073741824, retinfo=Inner exception)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:437)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:396)
-	at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126)
-	at sun.nio.ch.Invoker$2.run(Invoker.java:218)
-	at sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
-	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
-	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
-	at java.lang.Thread.run(Thread.java:748)
-
-四月 28, 2019 6:25:08 下午 [Transport-Thread-6] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error (retcode=1073741824, retinfo=Inner exception)
-四月 28, 2019 6:25:08 下午 [Transport-Thread-6] org.redkale.net.sncp.SncpClient$1$1 completed
-严重: public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String) sncp (params: ["3421432"]) deal error
-java.lang.RuntimeException: remote service(public net.tccn.base.JBean net.tccn.service.MetadataService.serviceList(java.lang.String)) deal error (retcode=1073741824, retinfo=Inner exception)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:437)
-	at org.redkale.net.sncp.SncpClient$1$1.completed(SncpClient.java:396)
-	at sun.nio.ch.Invoker.invokeUnchecked(Invoker.java:126)
-	at sun.nio.ch.Invoker$2.run(Invoker.java:218)
-	at sun.nio.ch.AsynchronousChannelGroupImpl$1.run(AsynchronousChannelGroupImpl.java:112)
-	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
-	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
-	at java.lang.Thread.run(Thread.java:748)
-
diff --git a/root/metadata/dataList.html b/root/metadata/dataList.html
index ccb3263..c9bb579 100644
--- a/root/metadata/dataList.html
+++ b/root/metadata/dataList.html
@@ -314,21 +314,18 @@
                 let v = bean[colFmt["col"]]
                 if (colFmt.inType == "DICT") {
                     // 取字典值返回
-                }
-                else if (colFmt.inType == "INPUT_DAY") {
-
-                }
-                else if (colFmt.inType == "INPUT_TIME") {
+                } else if (colFmt.inType == "INPUT_DAY") {
+                    return red.timeFmt(new Date(v), 'yyyy-MM-dd')
+                } else if (colFmt.inType == "INPUT_TIME") {
                     // 时间戳格式化
                     return red.timeFmt(new Date(v))
-                }
-                else if (colFmt.inType == "INPUT_FUNC") {
-
-                }
-                else if (colFmt.inType == "FILE" && v) {
+                } else if (colFmt.inType == "INPUT_FUNC") {
+                    return eval(colFmt.inExt)
+                } else if (colFmt.inType == "FUNC") {
+                    return funDept(bean, v)
+                } else if (colFmt.inType == "FILE" && v) {
                     return '<a href="{0}" target="_blank">查看</a>'.format(v)
-                }
-                else {
+                } else {
 
                 }
 
diff --git a/root/metadata/metaService.html b/root/metadata/metaService.html
index cb46208..76e3e6e 100644
--- a/root/metadata/metaService.html
+++ b/root/metadata/metaService.html
@@ -197,8 +197,8 @@
                         </select>
                     </td>
                     <td style="padding: 1px;" title="格式化类型为：funs或qtask的时候需要填写附加参数">
-                        <input v-show="item.inType == 'FUNC' || item.inType == 'QTASK'" v-model="item.inExt" class="form-control" style="width: 130px;padding: 0px">
-                        <input disabled v-show="item.inType != 'FUNC' && item.inType != 'QTASK' && item.inType != 'DICT'" v-model="item.inExt" class="form-control" style="width: 130px;padding: 0px">
+                        <input v-show="item.inType == 'FUNC' || item.inType == 'QTASK' || item.inType == 'INPUT_FUNC'" v-model="item.inExt" class="form-control" style="width: 130px;padding: 0px">
+                        <input disabled v-show="item.inType != 'FUNC' && item.inType != 'INPUT_FUNC' && item.inType != 'QTASK' && item.inType != 'DICT'" v-model="item.inExt" class="form-control" style="width: 130px;padding: 0px">
                         <select v-show="item.inType == 'DICT'" v-model="item.inExt" class="form-control" style="width: 130px">
                             <option></option>
                             <option v-for="x in dictType" :value="x.value">{{x.label}}</option>
@@ -534,7 +534,7 @@
                 EQUAL:"等于", NOTEQUAL:"不等于", IN: "包含", NOTIN:"不包含", LIKE: "模糊查询", RANGE: "范围"
             },
             findTypes: ["INPUT", "DICT", "CHECKBOX", "RADIO", "DAY", "TIME"],
-            inTypes: ["INPUT", "DICT", "INPUT_DAY", "INPUT_TIME", "FUNC", "QTASK", "HIDDEN", "FILE"],
+            inTypes: ["INPUT", "DICT", "INPUT_DAY", "INPUT_TIME", "INPUT_FUNC", "FUNC", "QTASK", "HIDDEN", "FILE"],
             ckTypes: [{label:"必填", name: "NOTNULL"},{label:"IP", name: "IP"},{label:"IPv4", name: "IPv4"},{label:"电话号码", name: "phone"}],
             dataTypes: ["bigint(20)", "varchar(255)", "varchar(64)", "varchar(32)", "varchar(16)", "int(11)", "int(3)", "int(2)", "datetime"],
             filterCate: ["EQUAL", "NOTEQUAL", "LIKE", "IN"],
@@ -928,7 +928,7 @@
                 });
 
 
-                if (this.status == 1) {
+                if (this.status === 1) {
                     $('#sortableList,table>tbody').sortable({
                         selector: '.list-group-item, tr',
                         finish: function (e) {
@@ -1108,6 +1108,7 @@
         },
         mounted: function () {
             this.serviceList()
+            this.setMove(this.status)
 
             dictList({type:"dict"}).then(res => {
                 this.dictType = res
diff --git a/src/main/java/net/tccn/base/dbq/DbExecutors.java b/src/main/java/net/tccn/base/dbq/DbExecutors.java
index 22a41f3..2648da3 100644
--- a/src/main/java/net/tccn/base/dbq/DbExecutors.java
+++ b/src/main/java/net/tccn/base/dbq/DbExecutors.java
@@ -1,5 +1,6 @@
 package net.tccn.base.dbq;
 
+import net.tccn.base.Kv;
 import net.tccn.base.MetaKit;
 import net.tccn.base.PageBean;
 import net.tccn.base.dbq.fbean.FBean;
@@ -35,18 +36,22 @@ public class DbExecutors {
         List<Map> rows = listFuture.get();
         Integer total = countFuture.get();
 
-        /*rows.forEach(x -> {
-            x.forEach((k,v) -> {
-                if ("[B".equals(v.getClass().getName())) {
+        rows.forEach(m -> {
+            m.forEach((k,v) -> {
+                /*if ("[B".equals(v.getClass().getName())) {
                     try {
                         //System.out.println(k + " : " + new String((byte[]) v, "UTF-8"));
-                        x.put(k, new String((byte[]) v, "UTF-8"));
+                        m.put(k, new String((byte[]) v, "UTF-8"));
                     } catch (UnsupportedEncodingException e) {
                         throw new RuntimeException(e);
                     }
+                }*/
+                // 避免前端 解析丢失精度
+                if (v instanceof Long && (Long)v > 9007199254740991L) {
+                    m.put(k, Kv.toAs(v, String.class));
                 }
             });
-        });*/
+        });
         return PageBean.by(rows, total);
     }