Merge branch 'master' of http://116.63.33.55/git/industry-data-platform

industry-admin/.env.development

@@ -4,3 +4,4 @@ ENV = 'development'
 # base api
 VUE_APP_BASE_API = 'http://localhost:8081'
 #VUE_APP_BASE_API = 'http://192.168.1.99:8089'
+#VUE_APP_BASE_API = ''

industry-admin/.env.production

@@ -2,5 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = 'http://localhost:8081'
+#VUE_APP_BASE_API = 'http://localhost:8081'
 #VUE_APP_BASE_API = 'http://10.220.0.124:8081'
+VUE_APP_BASE_API = ''

industry-admin/.env.staging

@@ -4,5 +4,6 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API = 'http://192.168.1.99:8089'
+#VUE_APP_BASE_API = 'http://192.168.1.99:8089'
+VUE_APP_BASE_API = ''
 

industry-admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "chuanyi-admin",
   "version":"1.0.0",
-  "showVersion": "测试版本：V1.0.0.20240809.Beta",
+  "showVersion": "版本：V1.0.0.20240912.Beta",
   "description": "A magical vue admin. An out-of-box UI solution for enterprise applications. Newest development stack of vue. Lots of awesome features",
   "author": "Pan <panfree23@gmail.com>",
   "scripts": {

industry-admin/src/views/device/deviceLedger/itemList.vue

@@ -339,7 +339,7 @@ export default {
 
     .el-dialog__body {
         height: 60vh;
-        overflow: hidden;
+        overflow: auto;
     }
 }
 </style>

industry-admin/src/views/device/deviceType/chooseDeviceType.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog v-if="visible" :title="title" width="50%" custom-class="dialog-med" top="7vh" center
+    <el-dialog v-if="visible" :title="title" width="50%" custom-class="dialog-med2" top="7vh" center
         :before-close="dialogClose" :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true">
         <!-- 搜索信息 -->
         <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
@@ -118,11 +118,11 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.dialog-med {
+.dialog-med2 {
     height: 70vh;
     .el-dialog__body {
-        height: 60vh;
-        overflow: hidden;
+        height: 64vh;
+        overflow: auto;
     }
 }
 </style>

industry-admin/src/views/login/index.vue

@@ -98,7 +98,7 @@
         label-width="80px"
       >
         <div class="title-container">
-          <h3 class="title">InFluxDB信息初始化</h3>
+          <h3 class="title">实时数据库信息初始化</h3>
         </div>
         <el-form-item prop="subType" label="分库方案" >
           <el-radio-group v-model="fluxForm.subType">
@@ -107,19 +107,19 @@
             <el-radio :label="2">按年分库按月分表</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="连接地址" prop="url">
+        <el-form-item label="连接地址" prop="url" v-show="false">
           <el-input v-model="fluxForm.url" placeholder="请输入influxdb连接地址"></el-input>
         </el-form-item>
-        <el-form-item label="组织" prop="org">
+        <el-form-item label="组织" prop="org" v-show="false">
           <el-input v-model="fluxForm.org" placeholder="请输入influxdb组织"></el-input>
         </el-form-item>
-        <el-form-item label="默认库名" prop="bucket">
+        <el-form-item label="默认库名" prop="bucket" v-show="false">
           <el-input v-model="fluxForm.bucket" placeholder="请输入默认库名"></el-input>
         </el-form-item>
-        <el-form-item label="默认表名" prop="measurement">
+        <el-form-item label="默认表名" prop="measurement" v-show="false">
           <el-input v-model="fluxForm.measurement" placeholder="请输入默认表名"></el-input>
         </el-form-item>
-        <el-form-item label="token" prop="token">
+        <el-form-item label="token" prop="token" v-show="false">
           <el-input v-model="fluxForm.token" placeholder="请输入token"></el-input>
         </el-form-item>
 
@@ -207,11 +207,11 @@ export default {
       isDevelopment: process.env.NODE_ENV === 'development',
       fluxForm: {
         subType: 0,
-        url: 'http://',
-        org: '',
-        bucket: '',
-        measurement: '',
-        token: ''
+        url: 'http://localhost:8086',
+        org: 'ei',
+        bucket: 'ei_bucket',
+        measurement: 'ei_table',
+        token: 'yBsS-rfHCuYlcmcQ0Qbgpis1WTWGqcVJK0MQpO2PefzWurZvE6BqgHpE8pJOmaOeqH1u2QsMXyBN7c2uZZ55zg=='
       },
       fluxRules: {
         subType: [{
@@ -412,9 +412,10 @@ export default {
               Message.error(json.msg)
               return;
             }
-            this.isLoginShow = true
-            this.isLoadingStatus = true
+            //this.isLoginShow = true
+            //this.isLoadingStatus = true
             this.loading = false
+            window.location.reload()
           }).catch(() => {
             this.loading = false
           })
@@ -429,7 +430,10 @@ export default {
               message: '注册成功！',
               type: 'success'
           })
-          this.isRegister = true
+          //this.isRegister = true
+          setTimeout(()=>{
+            window.location.reload()
+          },1500)
         }
       })
     },

industry-admin/src/views/system/dept/chooseDept.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog v-if="visible" :title="title" width="50%" custom-class="dialog-med" top="5vh" center
+    <el-dialog v-if="visible" :title="title" width="50%" custom-class="dialog-med3" top="5vh" center
         :before-close="dialogClose" :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true">
         <!-- 搜索信息 -->
         <el-form ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="80px">
@@ -115,12 +115,12 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.dialog-med {
-    height: 60vh;
+.dialog-med3 {
+    height: 70vh;
 
     .el-dialog__body {
-        height: 50vh;
-        overflow: hidden;
+        height: 64vh;
+        overflow: auto;
     }
 }
 </style>

industry-system/cqcy-ei-influxdb/src/main/resources/influxdb-client.yml

@@ -1,3 +1,4 @@
+# 项目启动时，MyApplicationRunner会加载数据库对应配置
 spring:
   influxdb:
     # 0、不分库不分表；1、按年分库；2、按年分库按月分表

industry-system/industry-da/pom.xml

@@ -177,11 +177,6 @@
             <version>1.5.0</version>
         </dependency>
         <!--改为本地引用jar-->
-        <dependency>
-            <groupId>org.openscada.utgard</groupId>
-            <artifactId>org.openscada.opc.lib</artifactId>
-            <version>1.5.0</version>
-        </dependency>
         <!--        <dependency>-->
         <!--            <groupId>com.example.opc_da</groupId>-->
         <!--            <artifactId>org.openscada.opc.lib</artifactId>-->
@@ -195,6 +190,11 @@
         <!--            <version>1.61</version>-->
         <!--        </dependency>-->
         <dependency>
+            <groupId>org.openscada.utgard</groupId>
+            <artifactId>org.openscada.opc.lib</artifactId>
+            <version>1.5.0</version>
+        </dependency>
+        <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
             <version>1.57</version>
@@ -256,9 +256,15 @@
             </properties>
         </profile>
         <profile>
-            <id>prod</id>
+            <id>prod-cf</id>
+            <properties>
+                <spring.profiles.active>prod-cf</spring.profiles.active>
+            </properties>
+        </profile>
+        <profile>
+            <id>prod-cy</id>
             <properties>
-                <spring.profiles.active>prod</spring.profiles.active>
+                <spring.profiles.active>prod-cy</spring.profiles.active>
             </properties>
         </profile>
     </profiles>

industry-system/industry-da/src/main/java/com/example/opc_da/validate/dataSource/OpcDaValidate.java

@@ -1,6 +1,5 @@
 package com.example.opc_da.validate.dataSource;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.example.opc_common.entity.DataSource;

industry-system/industry-da/src/main/resources/application-prod.yml → industry-system/industry-da/src/main/resources/application-prod-cf.yml

@@ -25,7 +25,6 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: jdbc:mysql://localhost:3306/in_data_db?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
     username: root
-    #password: jd@2021
     password: Ei$2024
     hikari:
       # 设置是否自动提交事务，默认为true
@@ -47,7 +46,6 @@ spring:
     database: 0
     host: 127.0.0.1
     port: 6379
-    #password: jd123456
     password: Ei$2024
     jedis:
       pool:
@@ -72,7 +70,7 @@ logging:
         opc:
           lib:
             da:
-              Server: error
+              com.example.opc_da.alarmConfig.lib.da.Server: error
       eclipse:
         milo:
           opcua:

industry-system/industry-da/src/main/resources/application-prod-cy.yml

@@ -0,0 +1,79 @@
+server:
+  port: 8081
+file:
+  # 相对于项目同级目录
+  path: /upload/chuanyi/
+  # 相对于项目同级目录
+  commonPath: /upload/file/
+  # 清理间隔时间段前的pdf打印临时文件，单位：天
+  # 默认清理1天前的pdf打印临时文件
+  pdf-delete-days: 1
+#opcua客户端配置参数
+opcua:
+  client:
+    cert:
+      # 相对于项目同级目录
+      # 证书地址
+      path: "/security"
+
+spring:
+  servlet:
+    multipart:
+      max-file-size: 1000MB
+      max-request-size: 1500MB
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://localhost:3306/in_data_db?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
+    username: root
+    password: jd@2021
+    hikari:
+      # 设置是否自动提交事务，默认为true
+      auto-commit: true
+      # 设置获取数据库连接的超时时间，最小允许值为250毫秒,默认值为30000ms（30秒）
+      connection-timeout: 60000
+      # 设置连接在连接池中保持空闲的最长时间，最小允许值为10000ms（10秒）,默认值为600000ms（10分钟）
+      idle-timeout: 60000
+      # 设置连接在连接池中允许存在的最长时间,最小允许值为30000ms（30秒）,0不过期，默认为1800000ms（30分钟）
+      max-lifetime: 0
+      # 设置连接池中允许的最大连接数，默认为10
+      maximum-pool-size: 1000
+      # 设置连接池中保持的最小空闲连接数，默认为10
+      minimum-idle: 10
+# 已在com.example.opc_da.config.InterceptorConfig中配置
+#  resources:
+#    static-locations: classpath:/static/,${file.path},${file.commonPath}
+  redis:
+    database: 0
+    host: 127.0.0.1
+    port: 6379
+    password: jd123456
+    jedis:
+      pool:
+        max-active: 50
+        max-idle: 20
+        min-idle: 5
+    #        max-wait: 5
+
+#mybatis:
+#  configuration:
+    #开启sql日志文件
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+#logging:
+#  level:
+#    root: error
+logging:
+  level:
+    root: info
+    org:
+      jinterop: error
+      openscada:
+        opc:
+          lib:
+            da:
+              com.example.opc_da.alarmConfig.lib.da.Server: error
+      eclipse:
+        milo:
+          opcua:
+            sdk:
+              client:
+                OpcUaClient: error