From 51735d149e899bc335f50ab91cb9cf5d3622038a Mon Sep 17 00:00:00 2001
From: xins <xins@mesnac.com>
Date: Fri, 27 Oct 2023 09:05:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=E5=BE=AE=E6=9C=8D=E5=8A=A11.?=
 =?UTF-8?q?6.3=201=E3=80=81=E4=B8=BA=E9=85=8D=E7=BD=AEssl=EF=BC=8C?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E9=85=8D=E7=BD=AE=E5=9C=A8?=
 =?UTF-8?q?=E6=A0=B9=E7=9B=AE=E5=BD=95=E4=B8=8B=202=E3=80=81=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=AE=A1=E7=90=86=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E7=9B=B4=E8=BF=9E=E8=AE=BE=E5=A4=87=E6=97=B6?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=AE=BE=E5=A4=87=E6=A8=A1=E5=9E=8B=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E3=80=82=203=E3=80=81=E4=B8=8B=E5=8F=91=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4=E6=97=B6=EF=BC=8Ctopic=E5=A4=A7=E5=B0=8F=E5=86=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/core/constant/HwDictConstants.java |  2 +-
 ruoyi-ui/src/layout/components/Navbar.vue     |  2 +-
 ruoyi-ui/src/router/index.js                  |  1 +
 ruoyi-ui/src/views/business/device/index.vue  | 47 ++++++++++++-------
 ruoyi-ui/vue.config.js                        |  8 ++--
 5 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java
index 781104c..87657c3 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HwDictConstants.java
@@ -99,7 +99,7 @@ public class HwDictConstants {
 
     public static final String CONTROL_COMMAND_REDIS_KEY = "mqtt:channel:down";//下发控制指令到redis的key
     public static final String CONTROL_COMMAND_TOPIC_VALUE = "/v1/{}/device/command";//下发控制指令的topic
-    public static final String CONTROL_COMMAND_TOPIC_KEY = "TOPIC";
+    public static final String CONTROL_COMMAND_TOPIC_KEY = "Topic";
     public static final String CONTROL_COMMAND_PAYLOAD_KEY = "Payload";
     public static final String CONTROL_COMMAND_PAYLOAD_MID_KEY = "mid";
     public static final String CONTROL_COMMAND_PAYLOAD_TIMESTAMP_KEY = "timestamp";
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 176a3cc..be16f65 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -98,7 +98,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          location.href = '/hwsaas/';
         })
       }).catch(() => {});
     }
diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js
index 76418e8..6f56a0e 100644
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -277,6 +277,7 @@ Router.prototype.replace = function push(location) {
 }
 
 export default new Router({
+  base:'/hwsaas',
   mode: 'history', // 去掉url中的#
   scrollBehavior: () => ({ y: 0 }),
   routes: constantRoutes
diff --git a/ruoyi-ui/src/views/business/device/index.vue b/ruoyi-ui/src/views/business/device/index.vue
index b68a58c..a709f0e 100644
--- a/ruoyi-ui/src/views/business/device/index.vue
+++ b/ruoyi-ui/src/views/business/device/index.vue
@@ -28,7 +28,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属场景" prop="sceneId">
-        <el-select v-model="queryParams.sceneId" placeholder="请选择"  @input="sceneChange" clearable>
+        <el-select v-model="queryParams.sceneId" placeholder="请选择" @input="sceneChange" clearable>
           <el-option
             v-for="(scene, index) in scenes"
             :key="index"
@@ -40,7 +40,8 @@
       </el-form-item>
       <el-form-item label="监控单元" prop="monitorUnitId">
         <treeselect v-model="queryParams.monitorUnitId" :options="monitorUnits" :show-count="true"
-                    placeholder="请选择所属监控单元" :normalizer="normalizer" :flat="true" clearable style="width: 200px;"/>
+                    placeholder="请选择所属监控单元" :normalizer="normalizer" :flat="true" clearable
+                    style="width: 200px;"/>
 
       </el-form-item>
 
@@ -164,7 +165,7 @@
           <dict-tag :options="dict.type.hw_device_online_status" :value="scope.row.onlineStatus"/>
         </template>
       </el-table-column-->
-      <el-table-column label="设备控制" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="设备控制" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope" v-if="scope.row.deviceType=='1' || scope.row.deviceType=='3'">
           <el-button
             size="mini"
@@ -237,7 +238,8 @@
           <el-input v-model="form.deviceName" placeholder="请输入设备名称"/>
         </el-form-item>
         <el-form-item label="设备类型" prop="deviceType">
-          <el-select v-model="form.deviceType" placeholder="请选择设备类型" @input="deviceTypeChange" :disabled="deviceTypeDisabled">
+          <el-select v-model="form.deviceType" placeholder="请选择设备类型" @input="deviceTypeChange"
+                     :disabled="deviceTypeDisabled">
             <el-option
               v-for="dict in dict.type.hw_device_type"
               :key="dict.value"
@@ -307,7 +309,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="设备模型" prop="deviceModeId" v-if="subDeviceVisible">
+        <el-form-item label="设备模型" prop="deviceModeId" v-if="deviceModeVisible">
           <el-select v-model="form.deviceModeId" placeholder="请选择" :disabled="deviceModeDisabled">
             <el-option
               v-for="(editedDeviceMode, index) in editedDeviceModes"
@@ -447,18 +449,19 @@ export default {
       deviceModes: [],
 
       //编辑页面场景列表
-      editedScenes:[],
+      editedScenes: [],
       //编辑页面监控单元树
       editedMonitorUnits: [],
       //编辑页面设备模型列表
       editedDeviceModes: [],
       //编辑页面网关设备列表
       editedGatewayDevices: [],
-      deviceTypeDisabled:true,
-      sceneDisabled:true,
+      deviceTypeDisabled: true,
+      sceneDisabled: true,
       subDeviceVisible: false,//子设备字段是否显示
       deviceVisible: false,//网关设备或直连设备字段是否显示
-      deviceModeDisabled:true,
+      deviceModeVisible: false,//设备模型是否显示
+      deviceModeDisabled: true,
 
       DEVICE_TYPE_GATEWAY_DEVICE: "1",//网关设备
       DEVICE_TYPE_GATEWAY_SUB_EQUIPMENT: "2",//网关子设备
@@ -473,7 +476,7 @@ export default {
       DEVICE_STATUS_PUBLISHED: "1",//设备状态:已发布
       ACTIVE_STATUS_INACTIVE: "0",//激活状态：未激活
 
-      confirmBtnVisible : true,
+      confirmBtnVisible: true,
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -602,6 +605,7 @@ export default {
     // 表单重置
     reset() {
       this.subDeviceVisible = true;
+      this.deviceModeVisible = true;
       this.deviceVisible = false;
       this.form = {
         deviceId: null,
@@ -673,7 +677,7 @@ export default {
       this.reset();
       const deviceId = row.deviceId || this.ids
       getDevice(deviceId).then(response => {
-        if(response.data.deviceStatus===this.DEVICE_STATUS_PUBLISHED){
+        if (response.data.deviceStatus === this.DEVICE_STATUS_PUBLISHED) {
           this.confirmBtnVisible = false;
         }
 
@@ -684,13 +688,19 @@ export default {
         }
 
         this.getEditedMonitorTree(response.data.sceneId);
-        if (response.data.deviceType === this.DEVICE_TYPE_GATEWAY_DEVICE
-          || response.data.deviceType === this.DEVICE_TYPE_DIRECT_CONNECT_DEVICE) {
+        if (response.data.deviceType === this.DEVICE_TYPE_GATEWAY_DEVICE) {
           this.subDeviceVisible = false;
           this.deviceVisible = true;
+          this.deviceModeVisible = false;
+        } else if (response.data.deviceType === this.DEVICE_TYPE_DIRECT_CONNECT_DEVICE) {
+          this.subDeviceVisible = false;
+          this.deviceVisible = true;
+          this.deviceModeVisible = true;
+          this.getEditedDeviceModes(response.data.sceneId);
         } else {
           this.subDeviceVisible = true;
           this.deviceVisible = false;
+          this.deviceModeVisible = true;
           this.getEditedDeviceModes(response.data.sceneId);
           this.getGatewayDevices(response.data.sceneId);
         }
@@ -752,7 +762,7 @@ export default {
       const deviceType = row.deviceType;
       const deviceCode = row.deviceCode;
       this.$modal.confirm('是否确认删除设备信息ID为"' + deviceId + '"的数据项？').then(function () {
-        return delDevice(deviceId,deviceType);
+        return delDevice(deviceId, deviceType);
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
@@ -923,11 +933,14 @@ export default {
         this.form.dataFormat = this.DEVICE_DATA_FORMAT_JSON;
         this.deviceVisible = true;
         this.subDeviceVisible = false;
+
+        this.deviceModeVisible = deviceType === this.DEVICE_TYPE_DIRECT_CONNECT_DEVICE;
       } else {
         this.form.networkingMode = null;
         this.form.accessProtocol = null;
         this.form.dataFormat = null;
         this.subDeviceVisible = true;
+        this.deviceModeVisible = true;
         this.deviceVisible = false;
       }
     },
@@ -964,7 +977,7 @@ export default {
       //   return;
       // }
       let text = row.deviceStatus === "0" ? "测试" : "发布";
-      this.$modal.confirm('确认要改为'+text+'状态吗？').then(function () {
+      this.$modal.confirm('确认要改为' + text + '状态吗？').then(function () {
         return changeDeviceStatus(row.deviceId, row.deviceStatus);
       }).then(() => {
         this.$modal.msgSuccess("修改状态成功");
@@ -973,8 +986,8 @@ export default {
       });
     },
 
-    publishControlCommand(row,type,typeName){
-      this.$modal.confirm('确认要下发指令'+typeName+'么？').then(function () {
+    publishControlCommand(row, type, typeName) {
+      this.$modal.confirm('确认要下发指令' + typeName + '么？').then(function () {
         return publishControlCommand(row.deviceId, type);
       }).then(() => {
         this.$modal.msgSuccess("下发指令成功");
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index c3b3837..3a0bec9 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || '智慧物联监控平台' // 网页标题
 
-const port = process.env.port || process.env.npm_config_port || 80 // 端口
+const port = process.env.port || process.env.npm_config_port || 8018 // 端口
 
 // vue.config.js 配置说明
 //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
@@ -18,9 +18,9 @@ module.exports = {
   // 部署生产环境和开发环境下的URL。
   // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-  publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
+  publicPath: process.env.NODE_ENV === "production" ? "/hwsaas" : "/hwsaas",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'dist',
+  outputDir: 'hwsaas',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
   assetsDir: 'static',
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://175.27.215.92:9080`,
+        target: `http://127.0.0.1:9080`,
         // target: `http://10.11.40.120:9080`,
         // target: `http://10.11.43.111:8080`,
         changeOrigin: true,