feat:新增橘色设备量展示

Author: joey-zhou

src/main/java/com/xiaozhi/entity/SysRole.java

@@ -41,6 +41,8 @@ public class SysRole extends Base {
 
     private String isDefault;
 
+    private Integer totalDevice;
+
     public Integer getTtsId() {
         return ttsId;
     }
@@ -189,7 +191,17 @@ public String getIsDefault() {
         return isDefault;
     }
 
-    public void setIsDefault(String isDefault) {
+    public SysRole setIsDefault(String isDefault) {
         this.isDefault = isDefault;
+        return this;
+    }
+
+    public Integer getTotalDevice() {
+        return totalDevice;
+    }
+
+    public SysRole setTotalDevice(Integer totalDevice) {
+        this.totalDevice = totalDevice;
+        return this;
     }
 }

src/main/java/com/xiaozhi/mapper/DeviceMapper.xml

@@ -27,6 +27,7 @@
             <if test="userId != null and userId != ''">AND sys_device.userId = #{userId}</if>
             <if test="deviceId != null and deviceId != ''">AND deviceId = #{deviceId}</if>
             <if test="deviceName != null and deviceName != ''">AND deviceName LIKE CONCAT('%', #{deviceName}, '%')</if>
+            <if test="roleName != null and roleName != ''">AND roleName LIKE CONCAT('%', #{roleName}, '%')</if>
             <if test="state != null and state != ''">AND sys_device.state = #{state}</if>
     </select>
 

src/main/java/com/xiaozhi/mapper/RoleMapper.xml

@@ -26,7 +26,8 @@
         <include refid="roleSql"></include>,
         <include refid="modelSql"></include>,
         <include refid="sttSql"></include>,
-        <include refid="ttsSql"></include>
+        <include refid="ttsSql"></include>,
+        (SELECT COUNT(*) FROM sys_device WHERE sys_device.roleId = sys_role.roleId) AS totalDevice
         FROM
             sys_role
             LEFT JOIN sys_config tts_config ON sys_role.ttsId = tts_config.configId AND tts_config.configType = 'tts'

web/src/views/page/Device.vue

@@ -154,6 +154,11 @@ export default {
           value: "",
           index: "deviceName",
         },
+        {
+          label: "角色",
+          value: "",
+          index: "roleName",
+        },
       ],
       stateItems: [
         { label: "全部", value: "", key: "" },

web/src/views/page/Role.vue

@@ -515,11 +515,18 @@ export default {
           width: 150,
           align: 'center',
         },
+        {
+          title: '设备数量',
+          dataIndex: 'totalDevice',
+          scopedSlots: { customRender: 'totalDevice' },
+          width: 80,
+          align: 'center',
+        },
         {
           title: '默认角色',
           dataIndex: 'isDefault',
           scopedSlots: { customRender: 'isDefault' },
-          width: 80,
+          width: 100,
           align: 'center',
         },
         {