Merge branch 'main' into 6170

fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.device_pic,
         dt.type_name,
         dt.communication_mode,
+        dt.model_dictionary detailPageUrl,
         d.bluetooth_name,
         c.binding_time,
         ad.*,u.user_name otherPhonenumber
@@ -32,6 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         dt.type_name,
         dt.communication_mode,
         d.bluetooth_name,
+        dt.model_dictionary detailPageUrl,
         c.binding_time,
         ad.*,u.user_name otherPhonenumber
         from

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/DeviceType.java

@@ -69,7 +69,7 @@ public class DeviceType extends TenantEntity {
      * 型号字典用于APP页面跳转
      */
     @Schema(name = "型号字典用于APP页面跳转")
-    private Integer modelDictionary;
+    private String modelDictionary;
 
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java

@@ -33,6 +33,6 @@ public class DeviceTypeForm {
      * 型号字典用于APP页面跳转
      */
     @Schema(name = "型号字典用于APP页面跳转")
-    private Integer modelDictionary;
+    private String modelDictionary;
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/AppDeviceVo.java

@@ -81,4 +81,9 @@ public class AppDeviceVo implements Serializable {
      * 告警状态(0解除告警，1告警)
      */
     private String alarmStatus;
+
+    /**
+     * 设备详情页面
+     */
+    private String detailPageUrl;
 }

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -148,6 +148,7 @@
         dt.type_name,
         dt.communication_mode,
         d.bluetooth_name,
+        dt.model_dictionary detailPageUrl,
         c.binding_time
         from device d
         inner join device_type dt on d.device_type = dt.id
@@ -177,6 +178,7 @@
         d.device_pic,
         dt.type_name,
         dt.communication_mode,
+        dt.model_dictionary detailPageUrl,
         d.bluetooth_name
         from device d
         inner join device_type dt on d.device_type = dt.id