From b05b848310cc3a9e55fad0eabd69c17c5c588001 Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Sun, 10 Nov 2024 09:36:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=AE=BE=E5=A4=87=E9=A9=B1?= =?UTF-8?q?=E5=8A=A8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceExtraServiceImpl.java | 2 +- .../main/resources/config/application-dev.yml | 6 +- .../resources/config/application-prod.yml | 2 +- .../src/main/resources/logback-spring.xml | 1 + qd/src/views/acs/device/UploadDialog.vue | 116 ++++++++++++++++++ qd/src/views/acs/device/index.vue | 66 ++++------ 6 files changed, 149 insertions(+), 44 deletions(-) create mode 100644 qd/src/views/acs/device/UploadDialog.vue diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java index 3df5f44..e040250 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceExtraServiceImpl.java @@ -78,7 +78,7 @@ public class DeviceExtraServiceImpl implements DeviceExtraService { dto.setCreate_time(now); WQLObject wo = WQLObject.getWQLObject("acs_device_extra"); - JSONObject json = JSONObject.fromObject(dto); + com.alibaba.fastjson.JSONObject json = (com.alibaba.fastjson.JSONObject) com.alibaba.fastjson.JSONObject.toJSON(dto); wo.insert(json); } diff --git a/hd/nladmin-system/src/main/resources/config/application-dev.yml b/hd/nladmin-system/src/main/resources/config/application-dev.yml index 4cfed2a..800924a 100644 --- a/hd/nladmin-system/src/main/resources/config/application-dev.yml +++ b/hd/nladmin-system/src/main/resources/config/application-dev.yml @@ -8,11 +8,11 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:zgln_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true -# url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ssj1_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:luonanyaun_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true +# url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lny_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true username: ${DB_USER:root} # password: ${DB_PWD:P@ssw0rd} - password: ${DB_PWD:Root.123456} + password: ${DB_PWD:123456} # password: ${DB_PWD:123456} # 初始连接数 initial-size: 5 diff --git a/hd/nladmin-system/src/main/resources/config/application-prod.yml b/hd/nladmin-system/src/main/resources/config/application-prod.yml index 1b3a9f6..15936f2 100644 --- a/hd/nladmin-system/src/main/resources/config/application-prod.yml +++ b/hd/nladmin-system/src/main/resources/config/application-prod.yml @@ -8,7 +8,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:zgln_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:zgln}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true username: ${DB_USER:root} password: ${DB_PWD:123456} # 初始连接数 diff --git a/hd/nladmin-system/src/main/resources/logback-spring.xml b/hd/nladmin-system/src/main/resources/logback-spring.xml index 9bd5afe..3e52ec3 100644 --- a/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -68,6 +68,7 @@ https://juejin.cn/post/6844903775631572999 + diff --git a/qd/src/views/acs/device/UploadDialog.vue b/qd/src/views/acs/device/UploadDialog.vue new file mode 100644 index 0000000..b299a0e --- /dev/null +++ b/qd/src/views/acs/device/UploadDialog.vue @@ -0,0 +1,116 @@ + + + + diff --git a/qd/src/views/acs/device/index.vue b/qd/src/views/acs/device/index.vue index 7b8a225..a3a441e 100644 --- a/qd/src/views/acs/device/index.vue +++ b/qd/src/views/acs/device/index.vue @@ -26,30 +26,30 @@ > - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -120,16 +120,6 @@ /> - - - - - @@ -234,7 +224,6 @@ const defaultForm = { device_code: null, device_name: null, device_type: null, - region: null, is_config: null, remark: null, region: null @@ -260,11 +249,10 @@ export default { del: ['admin', 'device:del'] }, device_types: [], - regions: [], is_configs: [], + regions: [], uploadShow: false, device_code: '', - regions: [], rules: { device_code: [ { required: true, message: '设备编码不能为空', trigger: 'blur' } @@ -288,10 +276,10 @@ export default { this.device_types = data.content }) // 获取区域类型 - get('region').then(data => { + get('region_type').then(data => { this.regions = data.content }) - //获取是否配置 + // 获取是否配置 get('is_config').then(data => { this.is_configs = data.content })