lxm1993 发布系统代码 [TrainSys，网页端]

85d07bc8 · ibizdev · 8ac18eb5 · 85d07bc8 · 85d07bc8 · 85d07bc8
--- a/config.xml
+++ b/config.xml
@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData.json
@@ -893,6 +893,71 @@
    "serviceCodeName" : "Value",
    "stdDataType" : 6,
    "valueFormat" : "%1$s"
+  }, {
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[TOOLTIPHTML][提示信息html]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TOOLTIPHTML][提示信息html]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[TOOLTIPHTML][提示信息html]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TOOLTIPHTML][提示信息html]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "TOOLTIPHTML",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "TooltipHtml",
+    "dEFType" : 5,
+    "dataType" : "TEXT",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "提示信息html",
+    "name" : "TOOLTIPHTML",
+    "serviceCodeName" : "TooltipHtml",
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s",
+    "viewLevel" : 0,
+    "phisicalDEField" : false,
+    "uIAssistDEField" : true
  }, {
    "getAllPSDEFDTColumns" : [ {
      "columnName" : "MAPDATAID",
@@ -1525,6 +1590,17 @@
    "customCode" : true,
    "enableBackend" : false,
    "enableFront" : true
+  }, {
+    "codeName" : "tooltipHtmlCompute",
+    "defaultParamName" : "DEFAULT",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/MapData/PSDEFLOGICS/tooltipHtmlCompute.json",
+    "logicName" : "tooltipHtml属性计算逻辑",
+    "logicSubType" : "DEFIELD",
+    "name" : "tooltipHtml属性计算逻辑",
+    "scriptCode" : "console.log(\"sdfdsf\",data);\nconst html = `<div style='display:flex;justify-content: center;'>\n                        <span>${cityName}</span>\n                      </div>\n                      <div style='display:flex;justify-content: space-between;'>\n                        <span style='margin-right: 16px;'>在岗人数/总人数</span>\n                        <span>${data.zgrs}/${data.yzrs}</span>\n                      </div>`;\nreturn {\ntooltiphtml: html\n}",
+    "customCode" : true,
+    "enableBackend" : false,
+    "enableFront" : true
  } ],
  "getAllPSDEMethodDTOs" : [ {
    "name" : "MapDataDTO",
@@ -1592,6 +1668,17 @@
      "sourceType" : "DEFIELD",
      "stdDataType" : 6,
      "type" : "SIMPLE"
+    }, {
+      "logicName" : "提示信息html",
+      "name" : "TooltipHtml",
+      "getPSDEField" : {
+        "name" : "TOOLTIPHTML",
+        "codeName" : "TooltipHtml"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
    }, {
      "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
      "logicName" : "建立时间",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData/PSDEFLOGICS/tooltipHtmlCompute.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/MapData/PSDEFLOGICS/tooltipHtmlCompute.json
+{
+  "codeName" : "tooltipHtmlCompute",
+  "dEFLogicMode" : "COMPUTE",
+  "defaultParamName" : "DEFAULT",
+  "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/MapData/PSDEFLOGICS/tooltipHtmlCompute.json",
+  "logicName" : "tooltipHtml属性计算逻辑",
+  "logicSubType" : "DEFIELD",
+  "name" : "tooltipHtml属性计算逻辑",
+  "getPSDEField" : {
+    "name" : "TOOLTIPHTML",
+    "codeName" : "TooltipHtml"
+  },
+  "scriptCode" : "console.log(\"sdfdsf\",data);\nconst html = `<div style='display:flex;justify-content: center;'>\n                        <span>${cityName}</span>\n                      </div>\n                      <div style='display:flex;justify-content: space-between;'>\n                        <span style='margin-right: 16px;'>在岗人数/总人数</span>\n                        <span>${data.zgrs}/${data.yzrs}</span>\n                      </div>`;\nreturn {\ntooltiphtml: html\n}",
+  "customCode" : true,
+  "enableBackend" : false,
+  "enableFront" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData.json
@@ -575,6 +575,41 @@
    "logicName" : "统计数值",
    "name" : "VALUE",
    "stdDataType" : 6
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[TOOLTIPHTML][提示信息html]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBTEXT",
+        "name" : "[TOOLTIPHTML][提示信息html]移动端默认",
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[TOOLTIPHTML][提示信息html]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "TEXTBOX",
+        "name" : "[TOOLTIPHTML][提示信息html]",
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "codeName" : "TooltipHtml",
+    "getComputePSAppDEFLogic" : {
+      "modelref" : true,
+      "id" : "tooltipHtmlCompute"
+    },
+    "logicName" : "提示信息html",
+    "name" : "TOOLTIPHTML",
+    "stdDataType" : 25,
+    "stringLength" : 100
  }, {
    "getAllPSAppDEFUIModes" : [ {
      "codeName" : "Default",
@@ -919,6 +954,25 @@
    "customCode" : true,
    "enableBackend" : false,
    "enableFront" : true
+  }, {
+    "codeName" : "tooltipHtmlCompute",
+    "dEFLogicMode" : "COMPUTE",
+    "defaultParamName" : "DEFAULT",
+    "logicName" : "tooltipHtml属性计算逻辑",
+    "logicSubType" : "DEFIELD",
+    "name" : "tooltipHtml属性计算逻辑",
+    "getPSAppDEField" : {
+      "name" : "TOOLTIPHTML",
+      "codeName" : "TooltipHtml"
+    },
+    "getPSDEField" : {
+      "name" : "TOOLTIPHTML",
+      "codeName" : "TooltipHtml"
+    },
+    "scriptCode" : "console.log(\"sdfdsf\",data);\nconst html = `<div style='display:flex;justify-content: center;'>\n                        <span>${cityName}</span>\n                      </div>\n                      <div style='display:flex;justify-content: space-between;'>\n                        <span style='margin-right: 16px;'>在岗人数/总人数</span>\n                        <span>${data.zgrs}/${data.yzrs}</span>\n                      </div>`;\nreturn {\ntooltiphtml: html\n}",
+    "customCode" : true,
+    "enableBackend" : false,
+    "enableFront" : true
  } ],
  "getAllPSAppDEMethodDTOs" : [ {
    "codeName" : "MapDataDTO",
@@ -989,6 +1043,17 @@
      "sourceType" : "DEFIELD",
      "stdDataType" : 6,
      "type" : "SIMPLE"
+    }, {
+      "codeName" : "TooltipHtml",
+      "logicName" : "提示信息html",
+      "name" : "TooltipHtml",
+      "getPSAppDEField" : {
+        "name" : "TOOLTIPHTML",
+        "codeName" : "TooltipHtml"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
    }, {
      "codeName" : "CreateDate",
      "jsonFormat" : "yyyy-MM-dd HH:mm:ss",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData/PSMAPS/Map.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData/PSMAPS/Map.json
@@ -48,7 +48,7 @@
    "id" : "point"
  }, {
    "borderWidth" : 0,
-    "customCond" : "{SRFNAVPARAM.n_areacode_eq: \"%_areaCode%\"}",
+    "customCond" : "{\"SRFNAVPARAM.n_areacode_eq\": \"%_areaCode%\"}",
    "getDataPSAppDEField" : {
      "name" : "VALUE",
      "codeName" : "Value"
@@ -78,13 +78,17 @@
      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData.json"
    },
    "radius" : 0,
+    "getTagPSAppDEField" : {
+      "name" : "VALUE",
+      "codeName" : "Value"
+    },
    "getTextPSAppDEField" : {
      "name" : "MAPDATANAME",
      "codeName" : "MapDataName"
    },
    "getTipsPSAppDEField" : {
-      "name" : "TOOLTIP",
-      "codeName" : "Tooltip"
+      "name" : "TOOLTIPHTML",
+      "codeName" : "TooltipHtml"
    },
    "enableQuickCreate" : false,
    "id" : "area"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/MapDataCustomView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/MapDataCustomView.json
@@ -126,7 +126,7 @@
        "id" : "point"
      }, {
        "borderWidth" : 0,
-        "customCond" : "{SRFNAVPARAM.n_areacode_eq: \"%_areaCode%\"}",
+        "customCond" : "{\"SRFNAVPARAM.n_areacode_eq\": \"%_areaCode%\"}",
        "getDataPSAppDEField" : {
          "name" : "VALUE",
          "codeName" : "Value"
@@ -156,13 +156,17 @@
          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/MapData.json"
        },
        "radius" : 0,
+        "getTagPSAppDEField" : {
+          "name" : "VALUE",
+          "codeName" : "Value"
+        },
        "getTextPSAppDEField" : {
          "name" : "MAPDATANAME",
          "codeName" : "MapDataName"
        },
        "getTipsPSAppDEField" : {
-          "name" : "TOOLTIP",
-          "codeName" : "Tooltip"
+          "name" : "TOOLTIPHTML",
+          "codeName" : "TooltipHtml"
        },
        "enableQuickCreate" : false,
        "id" : "area"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -11265,16 +11265,16 @@
        "id" : "ViewMsg7"
      }
    }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -11287,10 +11287,10 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg9"
      }
    }, {
      "name" : "消息类型-警告信息",
@@ -11300,52 +11300,52 @@
      },
      "position" : "POPUP"
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-无删除-上方-常规",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg11"
      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg13"
      }
    }, {
      "name" : "关闭模式-无删除",
@@ -11354,10 +11354,10 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    } ]
  }, {
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
@@ -5024,6 +5024,19 @@
      "enableModify" : true,
      "keyField" : false,
      "majorField" : false
+    }, {
+      "codeName" : "TooltipHtml",
+      "codeName2" : "TooltipHtml",
+      "logicName" : "提示信息html",
+      "name" : "TOOLTIPHTML",
+      "orderValue" : 220,
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
    }, {
      "codeName" : "MapDataId",
      "codeName2" : "MapDataId",

--- a/trainsys-provider/pom.xml
+++ b/trainsys-provider/pom.xml
@@ -33,7 +33,7 @@

    <profiles>
        <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
            <build>
                <resources>
                    <resource>

--- a/trainsys-provider/src/main/docker/Dockerfile
+++ b/trainsys-provider/src/main/docker/Dockerfile
@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
    sleep ${IBIZ_SLEEP} && \
    java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar

-EXPOSE 50000
+EXPOSE 8081

 ADD trainsys-provider.jar /trainsys-provider.jar
--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
+++ b/trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
@@ -22,32 +22,7 @@ spec:
        image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
        imagePullPolicy: Always
        ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081

 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
  type: NodePort
  ports:
  - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
    protocol: TCP
  selector:
    app: trainsys-provider

--- a/trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
+++ b/trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
@@ -3,23 +3,9 @@ services:
  trainsys-provider:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
    ports:
-      - "50000:50000"
+      - "8081:8081"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
    deploy:
      resources:
           limits: