修改权限，改为【全部 拒绝 只读】

document/db/20260327.sql

@@ -0,0 +1,7 @@
+CREATE TABLE basic_role_menu_relation_dashboard (
+    role_id BIGINT,
+    menu_id BIGINT,
+    permission_type INT COMMENT '0-拒绝 1-只读 2-全部',
+    creator_id BIGINT,
+    create_time BIGINT
+);

dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/Constants.java

@@ -1,5 +1,7 @@
 package com.dongjian.dashboard.back.common;
 
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -8,6 +10,11 @@ import java.util.*;
 */
 public class Constants {
 
+	public static final ZoneId ZONE_TOKYO = ZoneId.of("Asia/Tokyo");
+	public static final DateTimeFormatter FORMATTER_YMDHMS = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+//	public static final int EXPORT_PAGE_SIZE = 600;
+	
 	//这个很重要，不要随便动
 	public static final String DES_SALT = "ci3b512jwy199511";
 	
@@ -24,6 +31,8 @@ public class Constants {
 
 	public static final String WINDOW_ALERT_IGNORED = "alert_window_notice:ignore:%d";
 
+	public static final String REDIS_BA_STATUS_LATEST_VALUE = "ba_status_latest_value_";
+
 	public static final int AURORA_IN_BATCH_SIZE = 1000;
 
 	// 定义大类常量

dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/config/DataSourceInterceptor.java

@@ -13,10 +13,7 @@ import com.dongjian.dashboard.back.common.Constants;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
 
@@ -57,23 +54,44 @@ public class DataSourceInterceptor implements HandlerInterceptor {
 
     public long getTopCompanyId(String companyId) {
 
-    	String sql="SELECT "
+        if (StringUtils.isBlank(companyId)) {
-    			+ " bcom.id, bcom.parent_id parentId"
+            throw new IllegalArgumentException("companyId不能为空");
-    			+ " FROM data_center_aeon_admin.basic_company bcom "
+        }
-    			+ " WHERE bcom.flag != 1 and bcom.id = " + companyId;
 
-    	AtomicLong parentId = new AtomicLong(0);
+        return getTopCompanyIdInternal(Long.parseLong(companyId), new HashSet<>());
-    	AtomicLong id = new AtomicLong(0);
+    }
-        jdbcTemplate.query(sql,rs -> {
+
-        	parentId.set(rs.getLong("parentId"));
+    private long getTopCompanyIdInternal(Long companyId, Set<Long> visited) {
-        	id.set(rs.getLong("id"));
+
-        });
+        // 防止循环引用
-        //Recursive logic
+        if (!visited.add(companyId)) {
-        if (1 == parentId.get() || -1 == parentId.get()) {
+            throw new IllegalStateException("检测到公司父子结构循环，companyId=" + companyId);
-        	return id.get();
+        }
-		} else {
+
-			return getTopCompanyId(parentId.get()+"");
+        String sql = """
+        SELECT id, parent_id
+        FROM data_center_aeon_admin.basic_company
+        WHERE flag != 1 AND id = ?
+        """;
+
+        List<Map<String, Object>> result = jdbcTemplate.queryForList(sql, companyId);
+
+        if (result.isEmpty()) {
+            throw new IllegalStateException("公司不存在，companyId=" + companyId);
         }
+
+        Map<String, Object> row = result.get(0);
+
+        Long parentId = row.get("parent_id") == null
+                ? null
+                : ((Number) row.get("parent_id")).longValue();
+
+        // 顶级企业
+        if (parentId == null || parentId == 1 || parentId == -1) {
+            return companyId;
+        }
+
+        return getTopCompanyIdInternal(parentId, visited);
     }
 
     /**

dongjian-dashboard-back-common/src/main/resources/config/language/msg/msg_cn.yml

@@ -49,7 +49,7 @@ msgcn:
         roleHasBinded: 角色已绑定用户，请先解绑再删除
         loginNameOrEmailHasExisted: 用户名或邮箱已被使用
         mailAddUserPwdSubject: 新建账号密码
-        mailAddUserPwdContent: '账号 <u>{0}</u> 的密码为 <span style="text-transform: none;"><u>{1}</u></span> 请妥善保管<br/><br/>登陆网址：<u>{2}</u>'
+        mailAddUserPwdContent: '{0}<br/><br/>このたびは、データ管理プラットフォームへのご登録、誠にありがとうございます。<br/><br/>下記の通り、アカウントが発行されましたのでご案内いたします。<br/><br/>-------------------------------------------------<br/>ユーザー名（ID）：<u>{1}</u><br/>初期パスワード：<span style="text-transform: none;"><u>{2}</u></span><br/>-------------------------------------------------<br/><br/>ご不明な点がございましたら、お気軽にサポートまでお問い合わせください。<br/><br/>-------------------------------<br/>イオンディライト株式会社<br/>サポート窓口: smbil-support@ifmservice.jp<br/>-------------------------------'
         mailResetUserPwdSubject: 重置账号密码
         pwdFormatError: 密码组成必须包含数字、英文字母、特殊符号(~!@#$%^&*)且大于等于12位
         oldPwdError: 旧密码错误
@@ -78,6 +78,7 @@ msgcn:
         invalidParentLevel: 无效的父级层级
         levelReferencedByChildren: 已被下级层级绑定，请先解绑后再删除
         elapsedTime: '{0}天{1}小时{2}分'
+        categoryHasExisted: 分类已存在
     operationLogMap:
         addRole: 新增角色
         editRole: 编辑角色
@@ -138,5 +139,12 @@ msgcn:
         editLevel: 编辑层级
         deleteLevel: 删除层级
         queryLevel: 获取层级列表
+        addNotificationCategory: 新增通知分类
+        editNotificationCategory: 编辑通知分类
+        delNotificationCategory: 删除通知分类
+        addNotification: 新增通知
+        editNotification: 编辑通知
+        delNotification: 删除通知
+        editDeviceField: 编辑设备属性
 
 

dongjian-dashboard-back-common/src/main/resources/config/language/msg/msg_en.yml

@@ -49,7 +49,7 @@ msgen:
         roleHasBinded: 角色已绑定用户，请先解绑再删除
         loginNameOrEmailHasExisted: 用户名或邮箱已被使用
         mailAddUserPwdSubject: 新建账号密码
-        mailAddUserPwdContent: '账号 <u>{0}</u> 的密码为 <span style="text-transform: none;"><u>{1}</u></span> 请妥善保管<br/><br/>登陆网址：<u>{2}</u>'
+        mailAddUserPwdContent: '{0}<br/><br/>このたびは、データ管理プラットフォームへのご登録、誠にありがとうございます。<br/><br/>下記の通り、アカウントが発行されましたのでご案内いたします。<br/><br/>-------------------------------------------------<br/>ユーザー名（ID）：<u>{1}</u><br/>初期パスワード：<span style="text-transform: none;"><u>{2}</u></span><br/>-------------------------------------------------<br/><br/>ご不明な点がございましたら、お気軽にサポートまでお問い合わせください。<br/><br/>-------------------------------<br/>イオンディライト株式会社<br/>サポート窓口: smbil-support@ifmservice.jp<br/>-------------------------------'
         mailResetUserPwdSubject: 重置账号密码
         pwdFormatError: 密码组成必须包含数字、英文字母、特殊符号(~!@#$%^&*)且大于等于12位
         oldPwdError: 旧密码错误
@@ -78,6 +78,7 @@ msgen:
         invalidParentLevel: Invalid parent level
         levelReferencedByChildren: It is bound by child levels. Please unbind them before deleting.
         elapsedTime: '{0}d {1}h {2}m'
+        categoryHasExisted: Category already exists.
     operationLogMap:
         addRole: Add Role
         editRole: Edit Role
@@ -138,6 +139,14 @@ msgen:
         editLevel: Edit Level
         deleteLevel: Delete Level
         queryLevel: Get Level List
+        addNotificationCategory: Add notification category
+        editNotificationCategory: Edit notification category
+        delNotificationCategory: Delete notification category
+        addNotification: Add notification
+        editNotification: Edit notification
+        delNotification: Delete notification
+        editDeviceField: Edit device attributes
+
 
 
 

dongjian-dashboard-back-common/src/main/resources/config/language/msg/msg_jp.yml

@@ -49,7 +49,7 @@ msgjp:
         roleHasBinded: 役割はユーザーにバインドされている ので、削除する前にバインドを解除してください
         loginNameOrEmailHasExisted: ユーザー名またはメールボックスはすでに使用されています
         mailAddUserPwdSubject: 新規アカウント・パスワードの作成
-        mailAddUserPwdContent: 'アカウント <u>{0}</u> のパスワードは <span style="text-transform: none;"><u>{1}</u></span> お忘れにならないようにお願いします。<br/><br/>ログインWebアドレス：<u>{2}</u>'
+        mailAddUserPwdContent: '{0} 様<br/><br/>このたびは、データ管理プラットフォームへのご登録、誠にありがとうございます。<br/><br/>下記の通り、アカウントが発行されましたのでご案内いたします。<br/><br/>-------------------------------------------------<br/>ユーザー名（ID）：<u>{1}</u><br/>初期パスワード：<span style="text-transform: none;"><u>{2}</u></span><br/>-------------------------------------------------<br/><br/>ご不明な点がございましたら、お気軽にサポートまでお問い合わせください。<br/><br/>ログインはこちらから：<br/>【AD スマビル 可視化UI URL】：https://smbil.ifmservice.jp/login<br/><br/>-------------------------------<br/>イオンディライト株式会社<br/>サポート窓口: smbil-support@ifmservice.jp<br/>-------------------------------'
         mailResetUserPwdSubject: アカウント・パスワードのリセット
         pwdFormatError: パスワードの構成には、数字、アルファベット、特殊文字（~!@#$%^&*) で、12桁以上
         oldPwdError: 旧パスワードエラー
@@ -78,19 +78,20 @@ msgjp:
         invalidParentLevel: 無効な上位階層です
         levelReferencedByChildren: 下位階層に紐づいています。削除する前に紐付けを解除してください。
         elapsedTime: '{0}日{1}時間{2}分間'
+        categoryHasExisted: カテゴリは既に存在します。
     operationLogMap:
-        addRole: ロールを追加
+        addRole: ロール管理
-        editRole: ロールを編集
+        editRole: ロール管理
-        deleteRole: ロールを削除
+        deleteRole: ロール管理
-        queryRole: ロール一覧を取得
+        queryRole: ロール管理
-        addUser: ユーザーを追加
+        addUser: ユーザー管理
-        editUser: ユーザーを編集
+        editUser: ユーザー管理
-        deleteUser: ユーザーを削除
+        deleteUser: ユーザー管理
-        resetPassword: パスワードをリセット
+        resetPassword: ユーザー管理
         changePassword: パスワードを変更
         unbindMFADevice: MFAデバイスの連携を解除
-        queryUser: ユーザー一覧を取得
+        queryUser: ユーザー管理
-        queryOperationLog: 操作ログを照会する
+        queryOperationLog: 操作ログ
         getS3Credentials: S3ファイル操作トークンを取得する
         addSlack: Slackを追加
         editSlack: Slackを編集
@@ -100,14 +101,14 @@ msgjp:
         editTeams: Teamsを編集
         deleteTeams: Teamsを削除
         queryTeams: Teamsリストを取得
-        getCumulativeDataList: 積算データ一覧を取得
+        getCumulativeDataList: 計量
         queryDeviceList: デバイス一覧を取得
-        addDeviceGroup: デバイスグループを追加
+        addDeviceGroup: パネル選択
-        editDeviceGroup: デバイスグループを編集
+        editDeviceGroup: パネル選択
-        deleteDeviceGroup: デバイスグループを削除
+        deleteDeviceGroup: パネル選択
-        queryDeviceGroup: デバイスグループ一覧を取得
+        queryDeviceGroup: パネル選択
-        bindGroupForDevice: デバイスにデバイスグループを割り当てる
+        bindGroupForDevice: パネル選択
-        bindDeviceForGroup: デバイスグループに紐付けるデバイスを設定する
+        bindDeviceForGroup: パネル選択
         addMonitoringPointCategory: 監視ポイントカテゴリを追加
         editMonitoringPointCategory: 監視ポイントカテゴリを編集
         deleteMonitoringPointCategory: 監視ポイントカテゴリを削除
@@ -118,26 +119,34 @@ msgjp:
         queryMonitoringPointCategoryGroup: 監視ポイントカテゴリグループ一覧を取得
         bindGroupForCategory: 監視ポイントカテゴリにグループをバインド
         bindCategoryForGroup: グループに監視ポイントカテゴリをバインド
-        confirmAlarm: アラームを確認
+        confirmAlarm: 警報管理
-        handleAlarm: アラームを対応
+        handleAlarm: 警報管理
-        exportCumulativeData: 積算データをエクスポート
+        exportCumulativeData: 計量
-        getAlarmDataList: アラームデータ一覧を取得
+        getAlarmDataList: 警報管理
-        exportAlarmData: アラームデータをエクスポート
+        exportAlarmData: 警報管理
-        getMeasureDataList: 計測データ一覧を取得
+        getMeasureDataList: 計測
-        exportMeasureData: 計測データをエクスポート
+        exportMeasureData: 計測
-        getBaStatusDataList: 稼働設備一覧を取得
+        getBaStatusDataList: 運転
-        exportBaStatusData: 稼働設備データをエクスポート
+        exportBaStatusData: 運転
-        getFavoriteList: お気に入りデバイス一覧を取得
+        getFavoriteList: お気に入り
-        removeFavoriteDevice: お気に入りデバイスを削除
+        removeFavoriteDevice: お気に入り
-        addFavoriteDevice: お気に入りデバイスを追加
+        addFavoriteDevice: お気に入り
-        addDeviceForGroup: デバイスグループにバインドされたデバイスを設定する
+        addDeviceForGroup: パネル選択
-        delDeviceForGroup: デバイスグループにバインドされた指定されたデバイスを削除する
+        delDeviceForGroup: パネル選択
         editBuildingField: 建物の属性を編集
         setLngLat: 天気の経度と緯度を設定
         addLevel: レベルを追加
         editLevel: レベルを編集
         deleteLevel: レベルを削除
         queryLevel: レベル一覧を取得
+        addNotificationCategory: お知らせカテゴリ管理
+        editNotificationCategory: お知らせカテゴリ管理
+        delNotificationCategory: お知らせカテゴリ管理
+        addNotification: お知らせ管理
+        editNotification: お知らせ管理
+        delNotification: お知らせ管理
+        editDeviceField: デバイス属性を編集
+
 
 
 

dongjian-dashboard-back-common/src/main/resources/config/language/msg/msg_jp_bak.yml

@@ -0,0 +1,154 @@
+msgjpbak:
+    parameterMap:
+        serviceError: 内部サービスのエラー
+        tokenError: インターフェイスの認証に失敗
+        excelEmpty: フォームが空になっている
+        lineNum: 行{0}：
+        paramsFormatError: パラメータのフォーマットエラー
+        verifCodeExpired: 確認コード期限切れ
+        verifCodeError: 確認コードエラー
+        accountExpired: アカウントの有効期限が切れている
+        pwdError: パスワードエラー
+        userNotExist: ユーザーが存在しない
+        noOperationAuth: 操作権限なし
+        projectNameHasExisted: プロジェクト名がすでにある
+        projectNameDoesNotExist: プロジェクト名がない
+        buildingNameHasExisted: 該当ビル名がすでにある
+        buildingNameDoesNotExist: 該当ビル名がない
+        floorNameHasExisted: 該当フロア名がすでにある
+        floorNameDoesNotExist: 該当フロア名がない
+        buildingNotFound: 該当ビルがない
+        fbNotSameCompany: ビルと同じ会社に所属してください
+        spaceNameHasExisted: 該当部屋名がすでにある
+        floorNotFound: 該当フロア名がない
+        rfNotSameCompany: フロアと同じ会社に所属してください
+        assetNameHasExisted: 該当資産名がすでにある
+        assetSymbolHasExisted: 記号はすでに存在します
+        assetNameDoesNotExist: 該当資産名がない
+        assetSymbolDoesNotExist: 資産記号が存在しません
+        spaceNotFound: 該当部屋がない
+        faNotSameCompany: 部屋と同じ会社に所属してください
+        bindedDevice: デバイスと関連付け
+        deviceTypeNotExist: デバイスタイプがない
+        excelBuildingLineDuplicate: テーブルに同じデータがある
+        dbBuildingDuplicate: プラットフォームにすでに該当ビルがない
+        dbFloorDuplicate: プラットフォームには既にこのフロアが存在しています。
+        dbSpaceDuplicate: プラットフォームには既にこのスペースが存在しています。
+        dbAssetDuplicate: プラットフォームには既にこのアセットが存在しています。
+        excelCompanyNameIsNull: 会社名を入力してください
+        excelBuildingNameIsNull: ビルを入力してください
+        excelFloorNameIsNull: フロア名を入力してください。
+        excelSpaceNameIsNull: スペース名を入力してください。
+        excelSpaceOrFloorNameIsNull: フロア名とスペース名を入力してください。
+        excelCompanyNameNotExist: プラットフォーム上に該当会社名はない
+        userOrEmailNotExist: ユーザーが存在しません
+        companyNameHasExisted: 会社はすでにプラットフォーム上に存在する
+        taowaComapny: 下位の会社を親会社として利用することは不可
+        hasSubsidiary: 削除対象の会社には下位の会社があるので、先に下位の会社を対応してください
+        roleNameExist: 役割名が既に登録済み
+        roleHasBinded: 役割はユーザーにバインドされている ので、削除する前にバインドを解除してください
+        loginNameOrEmailHasExisted: ユーザー名またはメールボックスはすでに使用されています
+        mailAddUserPwdSubject: 新規アカウント・パスワードの作成
+        mailAddUserPwdContent: '{0} 様<br/><br/>このたびは、データ管理プラットフォームへのご登録、誠にありがとうございます。<br/><br/>下記の通り、アカウントが発行されましたのでご案内いたします。<br/><br/>-------------------------------------------------<br/>ユーザー名（ID）：<u>{1}</u><br/>初期パスワード：<span style="text-transform: none;"><u>{2}</u></span><br/>-------------------------------------------------<br/><br/>ご不明な点がございましたら、お気軽にサポートまでお問い合わせください。<br/><br/>ログインはこちらから：<br/>【AD スマビル 可視化UI URL】：https://smbil.ifmservice.jp/login<br/><br/>-------------------------------<br/>イオンディライト株式会社<br/>サポート窓口: smbil-support@ifmservice.jp<br/>-------------------------------'
+        mailResetUserPwdSubject: アカウント・パスワードのリセット
+        pwdFormatError: パスワードの構成には、数字、アルファベット、特殊文字（~!@#$%^&*) で、12桁以上
+        oldPwdError: 旧パスワードエラー
+        newPwdSameOld: 注：旧パスワードと同じものを使用しないでください
+        companyLimit: 最大15のエンタープライズを作成可能
+        consecutiveLoginFail: ログインの失敗が多すぎます。{0}分{1}秒待ってから再度ログインしてください。
+        loginFailCount: ログインに{0}回失敗しました。残りの試行回数：{1}回。
+        deviceGroupNameHasExisted: デバイスグループ名は既に存在しています。
+        invalidDeviceCategory: サポートされていないデバイスタイプ。
+        monitoringPointCategoryNameHasExisted: この監視ポイントカテゴリ名は既に存在します
+        monitoringPointCategoryGroupNameHasExisted: この監視ポイントグループ名は既に存在します
+        alertLevel_1: 通常
+        alertLevel_2: 緊急故障
+        alertLevel_3: 深刻な故障
+        alertLevel_4: 中程度の故障
+        alertLevel_5: 軽微な故障
+        confirmStatus_0: 未確認
+        confirmStatus_1: 確認済み
+        handleStatus_1: 未対応
+        handleStatus_2: 対応中
+        handleStatus_3: 完了
+        handleStatus_4: 自動復旧
+        canNotProcessed: これ以上の処理はできません
+        processOwnRole: 自分のロールを操作することはできません
+        levelNameExist: 階層名は既に存在しています
+        invalidParentLevel: 無効な上位階層です
+        levelReferencedByChildren: 下位階層に紐づいています。削除する前に紐付けを解除してください。
+        elapsedTime: '{0}日{1}時間{2}分間'
+        categoryHasExisted: カテゴリは既に存在します。
+    operationLogMap:
+        addRole: ロールを追加
+        editRole: ロールを編集
+        deleteRole: ロールを削除
+        queryRole: ロール一覧を取得
+        addUser: ユーザーを追加
+        editUser: ユーザーを編集
+        deleteUser: ユーザーを削除
+        resetPassword: パスワードをリセット
+        changePassword: パスワードを変更
+        unbindMFADevice: MFAデバイスの連携を解除
+        queryUser: ユーザー一覧を取得
+        queryOperationLog: 操作ログを照会する
+        getS3Credentials: S3ファイル操作トークンを取得する
+        addSlack: Slackを追加
+        editSlack: Slackを編集
+        deleteSlack: Slackを削除
+        querySlack: Slackリストを取得
+        addTeams: Teamsを追加
+        editTeams: Teamsを編集
+        deleteTeams: Teamsを削除
+        queryTeams: Teamsリストを取得
+        getCumulativeDataList: 積算データ一覧を取得
+        queryDeviceList: デバイス一覧を取得
+        addDeviceGroup: デバイスグループを追加
+        editDeviceGroup: デバイスグループを編集
+        deleteDeviceGroup: デバイスグループを削除
+        queryDeviceGroup: デバイスグループ一覧を取得
+        bindGroupForDevice: デバイスにデバイスグループを割り当てる
+        bindDeviceForGroup: デバイスグループに紐付けるデバイスを設定する
+        addMonitoringPointCategory: 監視ポイントカテゴリを追加
+        editMonitoringPointCategory: 監視ポイントカテゴリを編集
+        deleteMonitoringPointCategory: 監視ポイントカテゴリを削除
+        queryMonitoringPointCategory: 監視ポイントカテゴリ一覧を取得
+        addMonitoringPointCategoryGroup: 監視ポイントカテゴリグループを追加
+        editMonitoringPointCategoryGroup: 監視ポイントカテゴリグループを編集
+        deleteMonitoringPointCategoryGroup: 監視ポイントカテゴリグループを削除
+        queryMonitoringPointCategoryGroup: 監視ポイントカテゴリグループ一覧を取得
+        bindGroupForCategory: 監視ポイントカテゴリにグループをバインド
+        bindCategoryForGroup: グループに監視ポイントカテゴリをバインド
+        confirmAlarm: アラームを確認
+        handleAlarm: アラームを対応
+        exportCumulativeData: 積算データをエクスポート
+        getAlarmDataList: アラームデータ一覧を取得
+        exportAlarmData: アラームデータをエクスポート
+        getMeasureDataList: 計測データ一覧を取得
+        exportMeasureData: 計測データをエクスポート
+        getBaStatusDataList: 稼働設備一覧を取得
+        exportBaStatusData: 稼働設備データをエクスポート
+        getFavoriteList: お気に入りデバイス一覧を取得
+        removeFavoriteDevice: お気に入りデバイスを削除
+        addFavoriteDevice: お気に入りデバイスを追加
+        addDeviceForGroup: デバイスグループにバインドされたデバイスを設定する
+        delDeviceForGroup: デバイスグループにバインドされた指定されたデバイスを削除する
+        editBuildingField: 建物の属性を編集
+        setLngLat: 天気の経度と緯度を設定
+        addLevel: レベルを追加
+        editLevel: レベルを編集
+        deleteLevel: レベルを削除
+        queryLevel: レベル一覧を取得
+        addNotificationCategory: 通知カテゴリを追加
+        editNotificationCategory: 通知カテゴリを編集
+        delNotificationCategory: 通知カテゴリを削除
+        addNotification: 通知を追加
+        editNotification: 通知を編集
+        delNotification: 通知を削除
+
+
+
+
+
+
+

dongjian-dashboard-back-controller/buildPush-aeon-prod.sh

@@ -0,0 +1,11 @@
+aws configure set aws_access_key_id AKIAR26KHSVRUEAKRBPZ
+aws configure set aws_secret_access_key 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
+aws configure set default.region ap-northeast-1
+aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 126588786019.dkr.ecr.ap-northeast-1.amazonaws.com
+
+docker build -t 126588786019.dkr.ecr.ap-northeast-1.amazonaws.com/aeon-prod/dashboard-back:latest\
+    --build-arg JAR_FILE=target/dongjian-dashboard-back-controller-0.0.1-SNAPSHOT.jar \
+    --build-arg LIB_DIR=target/lib \
+    --build-arg CONFIG_DIR=target/config \
+    .
+docker push 126588786019.dkr.ecr.ap-northeast-1.amazonaws.com/aeon-prod/dashboard-back:latest

dongjian-dashboard-back-controller/buildPush-aeon.sh

@@ -1,11 +1,11 @@
-aws configure set aws_access_key_id AKIAQNYBBSGDVT3VF4ON
+aws configure set aws_access_key_id AKIAVSKFRQDPNWHJDSHL
-aws configure set aws_secret_access_key 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
+aws configure set aws_secret_access_key DqGyOiVFKI50/Ix+cjvj25vPL2tC7NJrJ7fqzn/g
 aws configure set default.region ap-northeast-1
-aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 029530100103.dkr.ecr.ap-northeast-1.amazonaws.com
+aws ecr get-login-password --region ap-northeast-1 | docker login --username AWS --password-stdin 382934810846.dkr.ecr.ap-northeast-1.amazonaws.com
 
-docker build -t 029530100103.dkr.ecr.ap-northeast-1.amazonaws.com/aeon/dashboard-back:latest\
+docker build -t 382934810846.dkr.ecr.ap-northeast-1.amazonaws.com/aeon/dashboard-back-stg:latest\
     --build-arg JAR_FILE=target/dongjian-dashboard-back-controller-0.0.1-SNAPSHOT.jar \
     --build-arg LIB_DIR=target/lib \
     --build-arg CONFIG_DIR=target/config \
     .
-docker push 029530100103.dkr.ecr.ap-northeast-1.amazonaws.com/aeon/dashboard-back:latest
+docker push 382934810846.dkr.ecr.ap-northeast-1.amazonaws.com/aeon/dashboard-back-stg:latest

dongjian-dashboard-back-controller/dockerfile

@@ -2,7 +2,8 @@
 # FROM openjdk:17-jdk
 FROM amazoncorretto:17-alpine
 # 安装 fontconfig 和 DejaVu 字体 (这是一个通用且免费的字体包)
-RUN apk --no-cache add fontconfig ttf-dejavu
+RUN apk --no-cache upgrade && \
+    apk --no-cache add fontconfig ttf-dejavu
 
 ENV TZ=Asia/Tokyo
 WORKDIR /home/data-center-dashboard

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/configurator/aspect/OperationLogAspect.java

@@ -6,7 +6,10 @@ import com.dongjian.dashboard.back.common.config.DataSourceInterceptor;
 import com.dongjian.dashboard.back.dao.ex.DashboardOperationLogMapperExt;
 import com.dongjian.dashboard.back.model.DashboardOperationLog;
 import com.dongjian.dashboard.back.service.common.CommonOpt;
+import com.dongjian.dashboard.back.util.IPUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -69,8 +72,13 @@ public class OperationLogAspect {
             logEntry.setUri(uri);
             logEntry.setMethodName(method.getName());
             logEntry.setClassName(signature.getDeclaringTypeName());
-            logEntry.setIpAddress(request.getRemoteAddr());
+            logEntry.setIpAddress(IPUtils.getClientIp(request));
-            String paramsJson = objectMapper.writeValueAsString(joinPoint.getArgs());
+//            String paramsJson = objectMapper.writeValueAsString(joinPoint.getArgs());
+            Object[] filteredArgs = Arrays.stream(joinPoint.getArgs())
+                    .filter(arg -> !(arg instanceof ServletRequest) && !(arg instanceof ServletResponse))
+                    .toArray();
+            String paramsJson = objectMapper.writeValueAsString(filteredArgs);
+
             logEntry.setRequestParams(paramsJson);
             logEntry.setExecutionTimeMs(duration);
             logEntry.setCreatedAt(System.currentTimeMillis());

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DashboardNotificationCategoryController.java

@@ -0,0 +1,98 @@
+package com.dongjian.dashboard.back.controller;
+
+import com.dongjian.dashboard.back.common.exception.BusinessException;
+import com.dongjian.dashboard.back.common.response.PageInfo;
+import com.dongjian.dashboard.back.common.response.PageResponse;
+import com.dongjian.dashboard.back.common.response.ResponseCode;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
+import com.dongjian.dashboard.back.configurator.aspect.OperationLog;
+import com.dongjian.dashboard.back.configurator.interceptor.AccessRequired;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DashboardNotificationCategorySearchParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DeleteDashboardNotificationCategoryParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.OptDashboardNotificationCategoryParams;
+import com.dongjian.dashboard.back.service.DashboardNotificationCategoryService;
+import com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationCategoryPageVO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@AccessRequired
+@RequestMapping("/dashboardNotificationCategory")
+@Tag(name = "dashboard通知里的分类管理", description = "Data Provider manage API")
+@SuppressWarnings("unchecked")
+public class DashboardNotificationCategoryController {
+
+    private static Logger logger = LoggerFactory.getLogger(DashboardNotificationCategoryController.class);
+
+    @Autowired
+    private DashboardNotificationCategoryService dashboardNotificationCategoryService;
+
+    @OperationLog(operation = "addNotificationCategory", remark = "")
+    @Operation(summary = "Add category")
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public SimpleDataResponse add(
+            @RequestBody OptDashboardNotificationCategoryParams optDashboardNotificationCategoryParams,
+            @RequestHeader String LoginName,
+            @RequestHeader String AccessToken,
+            @RequestHeader Long UserId,
+            @RequestHeader(required = false) Long CompanyId,
+            @RequestHeader Integer LanguageType) {
+        return dashboardNotificationCategoryService.add(optDashboardNotificationCategoryParams, UserId, CompanyId, LanguageType);
+    }
+
+    @OperationLog(operation = "editNotificationCategory", remark = "")
+    @Operation(summary = "Edit category")
+    @RequestMapping(value = "/edit", method = RequestMethod.POST)
+    public SimpleDataResponse edit(
+            @RequestBody OptDashboardNotificationCategoryParams optDashboardNotificationCategoryParams,
+            @RequestHeader String LoginName,
+            @RequestHeader String AccessToken,
+            @RequestHeader Long UserId,
+            @RequestHeader(required = false) Long CompanyId,
+            @RequestHeader Integer LanguageType) {
+        return dashboardNotificationCategoryService.edit(optDashboardNotificationCategoryParams, UserId, CompanyId, LanguageType);
+    }
+
+    @OperationLog(operation = "delNotificationCategory", remark = "")
+    @Operation(summary = "Delete category")
+    @RequestMapping(value = "/batchDelete", method = RequestMethod.POST)
+    public SimpleDataResponse batchDelete(
+            @RequestBody DeleteDashboardNotificationCategoryParams deleteParams,
+            @RequestHeader String LoginName,
+            @RequestHeader String AccessToken,
+            @RequestHeader Long UserId,
+            @RequestHeader(required = false) Long CompanyId,
+            @RequestHeader Integer LanguageType) {
+        return dashboardNotificationCategoryService.batchDelete(deleteParams, UserId, CompanyId, LanguageType);
+    }
+
+    @Operation(summary = "Get category list")
+    @RequestMapping(value = "/getListPage", method = RequestMethod.GET)
+    public PageResponse<PageInfo<DashboardNotificationCategoryPageVO>> getListPage(
+            @RequestHeader String LoginName,
+            @RequestHeader String AccessToken,
+            @RequestHeader Long UserId,
+            @RequestHeader(required = false) Long CompanyId,
+            @RequestHeader Integer LanguageType,
+            @RequestHeader Integer UTCOffset,
+            DashboardNotificationCategorySearchParams searchParams) throws BusinessException {
+
+        searchParams.setUserId(UserId);
+        PageResponse<PageInfo<DashboardNotificationCategoryPageVO>> response = new PageResponse<>();
+        try {
+            response.setData(dashboardNotificationCategoryService.getListPage(searchParams, CompanyId, UserId, LanguageType, UTCOffset));
+            response.setCode(ResponseCode.SUCCESS);
+            response.setMsg("success");
+        } catch (Exception e) {
+            logger.error("Error querying list", e);
+            response.setCode(ResponseCode.SERVER_ERROR);
+            response.setMsg("service error");
+        }
+        return response;
+    }
+
+}

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DashboardNotificationController.java

@@ -0,0 +1,98 @@
+package com.dongjian.dashboard.back.controller;
+
+import com.dongjian.dashboard.back.common.exception.BusinessException;
+import com.dongjian.dashboard.back.common.response.PageInfo;
+import com.dongjian.dashboard.back.common.response.PageResponse;
+import com.dongjian.dashboard.back.common.response.ResponseCode;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
+import com.dongjian.dashboard.back.configurator.aspect.OperationLog;
+import com.dongjian.dashboard.back.configurator.interceptor.AccessRequired;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DashboardNotificationSearchParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DeleteDashboardNotificationParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.OptDashboardNotificationParams;
+import com.dongjian.dashboard.back.service.DashboardNotificationService;
+import com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationPageVO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@AccessRequired
+@RequestMapping("/dashboardNotification")
+@Tag(name = "dashboard通知管理", description = "Data Provider manage API")
+@SuppressWarnings("unchecked")
+public class DashboardNotificationController {
+
+    private static Logger logger = LoggerFactory.getLogger(DashboardNotificationController.class);
+
+    @Autowired
+    private DashboardNotificationService dashboardNotificationService;
+
+    @OperationLog(operation = "addNotification", remark = "")
+    @Operation(summary = "Add dashboard notification")
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public SimpleDataResponse add(
+            @RequestBody OptDashboardNotificationParams optDashboardNotificationParams,
+            @RequestHeader String LoginName,
+            @RequestHeader String AccessToken,
+            @RequestHeader Long UserId,
+            @RequestHeader(required = false) Long CompanyId,
+            @RequestHeader Integer LanguageType) {
+        return dashboardNotificationService.add(optDashboardNotificationParams, UserId, CompanyId, LanguageType);
+    }
+
+    @OperationLog(operation = "editNotification", remark = "")
+    @Operation(summary = "Edit dashboard notification")
+    @RequestMapping(value = "/edit", method = RequestMethod.POST)
+    public SimpleDataResponse edit(
+            @RequestBody OptDashboardNotificationParams optDashboardNotificationParams,
+            @RequestHeader String LoginName,
+            @RequestHeader String AccessToken,
+            @RequestHeader Long UserId,
+            @RequestHeader(required = false) Long CompanyId,
+            @RequestHeader Integer LanguageType) {
+        return dashboardNotificationService.edit(optDashboardNotificationParams, UserId, CompanyId, LanguageType);
+    }
+
+    @OperationLog(operation = "delNotification", remark = "")
+    @Operation(summary = "Delete dashboard notification")
+    @RequestMapping(value = "/batchDelete", method = RequestMethod.POST)
+    public SimpleDataResponse batchDelete(
+            @RequestBody DeleteDashboardNotificationParams deleteParams,
+            @RequestHeader String LoginName,
+            @RequestHeader String AccessToken,
+            @RequestHeader Long UserId,
+            @RequestHeader(required = false) Long CompanyId,
+            @RequestHeader Integer LanguageType) {
+        return dashboardNotificationService.batchDelete(deleteParams, UserId, CompanyId, LanguageType);
+    }
+
+    @Operation(summary = "Get dashboard notification list")
+    @RequestMapping(value = "/getListPage", method = RequestMethod.GET)
+    public PageResponse<PageInfo<DashboardNotificationPageVO>> getListPage(
+            @RequestHeader String LoginName,
+            @RequestHeader String AccessToken,
+            @RequestHeader Long UserId,
+            @RequestHeader(required = false) Long CompanyId,
+            @RequestHeader Integer LanguageType,
+            @RequestHeader Integer UTCOffset,
+            DashboardNotificationSearchParams searchParams) throws BusinessException {
+
+        searchParams.setUserId(UserId);
+        PageResponse<PageInfo<DashboardNotificationPageVO>> response = new PageResponse<>();
+        try {
+            response.setData(dashboardNotificationService.getListPage(searchParams, CompanyId, UserId, LanguageType, UTCOffset));
+            response.setCode(ResponseCode.SUCCESS);
+            response.setMsg("success");
+        } catch (Exception e) {
+            logger.error("Error querying list", e);
+            response.setCode(ResponseCode.SERVER_ERROR);
+            response.setMsg("service error");
+        }
+        return response;
+    }
+    
+}

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceController.java

@@ -38,7 +38,7 @@ public class DeviceController {
     @Autowired
     private DeviceService deviceService;
 
-    @OperationLog(operation = "queryDeviceList", remark = "")
+//    @OperationLog(operation = "queryDeviceList", remark = "")
     @Operation(summary = "获取设备列表")
     @RequestMapping(value = "/getListPage",method = RequestMethod.GET)
     public PageResponse<PageInfo<DeviceVO>> getListPage(
@@ -65,7 +65,7 @@ public class DeviceController {
 		return pageResponse;
     }
 
-	@OperationLog(operation = "editRole", remark = "")
+//	@OperationLog(operation = "editDeviceField", remark = "")
 	@Operation(summary = "编辑设备属性")
 	@RequestMapping(value = "/editField",method = RequestMethod.POST)
 	public SimpleDataResponse editField(

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataAccumulateController.java

@@ -2,6 +2,10 @@ package com.dongjian.dashboard.back.controller;
 
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.util.StringUtils;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.dongjian.dashboard.back.common.Constants;
 import com.dongjian.dashboard.back.common.exception.BusinessException;
 import com.dongjian.dashboard.back.common.response.PageInfo;
 import com.dongjian.dashboard.back.common.response.PageResponse;
@@ -14,17 +18,22 @@ import com.dongjian.dashboard.back.dto.device.LineDataSearchParams;
 import com.dongjian.dashboard.back.easyexcel.ExportDeviceAccumulateDataDTO;
 import com.dongjian.dashboard.back.easyexcel.LanguageDynamicHeaderAdapter;
 import com.dongjian.dashboard.back.service.DeviceDataAccumulateService;
+import com.dongjian.dashboard.back.service.common.CommonOpt;
+import com.dongjian.dashboard.back.util.CommonUtil;
 import com.dongjian.dashboard.back.vo.data.DeviceAccumulateData;
 import com.dongjian.dashboard.back.vo.device.LineData;
+import com.github.pagehelper.PageHelper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
@@ -46,8 +55,13 @@ public class DeviceDataAccumulateController {
 
     private static final Logger logger = LoggerFactory.getLogger(DeviceDataAccumulateController.class);
 
+    @Value("${export.page.size}")
+    private Integer EXPORT_PAGE_SIZE;
+
     @Autowired
     private DeviceDataAccumulateService deviceDataAccumulateService;
+    @Autowired
+    private CommonOpt commonOpt;
 
     @OperationLog(operation = "getCumulativeDataList", remark = "")
     @Operation(summary = "获取积算数据列表")
@@ -90,25 +104,61 @@ public class DeviceDataAccumulateController {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("積算データ", StandardCharsets.UTF_8).replace("+", "%20");
+        String fileName = URLEncoder.encode("計量"+CommonUtil.generateExcelSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
+        // ===== 固定导出分页大小=====
+        pageSearchParam.setPageSize(EXPORT_PAGE_SIZE);
+
+        // ===== 构建 Excel =====
+        List<List<String>> head = LanguageDynamicHeaderAdapter.buildHead(ExportDeviceAccumulateDataDTO.class, LanguageType);
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).head(head).build();
+        WriteSheet sheet = EasyExcel.writerSheet("sheet1").build();
+
+        // ===== 循环分页查询并写 Excel =====
+        int pageNum = 1;
+        try {
+            while (true) {
+                pageSearchParam.setPageNum(pageNum);
+
                 PageInfo<DeviceAccumulateData> pageData = deviceDataAccumulateService.getDataList(pageSearchParam, CompanyId, UserId, LanguageType);
+
                 List<DeviceAccumulateData> list = pageData.getList();
+                if (CollectionUtils.isEmpty(list)) {
+                    break; // 没数据了，结束
+                }
 
-        List<ExportDeviceAccumulateDataDTO> exportList = list.stream().map(item -> {
+                for (DeviceAccumulateData item : list) {
                     ExportDeviceAccumulateDataDTO dto = new ExportDeviceAccumulateDataDTO();
                     BeanUtils.copyProperties(item, dto);
-            return dto;
+                    dto.setLastYearRatio(CommonUtil.ratio(item.getCumulativeValue(), item.getLastYearValue()));
-        }).toList();
+                    dto.setYesterdayRatio(CommonUtil.ratio(item.getCumulativeValue(), item.getYesterdayValue()));
+                    dto.setStatus111(commonOpt.status111Mapping(item.getStatus111()));
+                    excelWriter.write(List.of(dto), sheet);
+
+                    // 手动置空，提醒 GC 回收
+                    dto = null;
+                    item = null;
+                }
 
-        // 构造 Excel header：每列三语组合为字符串 "中文||English||日本語"
+                // 手动清理分页数据和缓存
-        List<List<String>> head = LanguageDynamicHeaderAdapter.buildHead(ExportDeviceAccumulateDataDTO.class, LanguageType);
+                list.clear();
+                PageHelper.clearPage();
 
-        EasyExcel.write(response.getOutputStream())
+                // 最后一页判断（加这个更安全）
-                .head(head)
+                if (pageNum >= pageData.getPages()) {
-                .sheet("sheet1")
+                    break;
-                .doWrite(exportList);
+                }
+
+                pageNum++;
+            }
+        } catch (Exception e) {
+            logger.error("export error", e);
+            throw e;
+        } finally {
+            excelWriter.finish();
+            PageHelper.clearPage();
+        }
     }
 
 

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataAlarmController.java

@@ -2,6 +2,9 @@ package com.dongjian.dashboard.back.controller;
 
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.dongjian.dashboard.back.common.Constants;
 import com.dongjian.dashboard.back.common.exception.BusinessException;
 import com.dongjian.dashboard.back.common.response.PageInfo;
 import com.dongjian.dashboard.back.common.response.PageResponse;
@@ -17,18 +20,22 @@ import com.dongjian.dashboard.back.dto.device.WindowAlertQueryRequest;
 import com.dongjian.dashboard.back.easyexcel.ExportDeviceAlarmDataDTO;
 import com.dongjian.dashboard.back.easyexcel.LanguageDynamicHeaderAdapter;
 import com.dongjian.dashboard.back.service.DeviceDataAlarmService;
+import com.dongjian.dashboard.back.util.CommonUtil;
 import com.dongjian.dashboard.back.vo.data.DeviceAlarmData;
 import com.dongjian.dashboard.back.vo.data.HandleHistoryDataVO;
 import com.dongjian.dashboard.back.vo.device.WindowAlertVO;
+import com.github.pagehelper.PageHelper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
@@ -50,6 +57,9 @@ public class DeviceDataAlarmController {
 
     private static final Logger logger = LoggerFactory.getLogger(DeviceDataAlarmController.class);
 
+    @Value("${export.page.size}")
+    private Integer EXPORT_PAGE_SIZE;
+
     @Autowired
     private DeviceDataAlarmService deviceDataAlarmService;
 
@@ -94,25 +104,55 @@ public class DeviceDataAlarmController {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("警報データ", StandardCharsets.UTF_8).replace("+", "%20");
+        String fileName = URLEncoder.encode("警報データ"+ CommonUtil.generateExcelSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
+        // ===== 固定导出分页大小 =====
+        pageSearchParam.setPageSize(EXPORT_PAGE_SIZE);
+
+        // ===== 构建 Excel =====
+        List<List<String>> head = LanguageDynamicHeaderAdapter.buildHead(ExportDeviceAlarmDataDTO.class, LanguageType);
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).head(head).build();
+        WriteSheet sheet = EasyExcel.writerSheet("sheet1").build();
+
+        int pageNum = 1;
+        try {
+            while (true) {
+                pageSearchParam.setPageNum(pageNum);
+
                 PageInfo<DeviceAlarmData> pageData = deviceDataAlarmService.getDataList(pageSearchParam, CompanyId, UserId, LanguageType);
+
                 List<DeviceAlarmData> list = pageData.getList();
+                if (CollectionUtils.isEmpty(list)) {
+                    break; // 没数据了，结束
+                }
 
-        List<ExportDeviceAlarmDataDTO> exportList = list.stream().map(item -> {
+                for (DeviceAlarmData item : list) {
                     ExportDeviceAlarmDataDTO dto = new ExportDeviceAlarmDataDTO();
                     BeanUtils.copyProperties(item, dto);
-            return dto;
+                    excelWriter.write(List.of(dto), sheet);
-        }).toList();
 
-        // 构造 Excel header：每列三语组合为字符串 "中文||English||日本語"
+                    // 手动置空，提醒 GC 回收
-        List<List<String>> head = LanguageDynamicHeaderAdapter.buildHead(ExportDeviceAlarmDataDTO.class, LanguageType);
+                    dto = null;
+                    item = null;
+                }
 
-        EasyExcel.write(response.getOutputStream())
+                // 手动清理分页数据和缓存
-                .head(head)
+                list.clear();
-                .sheet("sheet1")
+                PageHelper.clearPage();
-                .doWrite(exportList);
+
+                if (pageNum >= pageData.getPages()) {
+                    break;
+                }
+                pageNum++;
+            }
+        } catch (Exception e) {
+            logger.error("export alarm error", e);
+            throw e;
+        } finally {
+            excelWriter.finish();
+            PageHelper.clearPage();
+        }
     }
 
     @OperationLog(operation = "handleAlarm", remark = "")

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataBaStatusController.java

@@ -2,26 +2,37 @@ package com.dongjian.dashboard.back.controller;
 
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.dongjian.dashboard.back.common.Constants;
 import com.dongjian.dashboard.back.common.exception.BusinessException;
 import com.dongjian.dashboard.back.common.response.PageInfo;
 import com.dongjian.dashboard.back.common.response.PageResponse;
 import com.dongjian.dashboard.back.common.response.ResponseCode;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
 import com.dongjian.dashboard.back.configurator.aspect.OperationLog;
 import com.dongjian.dashboard.back.configurator.interceptor.AccessRequired;
 import com.dongjian.dashboard.back.dto.data.BaStatusDataSearchParam;
+import com.dongjian.dashboard.back.dto.device.LineDataSearchParams;
 import com.dongjian.dashboard.back.easyexcel.ExportDeviceBaStatusDataDTO;
 import com.dongjian.dashboard.back.easyexcel.LanguageDynamicHeaderAdapter;
 import com.dongjian.dashboard.back.service.DeviceDataBaStatusService;
+import com.dongjian.dashboard.back.service.common.CommonOpt;
+import com.dongjian.dashboard.back.util.CommonUtil;
 import com.dongjian.dashboard.back.vo.data.DeviceBaStatusData;
+import com.dongjian.dashboard.back.vo.device.LineData;
+import com.github.pagehelper.PageHelper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
@@ -43,8 +54,13 @@ public class DeviceDataBaStatusController {
 
     private static final Logger logger = LoggerFactory.getLogger(DeviceDataAccumulateController.class);
 
+    @Value("${export.page.size}")
+    private Integer EXPORT_PAGE_SIZE;
+
     @Autowired
     private DeviceDataBaStatusService deviceDataBaStatusService;
+    @Autowired
+    private CommonOpt commonOpt;
 
     @OperationLog(operation = "getBaStatusDataList", remark = "")
     @Operation(summary = "获取状态数据列表")
@@ -87,25 +103,71 @@ public class DeviceDataBaStatusController {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("稼働設備", StandardCharsets.UTF_8).replace("+", "%20");
+        String fileName = URLEncoder.encode("運転"+ CommonUtil.generateExcelSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
+        // ===== 固定导出分页大小 =====
+        pageSearchParam.setPageSize(EXPORT_PAGE_SIZE);
+
+        // ===== 构建 Excel =====
+        List<List<String>> head = LanguageDynamicHeaderAdapter.buildHead(ExportDeviceBaStatusDataDTO.class, LanguageType);
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).head(head).build();
+        WriteSheet sheet = EasyExcel.writerSheet("sheet1").build();
+
+        int pageNum = 1;
+        try {
+            while (true) {
+                pageSearchParam.setPageNum(pageNum);
+
                 PageInfo<DeviceBaStatusData> pageData = deviceDataBaStatusService.getDataList(pageSearchParam, CompanyId, UserId, LanguageType);
+
                 List<DeviceBaStatusData> list = pageData.getList();
+                if (CollectionUtils.isEmpty(list)) {
+                    break; // 没数据了，结束
+                }
 
-        List<ExportDeviceBaStatusDataDTO> exportList = list.stream().map(item -> {
+                for (DeviceBaStatusData item : list) {
                     ExportDeviceBaStatusDataDTO dto = new ExportDeviceBaStatusDataDTO();
                     BeanUtils.copyProperties(item, dto);
-            return dto;
+                    dto.setStatus111(commonOpt.status111Mapping(item.getStatus111()));
-        }).toList();
+                    excelWriter.write(List.of(dto), sheet);
 
-        // 构造 Excel header：每列三语组合为字符串 "中文||English||日本語"
+                    // 手动置空，提醒 GC 回收
-        List<List<String>> head = LanguageDynamicHeaderAdapter.buildHead(ExportDeviceBaStatusDataDTO.class, LanguageType);
+                    dto = null;
+                    item = null;
+                }
+
+                // 手动清理分页数据和缓存
+                list.clear();
+                PageHelper.clearPage();
 
-        EasyExcel.write(response.getOutputStream())
+                if (pageNum >= pageData.getPages()) {
-                .head(head)
+                    break;
-                .sheet("sheet1")
+                }
-                .doWrite(exportList);
+                pageNum++;
+            }
+        } catch (Exception e) {
+            logger.error("export BA status error", e);
+            throw e;
+        } finally {
+            excelWriter.finish();
+            PageHelper.clearPage();
+        }
+    }
+
+    @OperationLog(operation = "getLineData", remark = "")
+    @Operation(summary = "获取状态迁移图")
+    @RequestMapping(value = "/getLineData",method = RequestMethod.POST)
+    public SimpleDataResponse<List<LineData>> getLineData(
+            @Parameter(name = "searchType", description = "1-按小时，2-全部数据", required = true) Integer searchType,
+            @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
+            @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
+            @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=false) Long CompanyId,
+            @Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType,
+            @RequestBody LineDataSearchParams lineDataSearchParams
+    ) throws BusinessException {
+        return deviceDataBaStatusService.getLineData(searchType, lineDataSearchParams, CompanyId, UserId, LanguageType);
     }
 
 }

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataMeasureController.java

@@ -2,6 +2,9 @@ package com.dongjian.dashboard.back.controller;
 
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.dongjian.dashboard.back.common.Constants;
 import com.dongjian.dashboard.back.common.exception.BusinessException;
 import com.dongjian.dashboard.back.common.response.PageInfo;
 import com.dongjian.dashboard.back.common.response.PageResponse;
@@ -14,17 +17,22 @@ import com.dongjian.dashboard.back.dto.device.LineDataSearchParams;
 import com.dongjian.dashboard.back.easyexcel.ExportDeviceMeasureDataDTO;
 import com.dongjian.dashboard.back.easyexcel.LanguageDynamicHeaderAdapter;
 import com.dongjian.dashboard.back.service.DeviceDataMeasureService;
+import com.dongjian.dashboard.back.service.common.CommonOpt;
+import com.dongjian.dashboard.back.util.CommonUtil;
 import com.dongjian.dashboard.back.vo.data.DeviceMeasureData;
 import com.dongjian.dashboard.back.vo.device.LineData;
+import com.github.pagehelper.PageHelper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
@@ -46,8 +54,13 @@ public class DeviceDataMeasureController {
 
     private static final Logger logger = LoggerFactory.getLogger(DeviceDataAccumulateController.class);
 
+    @Value("${export.page.size}")
+    private Integer EXPORT_PAGE_SIZE;
+
     @Autowired
     private DeviceDataMeasureService deviceDataMeasureService;
+    @Autowired
+    private CommonOpt commonOpt;
 
     @OperationLog(operation = "getMeasureDataList", remark = "")
     @Operation(summary = "获取计测数据列表")
@@ -90,25 +103,56 @@ public class DeviceDataMeasureController {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("計測データ", StandardCharsets.UTF_8).replace("+", "%20");
+        String fileName = URLEncoder.encode("計測"+ CommonUtil.generateExcelSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
+        // ===== 固定导出分页大小 =====
+        pageSearchParam.setPageSize(EXPORT_PAGE_SIZE);
+
+        // ===== 构建 Excel =====
+        List<List<String>> head = LanguageDynamicHeaderAdapter.buildHead(ExportDeviceMeasureDataDTO.class, LanguageType);
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).head(head).build();
+        WriteSheet sheet = EasyExcel.writerSheet("sheet1").build();
+
+        int pageNum = 1;
+        try {
+            while (true) {
+                pageSearchParam.setPageNum(pageNum);
+
                 PageInfo<DeviceMeasureData> pageData = deviceDataMeasureService.getDataList(pageSearchParam, CompanyId, UserId, LanguageType);
+
                 List<DeviceMeasureData> list = pageData.getList();
+                if (CollectionUtils.isEmpty(list)) {
+                    break; // 没数据了，结束
+                }
 
-        List<ExportDeviceMeasureDataDTO> exportList = list.stream().map(item -> {
+                for (DeviceMeasureData item : list) {
                     ExportDeviceMeasureDataDTO dto = new ExportDeviceMeasureDataDTO();
                     BeanUtils.copyProperties(item, dto);
-            return dto;
+                    dto.setStatus111(commonOpt.status111Mapping(item.getStatus111()));
-        }).toList();
+                    excelWriter.write(List.of(dto), sheet);
 
-        // 构造 Excel header：每列三语组合为字符串 "中文||English||日本語"
+                    // 手动置空，提醒 GC 回收
-        List<List<String>> head = LanguageDynamicHeaderAdapter.buildHead(ExportDeviceMeasureDataDTO.class, LanguageType);
+                    dto = null;
+                    item = null;
+                }
+
+                // 手动清理分页数据和缓存
+                list.clear();
+                PageHelper.clearPage();
 
-        EasyExcel.write(response.getOutputStream())
+                if (pageNum >= pageData.getPages()) {
-                .head(head)
+                    break;
-                .sheet("sheet1")
+                }
-                .doWrite(exportList);
+                pageNum++;
+            }
+        } catch (Exception e) {
+            logger.error("export measure data error", e);
+            throw e;
+        } finally {
+            excelWriter.finish();
+            PageHelper.clearPage();
+        }
     }
 
     @OperationLog(operation = "getLineData", remark = "")

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/OverviewController.java

@@ -57,7 +57,7 @@ public class OverviewController {
 
 	@Operation(summary = "Get notification")
 	@RequestMapping(value = "/getNotification", method = RequestMethod.GET)
-	public SimpleDataResponse<DashboardNotificationPageVO> getNotification(
+	public SimpleDataResponse<List<DashboardNotificationPageVO>> getNotification(
 			@Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required = true) String LoginName,
 			@Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required = true) String AccessToken,
 			@Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required = true) Long UserId,

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/RoleController.java

@@ -11,10 +11,15 @@ import com.dongjian.dashboard.back.configurator.interceptor.AccessRequired;
 import com.dongjian.dashboard.back.dto.role.DeleteRoleParam;
 import com.dongjian.dashboard.back.dto.role.OptRoleParam;
 import com.dongjian.dashboard.back.dto.role.PageSearchParam;
+import com.dongjian.dashboard.back.dto.role.RoleMenuPermissionDTO;
 import com.dongjian.dashboard.back.vo.TreeMenusDTO;
+import com.dongjian.dashboard.back.vo.role.DashboardTreeMenusDTO;
+import com.dongjian.dashboard.back.vo.role.MenuTreeVO;
+import com.dongjian.dashboard.back.vo.role.RoleMenuPermissionEntity;
 import com.dongjian.dashboard.back.vo.role.RolePageDTO;
 import com.dongjian.dashboard.back.service.RoleService;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -111,6 +116,7 @@ public class RoleController {
 		return pageResponse;
     }
 
+    @Hidden
     @Operation(summary = "获取当前登录用户拥有的权限菜单树")
     @RequestMapping(value = "/getOwnMenuIds",method = RequestMethod.GET)
     public SimpleDataResponse<List<TreeMenusDTO>> getOwnMenuIds(
@@ -122,6 +128,7 @@ public class RoleController {
     	return roleService.getOwnMenuIds(CompanyId, UserId, LanguageType);
     }
 
+    @Hidden
     @Operation(summary = "获取对应角色拥有的权限菜单ID")
     @RequestMapping(value = "/getMenuIdsByRoleId",method = RequestMethod.GET)
     public SimpleDataResponse<String> getMenuIdsByRoleId(
@@ -134,4 +141,39 @@ public class RoleController {
     	return roleService.getMenuIdsByRoleId(roleId, CompanyId, UserId, LanguageType);
     }
 
+    /**
+     * 获取菜单树 + 权限
+     */
+    @GetMapping("/getOwnMenuTree")
+    public SimpleDataResponse<List<DashboardTreeMenusDTO>> getTree(
+            @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
+            @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
+            @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long CompanyId,
+            @Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType){
+        return roleService.getOwnMenuTree(CompanyId, UserId, LanguageType);
+    }
+
+    @Operation(summary = "获取对应角色拥有的权限菜单ID")
+    @RequestMapping(value = "/getMenuIdListByRoleId",method = RequestMethod.GET)
+    public SimpleDataResponse<List<RoleMenuPermissionEntity>> getMenuIdListByRoleId(
+            @Parameter(name="roleId",description="角色ID",required=true, schema = @Schema(defaultValue = "28")) @RequestParam Long roleId,
+            @Parameter(name = "LoginName", description = "Login name", required = true, schema = @Schema(defaultValue = "admin")) @RequestHeader(required=true) String LoginName,
+            @Parameter(name = "AccessToken", description = "Authentication token", required = true) @RequestHeader(required=true) String AccessToken,
+            @Parameter(name = "UserId", description = "User ID", required = true, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long UserId,
+            @Parameter(name = "CompanyId", description = "ID of the company to which the user belongs", required = false, schema = @Schema(defaultValue = "1")) @RequestHeader(required=true) Long CompanyId,
+            @Parameter(name = "LanguageType", description = "Language type (0: Chinese, 1: English, 2: Japanese)", required = true, schema = @Schema(defaultValue = "2")) @RequestHeader(required=true) Integer LanguageType){
+        return roleService.getMenuIdListByRoleId(roleId, CompanyId, UserId, LanguageType);
+    }
+
+    /**
+     * 保存权限
+     */
+    @Hidden
+    @PostMapping("/save")
+    public void save(@RequestParam Long roleId,
+                     @RequestBody List<RoleMenuPermissionDTO> list) {
+        roleService.saveRolePermission(roleId, list);
+    }
+    
 }

dongjian-dashboard-back-controller/src/main/resources/config/application.properties

@@ -10,7 +10,7 @@ spring.datasource.admin.name=data_center_aeon_admin
 spring.datasource.admin.url=jdbc:mysql://${datasourceDNS}/data_center_aeon_admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=${datasourceTimeZone}
 spring.datasource.admin.username=${datasourceUsername}
 spring.datasource.admin.password=${datasourcePassword}
-#使用druid数据源
+#使用druid数据源
 spring.datasource.admin.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.admin.driverClassName=com.mysql.jdbc.Driver
 spring.datasource.admin.hikari.driverClassName=com.mysql.jdbc.Driver
@@ -23,7 +23,7 @@ dynamic.jdbc.url=jdbc:mysql://${datasourceDNS:rm-bp11k2zm2fr7864428o.mysql.rds.a
 
 spring.datasource.url=jdbc:mysql://${datasourceDNS:rm-bp11k2zm2fr7864428o.mysql.rds.aliyuncs.com:3306}/data_center_aeon_admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=${datasourceTimeZone}
 
-# Aurora 数据源配置
+# Aurora 数据源配置
 spring.aurora.datasource.url=${auroraUrl:jdbc:mysql://rm-bp11k2zm2fr7864428o.mysql.rds.aliyuncs.com:3306/data_center_aeon_admin}
 spring.aurora.datasource.username=${auroraUser:zhc}
 spring.aurora.datasource.password=${auroraPass:Youqu48bnb1}
@@ -33,11 +33,11 @@ spring.aurora.datasource.maximum-pool-size=${auroraMaxPool:30}
 spring.aurora.datasource.connection-timeout=${auroraConnTimeout:30000}
 
 
-#配置log日志
+#配置log日志
 logging.config=classpath:config/logback-boot.xml
 logging_level=${loggingLevel}
 logging_path=${loggingPath}
-#部署时使用SYSLOG
+#部署时使用SYSLOG
 logging_appender=${loggingAppender}
 logging_maxHistory=${loggingMaxHistory:7}
 logging_maxFileSize=100MB
@@ -45,54 +45,55 @@ mybatis_log_level=${mybatisLogLevel}
 
 user.login.keytimeout=360000
 
-#集群模式cluster
+#集群模式cluster
 spring.redis.cluster.nodes=192.168.0.30:7000,192.168.0.30:7001
-#跨集群执行命令时要遵循的最大重定向数量
+#跨集群执行命令时要遵循的最大重定向数量
 spring.redis.cluster.max-redirects=3
-#哨兵模式sentinel
+#哨兵模式sentinel
 spring.redis.sentinel.master=mymaster
 spring.redis.sentinel.nodes=192.168.0.30:16379,192.168.0.30:16379
 
-#单机模式standalone
+#单机模式standalone
 spring.redis.host=${redisHost}
 spring.redis.port=6379
 
 spring.redis.password=${redisPassword}
 spring.redis.timeout=5000
-#Redis数据库索引（默认为0）
+#Redis数据库索引（默认为0）
 spring.redis.database=0
-#配置启动模式cluster、sentinel、standalone
+#配置启动模式cluster、sentinel、standalone
 spring.redis.mode=standalone
 # Lettuce
-# 连接池最大连接数（使用负值表示没有限制）
+# 连接池最大连接数（使用负值表示没有限制）
 spring.redis.lettuce.pool.max-active=8
-# 连接池最大阻塞等待时间（使用负值表示没有限制）
+# 连接池最大阻塞等待时间（使用负值表示没有限制）
 spring.redis.lettuce.pool.max-wait=100
-# 连接池中的最大空闲连接
+# 连接池中的最大空闲连接
 spring.redis.lettuce.pool.max-idle=8
-# 连接池中的最 小空闲连接
+# 连接池中的最 小空闲连接
 spring.redis.lettuce.pool.min-idle=0
-# 关闭超时时间
+# 关闭超时时间
 spring.redis.lettuce.shutdown-timeout=100
 
 
-#邮件发送信息
+#邮件发送信息
 mail.smtp.host=email-smtp.ap-northeast-1.amazonaws.com
 mail.smtp.port=465
 mail.smtp.auth=true
 mail.smtp.ssl=true
-mail.sender.username=AKIAVRXFMB43Z4Q6WGZN
+mail.sender.username=AKIAR26KHSVR3E7N7V3X
-mail.sender.password_encrypted=true
+mail.sender.password_encrypted=false
-mail.sender.password=a/52R0rao7ksRMvl1j17fVEmPCw7gC9OreHDqWOE+S7sgmoQT0YgoLRJqOlJqX7e
+mail.sender.password=BFe3PePmvmKJKF/cwVxKq2C3EG10IcYQ+fNq0Eccl0PU
-mail.sender.sendername=datacenter-info
+mail.sender.sendername=smbil-support@ifmservice.jp
-mail.sender.from=alert@ttkdatatechbuild.com
+mail.sender.from=smbil-support@ifmservice.jp
-#邮件通知服务开关
+#\u90AE\u4EF6\u901A\u77E5\u670D\u52A1\u5F00\u5173
 mail.send.switch=true
 
+
 Spring.mvc.hiddenmethod.filter.enabled=true
-#单个文件上传发大小
+#单个文件上传发大小
 spring.servlet.multipart.max-file-size=20MB
-#多个文件上传的共大小不得超过100M
+#多个文件上传的共大小不得超过100M
 spring.servlet.multipart.max-request-size=100MB
 
 server.servlet.context-path=/api
@@ -127,3 +128,5 @@ ai.api_base=${aiApiBase:https://pdf-demo-stg.ttkdatatechbuild.com/api}
 oidc.issuer = ${oidcIssuer:https://dongjian.southwave.tech/api}
 oidc.bimviewer-url = ${oidcBimviewerUrl:https://bimviewer-stg.ttkdatatechbuild.com/TTNB}
 oidc.bimviewer-cognito-auth-host = ${oidcBimviewerCognitoAuthHost:https://bimviewer-stg.auth.ap-northeast-1.amazoncognito.com}
+
+export.page.size = ${exportPageSize:600}

dongjian-dashboard-back-controller/src/test/java/com/dongjian/dashboard/back/controller/AdminRoleControllerTest.java

@@ -30,6 +30,8 @@ import org.springframework.web.context.WebApplicationContext;
 
 import jakarta.annotation.Resource;
 
+import java.util.ArrayList;
+
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
@@ -134,7 +136,7 @@ public class AdminRoleControllerTest {
     	OptRoleParam param = new OptRoleParam();
     	param.setRoleName(ROLE_NAME);
     	param.setDescription("Description");
-    	param.setMenuIds("1,2");
+    	param.setMenuIds(new ArrayList<>());
         return param;
 	}
 
@@ -204,7 +206,7 @@ public class AdminRoleControllerTest {
     	param.setRoleId(getMockDataId());
     	param.setRoleName(ROLE_NAME);
     	param.setDescription("Description-edit");
-    	param.setMenuIds("1,2,3");
+    	param.setMenuIds(new ArrayList<>());
         String content = (new ObjectMapper()).writeValueAsString(param);
         
         System.out.println("testEdit params:"+content);

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/auto/BaStatusHistoryMapper.java

@@ -0,0 +1,96 @@
+package com.dongjian.dashboard.back.dao.auto;
+
+import com.dongjian.dashboard.back.model.BaStatusHistory;
+import com.dongjian.dashboard.back.model.BaStatusHistoryExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface BaStatusHistoryMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    long countByExample(BaStatusHistoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(BaStatusHistoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    int insert(BaStatusHistory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    int insertSelective(BaStatusHistory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    List<BaStatusHistory> selectByExample(BaStatusHistoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    BaStatusHistory selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") BaStatusHistory record, @Param("example") BaStatusHistoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") BaStatusHistory record, @Param("example") BaStatusHistoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(BaStatusHistory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(BaStatusHistory record);
+}

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/auto/DashboardNotificationCategoryMapper.java

@@ -0,0 +1,96 @@
+package com.dongjian.dashboard.back.dao.auto;
+
+import com.dongjian.dashboard.back.model.DashboardNotificationCategory;
+import com.dongjian.dashboard.back.model.DashboardNotificationCategoryExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface DashboardNotificationCategoryMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    long countByExample(DashboardNotificationCategoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    int deleteByExample(DashboardNotificationCategoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    int deleteByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    int insert(DashboardNotificationCategory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    int insertSelective(DashboardNotificationCategory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    List<DashboardNotificationCategory> selectByExample(DashboardNotificationCategoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    DashboardNotificationCategory selectByPrimaryKey(Long id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    int updateByExampleSelective(@Param("record") DashboardNotificationCategory record, @Param("example") DashboardNotificationCategoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    int updateByExample(@Param("record") DashboardNotificationCategory record, @Param("example") DashboardNotificationCategoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKeySelective(DashboardNotificationCategory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    int updateByPrimaryKey(DashboardNotificationCategory record);
+}

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/BaStatusHistoryMapperExt.java

@@ -0,0 +1,9 @@
+package com.dongjian.dashboard.back.dao.ex;
+
+import com.dongjian.dashboard.back.dao.auto.BaStatusHistoryMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface BaStatusHistoryMapperExt extends BaStatusHistoryMapper {
+
+}

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/BasicRoleMenuRelationMapperExt.java

@@ -1,10 +1,14 @@
 package com.dongjian.dashboard.back.dao.ex;
 
+import java.util.List;
 import java.util.Map;
 
+import com.dongjian.dashboard.back.vo.role.DashboardTreeMenusDTO;
+import com.dongjian.dashboard.back.vo.role.RoleMenuPermissionEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import com.dongjian.dashboard.back.dao.auto.BasicRoleMenuRelationMapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface BasicRoleMenuRelationMapperExt extends BasicRoleMenuRelationMapper {
@@ -14,4 +18,16 @@ public interface BasicRoleMenuRelationMapperExt extends BasicRoleMenuRelationMap
 	String getMenuIdsByRoleId(Long roleId);
 
     void deleteDashboardRelation(Map<String, Object> deleteMap);
+
+	List<DashboardTreeMenusDTO> selectAllMenu(Map<String, Object> allMenusParamMap);
+
+	List<RoleMenuPermissionEntity> selectByRoleId(@Param("roleId") Long roleId);
+
+	int deleteByRoleId(@Param("roleId") Long roleId);
+
+	int dashboardBatchInsert(@Param("list") List<RoleMenuPermissionEntity> list);
+
+	Long getRoleIdByUserId(@Param("userId") Long userId);
+
+	List<RoleMenuPermissionEntity> getMenuIdListByRoleId(Long roleId);
 }

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DashboardNotificationCategoryMapperExt.java

@@ -0,0 +1,17 @@
+package com.dongjian.dashboard.back.dao.ex;
+
+import com.dongjian.dashboard.back.dao.auto.DashboardNotificationCategoryMapper;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DashboardNotificationCategorySearchParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.OptDashboardNotificationCategoryParams;
+import com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationCategoryPageVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface DashboardNotificationCategoryMapperExt extends DashboardNotificationCategoryMapper {
+
+	int checkExist(OptDashboardNotificationCategoryParams optDashboardNotificationCategoryParams);
+
+	List<DashboardNotificationCategoryPageVO> getListPage(DashboardNotificationCategorySearchParams pageSearchParam);
+}

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DashboardNotificationMapperExt.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.dongjian.dashboard.back.dao.auto.DashboardNotificationMapper;
 import com.dongjian.dashboard.back.dao.auto.UserBuildingRelationMapper;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DashboardNotificationSearchParams;
 import com.dongjian.dashboard.back.model.UserBuildingRelation;
 import com.dongjian.dashboard.back.vo.building.BindedBuildingVO;
 import com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationPageVO;
@@ -12,6 +13,8 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface DashboardNotificationMapperExt extends DashboardNotificationMapper {
 
-	DashboardNotificationPageVO getNotification(Long companyId);
+	List<DashboardNotificationPageVO> getNotification(Long companyId);
+
+	List<DashboardNotificationPageVO> getListPage(DashboardNotificationSearchParams pageSearchParam);
 
 }

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DeviceInfoMapperExt.java

@@ -13,6 +13,7 @@ import com.dongjian.dashboard.back.vo.data.DeviceBaStatusData;
 import com.dongjian.dashboard.back.vo.data.DeviceMeasureData;
 import com.dongjian.dashboard.back.vo.device.DeviceVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -38,4 +39,6 @@ public interface DeviceInfoMapperExt extends DeviceInfoMapper {
     List<DeviceAlarmData> getDevice4AlarmData(AlarmDataSearchParam pageSearchParam);
 
     List<DeviceAlarmData> getDevice4AlarmDataByGroup(AlarmDataSearchParam pageSearchParam);
+
+    List<String> selectAlertingDeviceIds(@Param("deviceIds") List<String> deviceIds);
 }

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/DeviceRawdataRealtimeMapperExt.java

@@ -11,7 +11,4 @@ import java.util.Map;
 @Mapper
 public interface DeviceRawdataRealtimeMapperExt extends DeviceRawdataRealtimeMapper {
 
-    List<OverviewInfo> getOverviewInfo(Map<String, Object> paramMap);
-
-    List<OverviewVO> getBuildingInfo(Map<String, Object> buildingMap);
 }

dongjian-dashboard-back-dao/src/main/java/com/dongjian/dashboard/back/dao/ex/OverviewInfoMapperExt.java

@@ -0,0 +1,19 @@
+package com.dongjian.dashboard.back.dao.ex;
+
+import com.dongjian.dashboard.back.vo.data.OverviewCategoryVO;
+import com.dongjian.dashboard.back.vo.data.OverviewInfo;
+import com.dongjian.dashboard.back.vo.data.OverviewVO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface OverviewInfoMapperExt {
+
+    List<OverviewInfo> getOverviewInfo(Map<String, Object> paramMap);
+
+    List<OverviewVO> getBuildingInfo(Map<String, Object> buildingMap);
+
+    List<OverviewCategoryVO> getExistingCategoryList(Map<String, Object> allCategoryParamMap);
+}

dongjian-dashboard-back-dao/src/main/resources/mappers/auto/BaStatusHistoryMapper.xml

@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dongjian.dashboard.back.dao.auto.BaStatusHistoryMapper">
+  <resultMap id="BaseResultMap" type="com.dongjian.dashboard.back.model.BaStatusHistory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="device_info_id" jdbcType="INTEGER" property="deviceInfoId" />
+    <result column="is_running" jdbcType="INTEGER" property="isRunning" />
+    <result column="update_ts" jdbcType="VARCHAR" property="updateTs" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, device_info_id, is_running, update_ts
+  </sql>
+  <select id="selectByExample" parameterType="com.dongjian.dashboard.back.model.BaStatusHistoryExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from ba_status_history
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from ba_status_history
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from ba_status_history
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.dongjian.dashboard.back.model.BaStatusHistoryExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from ba_status_history
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.dongjian.dashboard.back.model.BaStatusHistory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ba_status_history (device_info_id, is_running, update_ts
+      )
+    values (#{deviceInfoId,jdbcType=INTEGER}, #{isRunning,jdbcType=INTEGER}, #{updateTs,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.dongjian.dashboard.back.model.BaStatusHistory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ba_status_history
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="deviceInfoId != null">
+        device_info_id,
+      </if>
+      <if test="isRunning != null">
+        is_running,
+      </if>
+      <if test="updateTs != null">
+        update_ts,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="deviceInfoId != null">
+        #{deviceInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="isRunning != null">
+        #{isRunning,jdbcType=INTEGER},
+      </if>
+      <if test="updateTs != null">
+        #{updateTs,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.dongjian.dashboard.back.model.BaStatusHistoryExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from ba_status_history
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update ba_status_history
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.deviceInfoId != null">
+        device_info_id = #{record.deviceInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="record.isRunning != null">
+        is_running = #{record.isRunning,jdbcType=INTEGER},
+      </if>
+      <if test="record.updateTs != null">
+        update_ts = #{record.updateTs,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update ba_status_history
+    set id = #{record.id,jdbcType=BIGINT},
+      device_info_id = #{record.deviceInfoId,jdbcType=INTEGER},
+      is_running = #{record.isRunning,jdbcType=INTEGER},
+      update_ts = #{record.updateTs,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.dongjian.dashboard.back.model.BaStatusHistory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update ba_status_history
+    <set>
+      <if test="deviceInfoId != null">
+        device_info_id = #{deviceInfoId,jdbcType=INTEGER},
+      </if>
+      <if test="isRunning != null">
+        is_running = #{isRunning,jdbcType=INTEGER},
+      </if>
+      <if test="updateTs != null">
+        update_ts = #{updateTs,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.dongjian.dashboard.back.model.BaStatusHistory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update ba_status_history
+    set device_info_id = #{deviceInfoId,jdbcType=INTEGER},
+      is_running = #{isRunning,jdbcType=INTEGER},
+      update_ts = #{updateTs,jdbcType=VARCHAR}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

dongjian-dashboard-back-dao/src/main/resources/mappers/auto/BasicUserMapper.xml

@@ -26,6 +26,8 @@
     <result column="modifier_id" jdbcType="BIGINT" property="modifierId" />
     <result column="super_role" jdbcType="INTEGER" property="superRole" />
     <result column="create_platform" jdbcType="INTEGER" property="createPlatform" />
+    <result column="last_name" jdbcType="VARCHAR" property="lastName" />
+    <result column="first_name" jdbcType="VARCHAR" property="firstName" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -100,7 +102,7 @@
     -->
     id, user_type, company_id, username, login_name, `password`, salt, email, mfa_secret, 
     mfa_bind, mobile_number, last_login_time, flag, expire_time, create_time, creator_id, 
-    modify_time, modifier_id, super_role, create_platform
+    modify_time, modifier_id, super_role, create_platform, last_name, first_name
   </sql>
   <select id="selectByExample" parameterType="com.dongjian.dashboard.back.model.BasicUserExample" resultMap="BaseResultMap">
     <!--
@@ -163,14 +165,16 @@
       mobile_number, last_login_time, flag, 
       expire_time, create_time, creator_id, 
       modify_time, modifier_id, super_role, 
-      create_platform)
+      create_platform, last_name, first_name
+      )
     values (#{userType,jdbcType=INTEGER}, #{companyId,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, 
       #{loginName,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, #{salt,jdbcType=VARCHAR}, 
       #{email,jdbcType=VARCHAR}, #{mfaSecret,jdbcType=VARCHAR}, #{mfaBind,jdbcType=INTEGER}, 
       #{mobileNumber,jdbcType=VARCHAR}, #{lastLoginTime,jdbcType=BIGINT}, #{flag,jdbcType=INTEGER}, 
       #{expireTime,jdbcType=BIGINT}, #{createTime,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT}, 
       #{modifyTime,jdbcType=BIGINT}, #{modifierId,jdbcType=BIGINT}, #{superRole,jdbcType=INTEGER}, 
-      #{createPlatform,jdbcType=INTEGER})
+      #{createPlatform,jdbcType=INTEGER}, #{lastName,jdbcType=VARCHAR}, #{firstName,jdbcType=VARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.dongjian.dashboard.back.model.BasicUser">
     <!--
@@ -239,6 +243,12 @@
       <if test="createPlatform != null">
         create_platform,
       </if>
+      <if test="lastName != null">
+        last_name,
+      </if>
+      <if test="firstName != null">
+        first_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="userType != null">
@@ -298,6 +308,12 @@
       <if test="createPlatform != null">
         #{createPlatform,jdbcType=INTEGER},
       </if>
+      <if test="lastName != null">
+        #{lastName,jdbcType=VARCHAR},
+      </if>
+      <if test="firstName != null">
+        #{firstName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.dongjian.dashboard.back.model.BasicUserExample" resultType="java.lang.Long">
@@ -377,6 +393,12 @@
       <if test="record.createPlatform != null">
         create_platform = #{record.createPlatform,jdbcType=INTEGER},
       </if>
+      <if test="record.lastName != null">
+        last_name = #{record.lastName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.firstName != null">
+        first_name = #{record.firstName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -407,7 +429,9 @@
       modify_time = #{record.modifyTime,jdbcType=BIGINT},
       modifier_id = #{record.modifierId,jdbcType=BIGINT},
       super_role = #{record.superRole,jdbcType=INTEGER},
-      create_platform = #{record.createPlatform,jdbcType=INTEGER}
+      create_platform = #{record.createPlatform,jdbcType=INTEGER},
+      last_name = #{record.lastName,jdbcType=VARCHAR},
+      first_name = #{record.firstName,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -476,6 +500,12 @@
       <if test="createPlatform != null">
         create_platform = #{createPlatform,jdbcType=INTEGER},
       </if>
+      <if test="lastName != null">
+        last_name = #{lastName,jdbcType=VARCHAR},
+      </if>
+      <if test="firstName != null">
+        first_name = #{firstName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -503,7 +533,9 @@
       modify_time = #{modifyTime,jdbcType=BIGINT},
       modifier_id = #{modifierId,jdbcType=BIGINT},
       super_role = #{superRole,jdbcType=INTEGER},
-      create_platform = #{createPlatform,jdbcType=INTEGER}
+      create_platform = #{createPlatform,jdbcType=INTEGER},
+      last_name = #{lastName,jdbcType=VARCHAR},
+      first_name = #{firstName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

dongjian-dashboard-back-dao/src/main/resources/mappers/auto/DashboardNotificationCategoryMapper.xml

@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dongjian.dashboard.back.dao.auto.DashboardNotificationCategoryMapper">
+  <resultMap id="BaseResultMap" type="com.dongjian.dashboard.back.model.DashboardNotificationCategory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="company_id" jdbcType="BIGINT" property="companyId" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="flag" jdbcType="INTEGER" property="flag" />
+    <result column="created_by" jdbcType="BIGINT" property="createdBy" />
+    <result column="created_at" jdbcType="BIGINT" property="createdAt" />
+    <result column="updated_at" jdbcType="BIGINT" property="updatedAt" />
+    <result column="updated_by" jdbcType="BIGINT" property="updatedBy" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    id, company_id, `name`, remark, flag, created_by, created_at, updated_at, updated_by
+  </sql>
+  <select id="selectByExample" parameterType="com.dongjian.dashboard.back.model.DashboardNotificationCategoryExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    'true' as QUERYID,
+    <include refid="Base_Column_List" />
+    from dashboard_notification_category
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from dashboard_notification_category
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from dashboard_notification_category
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.dongjian.dashboard.back.model.DashboardNotificationCategoryExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from dashboard_notification_category
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.dongjian.dashboard.back.model.DashboardNotificationCategory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into dashboard_notification_category (company_id, `name`, remark, 
+      flag, created_by, created_at, 
+      updated_at, updated_by)
+    values (#{companyId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
+      #{flag,jdbcType=INTEGER}, #{createdBy,jdbcType=BIGINT}, #{createdAt,jdbcType=BIGINT}, 
+      #{updatedAt,jdbcType=BIGINT}, #{updatedBy,jdbcType=BIGINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.dongjian.dashboard.back.model.DashboardNotificationCategory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into dashboard_notification_category
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="companyId != null">
+        company_id,
+      </if>
+      <if test="name != null">
+        `name`,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="flag != null">
+        flag,
+      </if>
+      <if test="createdBy != null">
+        created_by,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="updatedBy != null">
+        updated_by,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="companyId != null">
+        #{companyId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="flag != null">
+        #{flag,jdbcType=INTEGER},
+      </if>
+      <if test="createdBy != null">
+        #{createdBy,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=BIGINT},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=BIGINT},
+      </if>
+      <if test="updatedBy != null">
+        #{updatedBy,jdbcType=BIGINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.dongjian.dashboard.back.model.DashboardNotificationCategoryExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from dashboard_notification_category
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update dashboard_notification_category
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.companyId != null">
+        company_id = #{record.companyId,jdbcType=BIGINT},
+      </if>
+      <if test="record.name != null">
+        `name` = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null">
+        remark = #{record.remark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.flag != null">
+        flag = #{record.flag,jdbcType=INTEGER},
+      </if>
+      <if test="record.createdBy != null">
+        created_by = #{record.createdBy,jdbcType=BIGINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=BIGINT},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=BIGINT},
+      </if>
+      <if test="record.updatedBy != null">
+        updated_by = #{record.updatedBy,jdbcType=BIGINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update dashboard_notification_category
+    set id = #{record.id,jdbcType=BIGINT},
+      company_id = #{record.companyId,jdbcType=BIGINT},
+      `name` = #{record.name,jdbcType=VARCHAR},
+      remark = #{record.remark,jdbcType=VARCHAR},
+      flag = #{record.flag,jdbcType=INTEGER},
+      created_by = #{record.createdBy,jdbcType=BIGINT},
+      created_at = #{record.createdAt,jdbcType=BIGINT},
+      updated_at = #{record.updatedAt,jdbcType=BIGINT},
+      updated_by = #{record.updatedBy,jdbcType=BIGINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.dongjian.dashboard.back.model.DashboardNotificationCategory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update dashboard_notification_category
+    <set>
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        `name` = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=VARCHAR},
+      </if>
+      <if test="flag != null">
+        flag = #{flag,jdbcType=INTEGER},
+      </if>
+      <if test="createdBy != null">
+        created_by = #{createdBy,jdbcType=BIGINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=BIGINT},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=BIGINT},
+      </if>
+      <if test="updatedBy != null">
+        updated_by = #{updatedBy,jdbcType=BIGINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.dongjian.dashboard.back.model.DashboardNotificationCategory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update dashboard_notification_category
+    set company_id = #{companyId,jdbcType=BIGINT},
+      `name` = #{name,jdbcType=VARCHAR},
+      remark = #{remark,jdbcType=VARCHAR},
+      flag = #{flag,jdbcType=INTEGER},
+      created_by = #{createdBy,jdbcType=BIGINT},
+      created_at = #{createdAt,jdbcType=BIGINT},
+      updated_at = #{updatedAt,jdbcType=BIGINT},
+      updated_by = #{updatedBy,jdbcType=BIGINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

dongjian-dashboard-back-dao/src/main/resources/mappers/auto/DashboardNotificationMapper.xml

@@ -10,6 +10,7 @@
     <result column="company_id" jdbcType="BIGINT" property="companyId" />
     <result column="demand_time" jdbcType="VARCHAR" property="demandTime" />
     <result column="category" jdbcType="VARCHAR" property="category" />
+    <result column="category_id" jdbcType="BIGINT" property="categoryId" />
     <result column="flag" jdbcType="INTEGER" property="flag" />
     <result column="created_at" jdbcType="BIGINT" property="createdAt" />
     <result column="created_by" jdbcType="BIGINT" property="createdBy" />
@@ -94,8 +95,8 @@
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, company_id, demand_time, category, flag, created_at, created_by, updated_at, 
+    id, company_id, demand_time, category, category_id, flag, created_at, created_by, 
-    updated_by
+    updated_at, updated_by
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -183,13 +184,13 @@
       SELECT LAST_INSERT_ID()
     </selectKey>
     insert into dashboard_notification (company_id, demand_time, category, 
-      flag, created_at, created_by, 
+      category_id, flag, created_at, 
-      updated_at, updated_by, content
+      created_by, updated_at, updated_by, 
-      )
+      content)
     values (#{companyId,jdbcType=BIGINT}, #{demandTime,jdbcType=VARCHAR}, #{category,jdbcType=VARCHAR}, 
-      #{flag,jdbcType=INTEGER}, #{createdAt,jdbcType=BIGINT}, #{createdBy,jdbcType=BIGINT}, 
+      #{categoryId,jdbcType=BIGINT}, #{flag,jdbcType=INTEGER}, #{createdAt,jdbcType=BIGINT}, 
-      #{updatedAt,jdbcType=BIGINT}, #{updatedBy,jdbcType=BIGINT}, #{content,jdbcType=LONGVARCHAR}
+      #{createdBy,jdbcType=BIGINT}, #{updatedAt,jdbcType=BIGINT}, #{updatedBy,jdbcType=BIGINT}, 
-      )
+      #{content,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.dongjian.dashboard.back.model.DashboardNotification">
     <!--
@@ -210,6 +211,9 @@
       <if test="category != null">
         category,
       </if>
+      <if test="categoryId != null">
+        category_id,
+      </if>
       <if test="flag != null">
         flag,
       </if>
@@ -239,6 +243,9 @@
       <if test="category != null">
         #{category,jdbcType=VARCHAR},
       </if>
+      <if test="categoryId != null">
+        #{categoryId,jdbcType=BIGINT},
+      </if>
       <if test="flag != null">
         #{flag,jdbcType=INTEGER},
       </if>
@@ -288,6 +295,9 @@
       <if test="record.category != null">
         category = #{record.category,jdbcType=VARCHAR},
       </if>
+      <if test="record.categoryId != null">
+        category_id = #{record.categoryId,jdbcType=BIGINT},
+      </if>
       <if test="record.flag != null">
         flag = #{record.flag,jdbcType=INTEGER},
       </if>
@@ -321,6 +331,7 @@
       company_id = #{record.companyId,jdbcType=BIGINT},
       demand_time = #{record.demandTime,jdbcType=VARCHAR},
       category = #{record.category,jdbcType=VARCHAR},
+      category_id = #{record.categoryId,jdbcType=BIGINT},
       flag = #{record.flag,jdbcType=INTEGER},
       created_at = #{record.createdAt,jdbcType=BIGINT},
       created_by = #{record.createdBy,jdbcType=BIGINT},
@@ -341,6 +352,7 @@
       company_id = #{record.companyId,jdbcType=BIGINT},
       demand_time = #{record.demandTime,jdbcType=VARCHAR},
       category = #{record.category,jdbcType=VARCHAR},
+      category_id = #{record.categoryId,jdbcType=BIGINT},
       flag = #{record.flag,jdbcType=INTEGER},
       created_at = #{record.createdAt,jdbcType=BIGINT},
       created_by = #{record.createdBy,jdbcType=BIGINT},
@@ -366,6 +378,9 @@
       <if test="category != null">
         category = #{category,jdbcType=VARCHAR},
       </if>
+      <if test="categoryId != null">
+        category_id = #{categoryId,jdbcType=BIGINT},
+      </if>
       <if test="flag != null">
         flag = #{flag,jdbcType=INTEGER},
       </if>
@@ -396,6 +411,7 @@
     set company_id = #{companyId,jdbcType=BIGINT},
       demand_time = #{demandTime,jdbcType=VARCHAR},
       category = #{category,jdbcType=VARCHAR},
+      category_id = #{categoryId,jdbcType=BIGINT},
       flag = #{flag,jdbcType=INTEGER},
       created_at = #{createdAt,jdbcType=BIGINT},
       created_by = #{createdBy,jdbcType=BIGINT},
@@ -413,6 +429,7 @@
     set company_id = #{companyId,jdbcType=BIGINT},
       demand_time = #{demandTime,jdbcType=VARCHAR},
       category = #{category,jdbcType=VARCHAR},
+      category_id = #{categoryId,jdbcType=BIGINT},
       flag = #{flag,jdbcType=INTEGER},
       created_at = #{createdAt,jdbcType=BIGINT},
       created_by = #{createdBy,jdbcType=BIGINT},

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicRoleMenuRelationMapperExt.xml

@@ -30,5 +30,65 @@
         r.role_id = #{roleId} AND m.used_by_dashboard = 1
     </delete>
 
+    <select id="selectAllMenu" resultType="com.dongjian.dashboard.back.vo.role.DashboardTreeMenusDTO">
+        SELECT
+            bmenu.`id` AS `menuId`,
+            bmenu.parent_menu_id AS parentMenuId,
+            bmenu.menu_name AS title,
+            bmenu.dashboard_lowest_node AS dashboardLowestNode
+        FROM
+            basic_menu bmenu
+        <if test="superRole != null and superRole == 0">
+            inner join basic_role_menu_relation_dashboard brmrd on bmenu.id = brmrd.menu_id and brmrd.role_id = #{roleId}
+        </if>
+        WHERE
+            bmenu.flag = 0 AND bmenu.used_by_dashboard = 1
+    </select>
+
+    <select id="selectByRoleId" resultType="com.dongjian.dashboard.back.vo.role.RoleMenuPermissionEntity">
+        SELECT
+               role_id,
+               menu_id,
+               permission_type,
+               create_time
+        FROM basic_role_menu_relation_dashboard
+        WHERE role_id = #{roleId}
+    </select>
+
+    <delete id="deleteByRoleId">
+        DELETE FROM basic_role_menu_relation_dashboard
+        WHERE role_id = #{roleId}
+    </delete>
+
+    <insert id="dashboardBatchInsert">
+        INSERT INTO basic_role_menu_relation_dashboard (role_id, menu_id, permission_type, create_time)
+        VALUES
+        <foreach collection="list" item="item" separator=",">
+            (#{item.roleId},
+            #{item.menuId},
+            #{item.permissionType},
+            #{item.createTime})
+        </foreach>
+    </insert>
+
+    <select id="getRoleIdByUserId" resultType="long">
+        SELECT role_id
+        FROM basic_role_user_relation
+        WHERE user_id = #{userId}
+        LIMIT 1
+    </select>
+
+    <select id="getMenuIdListByRoleId" resultType="com.dongjian.dashboard.back.vo.role.RoleMenuPermissionEntity">
+        SELECT
+            brmrd.role_id,
+            brmrd.menu_id,
+            brmrd.permission_type,
+            brmrd.create_time
+        FROM
+            basic_role_menu_relation_dashboard brmrd
+        INNER JOIN basic_menu bmenu ON bmenu.id = brmrd.menu_id
+        WHERE
+            bmenu.flag != 1 AND brmrd.role_id = #{roleId} AND bmenu.used_by_dashboard = 1
+    </select>
 
 </mapper>

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicUserMapperExt.xml

@@ -24,6 +24,8 @@
         	buser.username username,
         	buser.login_name loginName,
         	buser.email,
+			buser.last_name,
+			buser.first_name,
         	buser.mfa_bind,
         	buser.mobile_number mobileNumber,
         	buser.create_time createTime,

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DashboardNotificationCategoryMapperExt.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dongjian.dashboard.back.dao.ex.DashboardNotificationCategoryMapperExt">
+
+
+    <select id="checkExist" resultType="java.lang.Integer">
+        SELECT
+            COUNT(1)
+        FROM
+            dashboard_notification_category
+        WHERE
+            flag != 1 AND name = #{name}
+        <if test="companyId != null">
+            AND company_id = #{companyId}
+        </if>
+        <if test="categoryId != null">
+            AND id != #{categoryId}
+        </if>
+    </select>
+
+    
+    <select id="getListPage" resultType="com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationCategoryPageVO">
+        SELECT
+        	dn.id categoryId,
+        	dn.company_id,
+        	dn.`name`,
+        	dn.remark,
+        	dn.created_at
+        FROM
+        dashboard_notification_category dn
+        WHERE 
+        	dn.flag != 1
+        AND dn.company_id IN <foreach collection="companyIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
+        <if test="categoryIdList != null">
+           AND dn.id IN <foreach collection="categoryIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
+        </if>
+        <if test="name != null and name != ''">
+            AND dn.name LIKE CONCAT('%',#{name},'%')
+        </if>
+        ORDER BY dn.id DESC
+    </select>
+
+</mapper>

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DashboardNotificationMapperExt.xml

@@ -4,14 +4,39 @@
 
     <select id="getNotification" resultType="com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationPageVO">
         SELECT
-            id dashboardNotificationId,
+            dn.id AS dashboardNotificationId,
-            demand_time,
+            dn.demand_time,
-            category,
+            COALESCE(
-            content,
+                    NULLIF(dn.category, ''),
-            created_at
+                    dnc.name
-        FROM dashboard_notification
+            ) AS category,
-        WHERE flag = 0 AND company_id = #{companyId}
+            dn.content,
-        ORDER BY id DESC limit 1
+            dn.created_at
+        FROM
+            dashboard_notification dn LEFT JOIN dashboard_notification_category dnc ON dnc.id = dn.category_id AND dnc.flag = 0
+        WHERE dn.flag = 0 AND dn.company_id = #{companyId}
+        ORDER BY dn.id DESC
+    </select>
+
+    <select id="getListPage" resultType="com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationPageVO">
+        SELECT
+            dn.id dashboardNotificationId,
+            dn.company_id,
+            dn.`demand_time`,
+            dnc.`name` AS category,
+            dnc.id AS categoryId,
+            dn.content,
+            dn.created_at
+        FROM
+            dashboard_notification dn
+        left join dashboard_notification_category dnc on dn.category_id = dnc.id and dnc.flag != 1
+        WHERE
+            dn.flag != 1
+        AND dn.company_id IN <foreach collection="companyIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
+        <if test="dashboardNotificationIdList != null">
+            AND dn.id IN <foreach collection="dashboardNotificationIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
+        </if>
+        ORDER BY dn.created_at DESC
     </select>
 
 </mapper>

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml

@@ -6,6 +6,8 @@
     <sql id="deviceDataSelect">
         basic_floor.floor_id as floorId,
         basic_floor.name as floorName,
+        basic_building.building_id,
+        basic_building.name as buildingName,
         device_info.id,
         device_info.device_id,
         device_info.device_name,
@@ -294,6 +296,12 @@
         ,device_info.id desc
     </sql>
 
+    <sql id="Where_In_Alarm">
+        (alert_history.handle_status != 3 AND alert_history.handle_status != 4)
+        OR
+        (alert_history.handle_status = 4 AND alert_history.retain_alert = 1)
+    </sql>
+
     <select id="getDevice4AlarmData" resultType="com.dongjian.dashboard.back.vo.data.DeviceAlarmData">
         select
         <include refid="deviceDataSelect"/>
@@ -302,11 +310,28 @@
             alert_history.confirm_status,
             alert_history.handle_status,
             alert_history.id alertHistoryId,
+            alert_history.retain_alert,
             1 as classId,
             basic_monitoring_asset.`symbol` assetSymbol
         from
+        <choose>
+            <when test="searchType == 4">
+                device_info
+                left join (
+                    SELECT
+                    *,
+                    ROW_NUMBER() OVER (
+                    PARTITION BY device_id
+                    ORDER BY receive_ts DESC
+                    ) AS rn
+                    FROM alert_history
+                 ) alert_history on alert_history.device_id = device_info.device_id AND alert_history.rn = 1
+            </when>
+            <otherwise>
                 alert_history
                 left join device_info on alert_history.device_id = device_info.device_id
+            </otherwise>
+        </choose>
         left join basic_monitoring_asset on device_info.asset_id = basic_monitoring_asset.equipment_id
         left join basic_space on basic_monitoring_asset.space_id = basic_space.space_id
         left join basic_floor on basic_space.floor_id = basic_floor.floor_id
@@ -324,10 +349,7 @@
             <include refid="deviceDataCommonWhere"/>
             <choose>
                 <when test="searchType == 1">
-                    AND (
+                    AND (<include refid="Where_In_Alarm"/>)
-                        (alert_history.handle_status != 3 AND alert_history.handle_status != 4)
-                        OR (alert_history.handle_status = 4 AND alert_history.retain_alert = 1)
-                    )
                 </when>
                 <when test="searchType == 2">
 
@@ -351,11 +373,28 @@
             alert_history.confirm_status,
             alert_history.handle_status,
             alert_history.id alertHistoryId,
+            alert_history.retain_alert,
             1 as classId,
             basic_monitoring_asset.`symbol` assetSymbol
         from
+        <choose>
+            <when test="searchType == 4">
+                device_info
+                left join (
+                SELECT
+                *,
+                ROW_NUMBER() OVER (
+                PARTITION BY device_id
+                ORDER BY receive_ts DESC
+                ) AS rn
+                FROM alert_history
+                ) alert_history on alert_history.device_id = device_info.device_id AND alert_history.rn = 1
+            </when>
+            <otherwise>
                 alert_history
                 left join device_info on alert_history.device_id = device_info.device_id
+            </otherwise>
+        </choose>
         left join basic_monitoring_asset on device_info.asset_id = basic_monitoring_asset.equipment_id
         left join basic_space on basic_monitoring_asset.space_id = basic_space.space_id
         left join basic_floor on basic_space.floor_id = basic_floor.floor_id
@@ -375,10 +414,7 @@
             <include refid="deviceDataCommonWhere"/>
             <choose>
                 <when test="searchType == 1">
-                    AND (
+                    AND (<include refid="Where_In_Alarm"/>)
-                    (alert_history.handle_status != 3 AND alert_history.handle_status != 4)
-                    OR (alert_history.handle_status = 4 AND alert_history.retain_alert = 1)
-                    )
                 </when>
                 <when test="searchType == 2">
 
@@ -393,6 +429,16 @@
         <include refid="alertHistoryOrder"/>
     </select>
 
+    <select id="selectAlertingDeviceIds" resultType="java.lang.String">
+        SELECT DISTINCT LOWER(device_id) AS device_id
+        FROM alert_history
+        WHERE device_id IN
+        <foreach collection="deviceIds" item="deviceId" open="("  close=")"  separator=",">
+            #{deviceId}
+        </foreach>
+        AND (<include refid="Where_In_Alarm"/>)
+    </select>
+
     <!-- 公共字段 -->
     <sql id="commonDeviceSelectFields">
         device_info.id,

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceRawdataRealtimeMapperExt.xml

@@ -3,51 +3,4 @@
 <mapper namespace="com.dongjian.dashboard.back.dao.ex.DeviceRawdataRealtimeMapperExt">
 
     
-    <select id="getOverviewInfo" resultType="com.dongjian.dashboard.back.vo.data.OverviewInfo">
-		SELECT
-            bbuilding.building_id,
-            bbuilding.name AS buildingName,
-            ah.device_id,
-            ah.receive_ts,
-            basic_asset_class_big.id AS monitoringPointCategoryId,
-            basic_asset_class_big.class_name AS monitoringPointCategoryName
-        FROM
-        basic_building bbuilding
-        INNER JOIN basic_floor on basic_floor.building_id = bbuilding.building_id
-        INNER JOIN basic_space on basic_space.floor_id = basic_floor.floor_id
-        INNER JOIN basic_monitoring_asset on basic_monitoring_asset.space_id = basic_space.space_id
-        INNER JOIN device_info dinfo ON dinfo.asset_id = basic_monitoring_asset.equipment_id
-        INNER JOIN alert_history ah ON dinfo.device_id = ah.device_id
-        LEFT JOIN basic_asset_class_big on basic_asset_class_big.id = basic_monitoring_asset.class_big_id
-        LEFT JOIN type ty ON dinfo.type_id = ty.id
-		WHERE
-            bbuilding.company_id = #{companyId} AND bbuilding.flag = 0 AND basic_floor.flag = 0 AND basic_space.flag = 0
-        AND basic_monitoring_asset.flag = 0 AND dinfo.flag = 0 AND basic_asset_class_big.flag = 0
-        AND ah.confirm_status = 0 AND ah.handle_status = 1
-        AND ty.device_category_id in
-        <foreach collection="categoryIdList" item="categoryId" open="(" separator="," close=")">
-            #{categoryId}
-        </foreach>
-	</select>
-
-    <select id="getBuildingInfo" resultType="com.dongjian.dashboard.back.vo.data.OverviewVO">
-        SELECT
-            bbuilding.building_id,
-            bbuilding.name buildingName,
-            bbuilding.retain_alert,
-            bbuilding.latitude,
-            bbuilding.longitude,
-            bbuilding.picture_introduction,
-            bbuilding.udf_building_id
-        FROM
-            basic_building bbuilding
-        WHERE
-            bbuilding.flag != 1
-        AND bbuilding.company_id = #{companyId}
-        <if test="bindBuildingIdList != null">
-            AND bbuilding.building_id IN <foreach collection="bindBuildingIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
-        </if>
-        order by bbuilding.building_id desc
-    </select>
-    
 </mapper>

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml

@@ -19,8 +19,11 @@
         left join type ty on ty.id = dinfo.type_id
         WHERE
             dinfo.flag != 1 AND basic_monitoring_asset.flag != 1
+        AND (dinfo.device_id LIKE '%\_85' or dinfo.device_id LIKE '%\_85_9003' or dinfo.device_id LIKE '%\_131_5')
         AND basic_space.flag != 1 AND basic_floor.flag != 1 AND basic_building.flag != 1
+        <if test="buildingId != null">
             AND basic_building.building_id = #{buildingId}
+        </if>
         AND dinfo.company_id IN <foreach collection="companyIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
         <if test="categoryIdList != null and categoryIdList.size() > 0">
             and ty.device_category_id in

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryGroupMapperExt.xml

@@ -67,6 +67,7 @@
             mpc.company_id,
             mpc.thumbnail_normal_base64,
             mpc.thumbnail_alarm_base64,
+
             mpc.`name`,
             mpc.remark
         FROM

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/MonitoringPointCategoryMapperExt.xml

@@ -24,6 +24,7 @@
         	mpc.company_id,
             mpc.thumbnail_normal_base64,
             mpc.thumbnail_alarm_base64,
+            mpc.thumbnail_dis_base64,
         	mpc.class_name AS `name`
         FROM
             basic_asset_class_big mpc

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/OperationLogMapperExt.xml

@@ -16,7 +16,13 @@
 			dolog.request_params,
 			dolog.execution_time_ms,
 			dolog.created_at,
-			buser.login_name `user`
+			COALESCE(
+				NULLIF(
+					CONCAT_WS('  ', buser.last_name, buser.first_name),
+					''
+				),
+				buser.login_name
+			) AS `user`
 		FROM
 		    dashboard_operation_log dolog
 		INNER JOIN data_center_aeon_admin.basic_user buser ON buser.id = dolog.user_id

dongjian-dashboard-back-dao/src/main/resources/mappers/ex/OverviewInfoMapperExt.xml

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dongjian.dashboard.back.dao.ex.OverviewInfoMapperExt">
+
+
+    <select id="getOverviewInfo" resultType="com.dongjian.dashboard.back.vo.data.OverviewInfo">
+		SELECT
+            bbuilding.building_id,
+            bbuilding.name AS buildingName,
+            ah.device_id,
+            ah.receive_ts,
+            basic_asset_class_big.id AS monitoringPointCategoryId,
+            basic_asset_class_big.class_name AS monitoringPointCategoryName
+        FROM
+            basic_building bbuilding
+        INNER JOIN basic_floor on basic_floor.building_id = bbuilding.building_id
+        INNER JOIN basic_space on basic_space.floor_id = basic_floor.floor_id
+        INNER JOIN basic_monitoring_asset on basic_monitoring_asset.space_id = basic_space.space_id
+        INNER JOIN device_info dinfo ON dinfo.asset_id = basic_monitoring_asset.equipment_id
+        INNER JOIN alert_history ah ON dinfo.device_id = ah.device_id
+        LEFT JOIN basic_asset_class_big on basic_asset_class_big.id = basic_monitoring_asset.class_big_id
+        LEFT JOIN type ty ON dinfo.type_id = ty.id AND ty.flag = 0
+            AND ty.device_category_id in
+            <foreach collection="categoryIdList" item="categoryId" open="(" separator="," close=")">
+                #{categoryId}
+            </foreach>
+		WHERE
+            bbuilding.company_id = #{companyId} AND bbuilding.flag = 0 AND basic_floor.flag = 0 AND basic_space.flag = 0
+        AND basic_monitoring_asset.flag = 0 AND dinfo.flag = 0
+        AND ah.confirm_status = 0 AND ah.handle_status = 1
+	</select>
+
+    <select id="getBuildingInfo" resultType="com.dongjian.dashboard.back.vo.data.OverviewVO">
+        SELECT
+            bbuilding.building_id,
+            bbuilding.name buildingName,
+            bbuilding.retain_alert,
+            bbuilding.latitude,
+            bbuilding.longitude,
+            bbuilding.picture_introduction,
+            bbuilding.udf_building_id
+        FROM
+            basic_building bbuilding
+        WHERE
+            bbuilding.flag != 1
+        AND bbuilding.company_id = #{companyId}
+        <if test="bindBuildingIdList != null">
+            AND bbuilding.building_id IN <foreach collection="bindBuildingIdList" item="item" open="(" separator="," close=")">#{item}</foreach>
+        </if>
+        order by bbuilding.building_id desc
+    </select>
+
+    <select id="getExistingCategoryList" resultType="com.dongjian.dashboard.back.vo.data.OverviewCategoryVO">
+        SELECT
+            bbuilding.building_id,
+            bbuilding.name AS buildingName,
+            dinfo.device_id,
+            basic_asset_class_big.id AS monitoringPointCategoryId,
+            basic_asset_class_big.class_name AS monitoringPointCategoryName
+        FROM
+            basic_building bbuilding
+        INNER JOIN basic_floor on basic_floor.building_id = bbuilding.building_id
+        INNER JOIN basic_space on basic_space.floor_id = basic_floor.floor_id
+        INNER JOIN basic_monitoring_asset on basic_monitoring_asset.space_id = basic_space.space_id
+        INNER JOIN device_info dinfo ON dinfo.asset_id = basic_monitoring_asset.equipment_id
+        LEFT JOIN basic_asset_class_big on basic_asset_class_big.id = basic_monitoring_asset.class_big_id
+        LEFT JOIN type ty ON dinfo.type_id = ty.id AND ty.flag = 0
+            AND ty.device_category_id in
+            <foreach collection="categoryIdList" item="categoryId" open="(" separator="," close=")">
+                #{categoryId}
+            </foreach>
+        WHERE
+            bbuilding.company_id = #{companyId} AND bbuilding.flag = 0 AND basic_floor.flag = 0 AND basic_space.flag = 0
+        AND basic_monitoring_asset.flag = 0 AND dinfo.flag = 0 AND basic_asset_class_big.flag = 0
+
+    </select>
+    
+</mapper>

dongjian-dashboard-back-dao/src/main/resources/mybatis-generator/generatorConfig.xml

@@ -154,5 +154,15 @@
             <generatedKey column="id" sqlStatement="Mysql" identity="true" />
         </table>
 
+        <table tableName="dashboard_notification_category" domainObjectName="DashboardNotificationCategory" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
+            <property name="useActualColumnNames" value="false" />
+            <generatedKey column="id" sqlStatement="Mysql" identity="true" />
+        </table>
+
+        <table tableName="ba_status_history" domainObjectName="BaStatusHistory" enableCountByExample="true" enableUpdateByExample="true" enableDeleteByExample="true" enableSelectByExample="true" selectByExampleQueryId="true">
+            <property name="useActualColumnNames" value="false" />
+            <generatedKey column="id" sqlStatement="Mysql" identity="true" />
+        </table>
+
     </context>
 </generatorConfiguration>

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/bo/LatestValueBO.java

@@ -0,0 +1,9 @@
+package com.dongjian.dashboard.back.bo;
+
+import lombok.Data;
+
+@Data
+public class LatestValueBO {
+    private Long updateTs;
+    private Integer value;
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/dashboardnotification/DashboardNotificationCategorySearchParams.java

@@ -0,0 +1,25 @@
+package com.dongjian.dashboard.back.dto.dashboardnotification;
+
+import com.dongjian.dashboard.back.dto.BaseSearchParams;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/** 
+* @author Mr.Jiang
+* @time 2022年7月21日 下午8:50:31 
+*/
+@Data
+public class DashboardNotificationCategorySearchParams extends BaseSearchParams{
+
+	@Schema(description = "IDs, comma-separated", example = "1,47")
+	private String categoryIds;
+
+	@Schema(description = "name", example = "name47")
+	private String name;
+
+	@Schema(description = "ID list", hidden = true)
+	private List<Long> categoryIdList;
+
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/dashboardnotification/DashboardNotificationSearchParams.java

@@ -0,0 +1,22 @@
+package com.dongjian.dashboard.back.dto.dashboardnotification;
+
+import com.dongjian.dashboard.back.dto.BaseSearchParams;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/** 
+* @author Mr.Jiang
+* @time 2022年7月21日 下午8:50:31 
+*/
+@Data
+public class DashboardNotificationSearchParams extends BaseSearchParams{
+
+	@Schema(description = "DashboardNotification IDs, comma-separated", example = "1,47")
+	private String dashboardNotificationIds;
+
+	@Schema(description = "DashboardNotification ID list", hidden = true)
+	private List<Long> dashboardNotificationIdList;
+
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/dashboardnotification/DeleteDashboardNotificationCategoryParams.java

@@ -0,0 +1,16 @@
+package com.dongjian.dashboard.back.dto.dashboardnotification;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/** 
+* @author Mr.Jiang
+* @time 2022年7月21日 下午8:50:31 
+*/
+@Data
+public class DeleteDashboardNotificationCategoryParams {
+
+	@Schema(description = "IDs, separated by commas", example = "2738967,587")
+	private String categoryIds;
+
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/dashboardnotification/DeleteDashboardNotificationParams.java

@@ -0,0 +1,16 @@
+package com.dongjian.dashboard.back.dto.dashboardnotification;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/** 
+* @author Mr.Jiang
+* @time 2022年7月21日 下午8:50:31 
+*/
+@Data
+public class DeleteDashboardNotificationParams{
+
+	@Schema(description = "DashboardNotification IDs, separated by commas", example = "2738967,587")
+	private String dashboardNotificationIds;
+
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/dashboardnotification/OptDashboardNotificationCategoryParams.java

@@ -0,0 +1,21 @@
+package com.dongjian.dashboard.back.dto.dashboardnotification;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class OptDashboardNotificationCategoryParams {
+	
+	@Schema(description = "unique identifier ID, not required for new entries", example = "2738967")
+	private Long categoryId;
+
+	@Schema(description = "Company ID", example = "2738967", hidden = true)
+	private Long companyId;
+
+	@Schema(description = "name", example = "webhook", required = true)
+	private String name;
+
+	@Schema(description = "remark", example = "remark")
+	private String remark;
+	
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/dashboardnotification/OptDashboardNotificationParams.java

@@ -0,0 +1,26 @@
+package com.dongjian.dashboard.back.dto.dashboardnotification;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class OptDashboardNotificationParams {
+	
+	@Schema(description = "Provider unique identifier ID, not required for new entries", example = "2738967")
+	private Long dashboardNotificationId;
+
+	@Schema(description = "Company ID", example = "2738967", hidden = true)
+	private Long companyId;
+
+	@Schema(description = "demand time", example = "testProvider1")
+	private String demandTime;
+    
+//	@Schema(description = "category", example = "remark")
+//	private String category;
+	@Schema(description = "Category ID", example = "2738967")
+	private Long categoryId;
+	
+	@Schema(description ="content", example = "2")
+	private String content;
+	
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/data/AlarmDataSearchParam.java

@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 @Data
 public class AlarmDataSearchParam extends DataSearchParam {
 
-    @Schema(description = "查询类型：1-告警一览，2-告警历史，3-未确认告警",example = "1")
+    @Schema(description = "查询类型：1-告警一览，2-告警历史，3-未确认告警,4-只查告警类型设备（不是历史）",example = "1")
     private Integer searchType;
 
 }

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/role/OptRoleParam.java

@@ -4,6 +4,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /** 
 * @author zhc
 * @time 2022年6月14日10:56:38
@@ -22,8 +24,8 @@ public class OptRoleParam {
     @Schema(description = "描述",example = "这是管理员描述", required = true)
     private String description;
     
-    @Schema(description = "菜单权限ID，使用逗号连接",example = "1,4,5,6", required = true)
+    @Schema(description = "菜单权限ID，使用逗号连接",example = "[]", required = true)
-    private String menuIds;
+    private List<RoleMenuPermissionDTO> menuIds;
     
     @Schema(description = "所属企业ID",example = "2", hidden = true)
     private Long companyId;

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/role/RoleMenuPermissionDTO.java

@@ -0,0 +1,10 @@
+package com.dongjian.dashboard.back.dto.role;
+
+import lombok.Data;
+
+@Data
+public class RoleMenuPermissionDTO {
+
+    private Long menuId;
+    private Integer permissionType;
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/dto/user/OptUserParam.java

@@ -37,5 +37,11 @@ public class OptUserParam {
     @Schema(description = "所属企业ID",example = "2", hidden = true)
     private Long companyId;
 
+    @Schema(description = "姓",example = "鸠山", required = true)
+    private String lastName;
+
+    @Schema(description = "名",example = "由纪夫", required = true)
+    private String firstName;
+    
     
 }

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/easyexcel/ExportDeviceAccumulateDataDTO.java

@@ -10,32 +10,35 @@ public class ExportDeviceAccumulateDataDTO {
     @ExcelProperty(value = {"上传时间", "Upload Time", "計測日時"}, converter = TimestampConverter.class)
     private Long uploadTimestamp;
 
+    @ExcelProperty({"设施名", "Facility Name", "施設名"})
+    private String buildingName;
+
     @ExcelProperty({"监视点名称", "Monitoring Point Name", "監視点名称"})
     private String monitoringPointName;
 
-    @ExcelProperty({"楼层名称", "Floor Name", "フロア"})
+    @ExcelProperty({"楼层名称", "Floor", "フロア"})
     private String floorName;
 
-    @ExcelProperty({"监控点分类名称", "Monitoring Point Category Name", "分類"})
+    @ExcelProperty({"监控点分类名称", "Category", "分類"})
     private String monitoringPointCategoryName;
 
-    @ExcelProperty({"网关信息名称", "Gateway Info Name", "接続先情報"})
+//    @ExcelProperty({"网关信息名称", "Gateway Info Name", "接続先情報"})
-    private String gatewayInfoName;
+//    private String gatewayInfoName;
 
-    @ExcelProperty({"数据提供方名称", "Data Provider Name", "データソース"})
+//    @ExcelProperty({"数据提供方名称", "Data Provider Name", "データソース"})
-    private String dataProviderName;
+//    private String dataProviderName;
 
-    @ExcelProperty({"设备状态", "Device Status", "デバイス状態"})
+    @ExcelProperty({"设备状态", "Device Status", "ステータスフラグ"})
     private String status111;
 
-    @ExcelProperty({"累积值", "Cumulative Value", "計測値"})
+    @ExcelProperty({"积算值", "Accumulated Value", "積算値"})
     private String cumulativeValue;
 
-    @ExcelProperty({"昨日值", "Yesterday's Value", "前日値"})
+    @ExcelProperty({"前日比(%)", "Previous Day Ratio(%)", "前日比(%)"})
-    private String yesterdayValue;
+    private String yesterdayRatio;
 
-    @ExcelProperty({"去年值", "Last Year's Value", "前年値"})
+    @ExcelProperty({"前年比(%)", "Previous Year Ratio(%)", "前年比(%)"})
-    private String lastYearValue;
+    private String lastYearRatio;
 
     @ExcelProperty({"单位", "Unit", "単位"})
     private String unit;

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/easyexcel/ExportDeviceBaStatusDataDTO.java

@@ -10,6 +10,9 @@ public class ExportDeviceBaStatusDataDTO {
     @ExcelProperty(value = {"上传时间", "Upload Time", "計測日時"}, converter = TimestampConverter.class)
     private Long uploadTimestamp;
 
+    @ExcelProperty({"设施名", "Facility Name", "施設名"})
+    private String buildingName;
+
     @ExcelProperty({"监视点名称", "Monitoring Point Name", "監視点名称"})
     private String monitoringPointName;
 
@@ -19,17 +22,17 @@ public class ExportDeviceBaStatusDataDTO {
     @ExcelProperty({"监控点分类名称", "Monitoring Point Category Name", "分類"})
     private String monitoringPointCategoryName;
 
-    @ExcelProperty({"网关信息名称", "Gateway Info Name", "接続先情報"})
+//    @ExcelProperty({"网关信息名称", "Gateway Info Name", "接続先情報"})
-    private String gatewayInfoName;
+//    private String gatewayInfoName;
 
-    @ExcelProperty({"数据提供方名称", "Data Provider Name", "データソース"})
+//    @ExcelProperty({"数据提供方名称", "Data Provider Name", "データソース"})
-    private String dataProviderName;
+//    private String dataProviderName;
 
-    @ExcelProperty({"设备状态", "Device Status", "デバイス状態"})
+    @ExcelProperty({"状态", "Status", "状態"})
-    private String status111;
+    private String runningStatus;
 
-    @ExcelProperty(value = {"运行状态", "Running status", "状態"}, converter = RunningStatusConverter.class)
+    @ExcelProperty({"设备状态", "Device Status", "ステータスフラグ"})
-    private Integer runningStatus;
+    private String status111;
 
     @ExcelProperty(value = {"上次运行时间", "Last start time", "前回ON"}, converter = TimestampConverter.class)
     private Long lastStartTime;

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/easyexcel/ExportDeviceMeasureDataDTO.java

@@ -10,6 +10,9 @@ public class ExportDeviceMeasureDataDTO {
     @ExcelProperty(value = {"上传时间", "Upload Time", "計測日時"}, converter = TimestampConverter.class)
     private Long uploadTimestamp;
 
+    @ExcelProperty({"设施名", "Facility Name", "施設名"})
+    private String buildingName;
+
     @ExcelProperty({"监视点名称", "Monitoring Point Name", "監視点名称"})
     private String monitoringPointName;
 
@@ -19,22 +22,22 @@ public class ExportDeviceMeasureDataDTO {
     @ExcelProperty({"监控点分类名称", "Monitoring Point Category Name", "分類"})
     private String monitoringPointCategoryName;
 
-    @ExcelProperty({"网关信息名称", "Gateway Info Name", "接続先情報"})
+//    @ExcelProperty({"网关信息名称", "Gateway Info Name", "接続先情報"})
-    private String gatewayInfoName;
+//    private String gatewayInfoName;
 
-    @ExcelProperty({"数据提供方名称", "Data Provider Name", "データソース"})
+//    @ExcelProperty({"数据提供方名称", "Data Provider Name", "データソース"})
-    private String dataProviderName;
+//    private String dataProviderName;
 
-    @ExcelProperty({"设备状态", "Device Status", "デバイス状態"})
+    @ExcelProperty({"设备状态", "Device Status", "ステータスフラグ"})
     private String status111;
 
     @ExcelProperty({"测量值", "Measurement value", "計測値"})
     private String measurementValue;
 
-    @ExcelProperty({"最大值", "Maximum Value", "最高値"})
+    @ExcelProperty({"最大值", "Maximum Value", "最大値"})
     private String maxValue;
 
-    @ExcelProperty({"最小值", "Minimum Value", "最低値"})
+    @ExcelProperty({"最小值", "Minimum Value", "最小値"})
     private String minValue;
 
     @ExcelProperty({"单位", "Unit", "単位"})

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/easyexcel/SecondsToHMSConverter.java

@@ -28,6 +28,8 @@ public class SecondsToHMSConverter implements Converter<Long> {
 
         if (null == value) return "";
 
+        value = value / 1000;
+
         long hours = value / 3600;
         long minutes = (value % 3600) / 60;
         long seconds = value % 60;

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/model/BaStatusHistory.java

@@ -0,0 +1,166 @@
+package com.dongjian.dashboard.back.model;
+
+import java.io.Serializable;
+
+public class BaStatusHistory implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ba_status_history.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ba_status_history.device_info_id
+     *
+     * @mbg.generated
+     */
+    private Integer deviceInfoId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ba_status_history.is_running
+     *
+     * @mbg.generated
+     */
+    private Integer isRunning;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ba_status_history.update_ts
+     *
+     * @mbg.generated
+     */
+    private String updateTs;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ba_status_history.id
+     *
+     * @return the value of ba_status_history.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ba_status_history.id
+     *
+     * @param id the value for ba_status_history.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ba_status_history.device_info_id
+     *
+     * @return the value of ba_status_history.device_info_id
+     *
+     * @mbg.generated
+     */
+    public Integer getDeviceInfoId() {
+        return deviceInfoId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ba_status_history.device_info_id
+     *
+     * @param deviceInfoId the value for ba_status_history.device_info_id
+     *
+     * @mbg.generated
+     */
+    public void setDeviceInfoId(Integer deviceInfoId) {
+        this.deviceInfoId = deviceInfoId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ba_status_history.is_running
+     *
+     * @return the value of ba_status_history.is_running
+     *
+     * @mbg.generated
+     */
+    public Integer getIsRunning() {
+        return isRunning;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ba_status_history.is_running
+     *
+     * @param isRunning the value for ba_status_history.is_running
+     *
+     * @mbg.generated
+     */
+    public void setIsRunning(Integer isRunning) {
+        this.isRunning = isRunning;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ba_status_history.update_ts
+     *
+     * @return the value of ba_status_history.update_ts
+     *
+     * @mbg.generated
+     */
+    public String getUpdateTs() {
+        return updateTs;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ba_status_history.update_ts
+     *
+     * @param updateTs the value for ba_status_history.update_ts
+     *
+     * @mbg.generated
+     */
+    public void setUpdateTs(String updateTs) {
+        this.updateTs = updateTs == null ? null : updateTs.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", deviceInfoId=").append(deviceInfoId);
+        sb.append(", isRunning=").append(isRunning);
+        sb.append(", updateTs=").append(updateTs);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/model/BaStatusHistoryExample.java

@@ -0,0 +1,552 @@
+package com.dongjian.dashboard.back.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class BaStatusHistoryExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    public BaStatusHistoryExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdIsNull() {
+            addCriterion("device_info_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdIsNotNull() {
+            addCriterion("device_info_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdEqualTo(Integer value) {
+            addCriterion("device_info_id =", value, "deviceInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdNotEqualTo(Integer value) {
+            addCriterion("device_info_id <>", value, "deviceInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdGreaterThan(Integer value) {
+            addCriterion("device_info_id >", value, "deviceInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("device_info_id >=", value, "deviceInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdLessThan(Integer value) {
+            addCriterion("device_info_id <", value, "deviceInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdLessThanOrEqualTo(Integer value) {
+            addCriterion("device_info_id <=", value, "deviceInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdIn(List<Integer> values) {
+            addCriterion("device_info_id in", values, "deviceInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdNotIn(List<Integer> values) {
+            addCriterion("device_info_id not in", values, "deviceInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdBetween(Integer value1, Integer value2) {
+            addCriterion("device_info_id between", value1, value2, "deviceInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeviceInfoIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("device_info_id not between", value1, value2, "deviceInfoId");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningIsNull() {
+            addCriterion("is_running is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningIsNotNull() {
+            addCriterion("is_running is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningEqualTo(Integer value) {
+            addCriterion("is_running =", value, "isRunning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningNotEqualTo(Integer value) {
+            addCriterion("is_running <>", value, "isRunning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningGreaterThan(Integer value) {
+            addCriterion("is_running >", value, "isRunning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_running >=", value, "isRunning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningLessThan(Integer value) {
+            addCriterion("is_running <", value, "isRunning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningLessThanOrEqualTo(Integer value) {
+            addCriterion("is_running <=", value, "isRunning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningIn(List<Integer> values) {
+            addCriterion("is_running in", values, "isRunning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningNotIn(List<Integer> values) {
+            addCriterion("is_running not in", values, "isRunning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningBetween(Integer value1, Integer value2) {
+            addCriterion("is_running between", value1, value2, "isRunning");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsRunningNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_running not between", value1, value2, "isRunning");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsIsNull() {
+            addCriterion("update_ts is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsIsNotNull() {
+            addCriterion("update_ts is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsEqualTo(String value) {
+            addCriterion("update_ts =", value, "updateTs");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsNotEqualTo(String value) {
+            addCriterion("update_ts <>", value, "updateTs");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsGreaterThan(String value) {
+            addCriterion("update_ts >", value, "updateTs");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsGreaterThanOrEqualTo(String value) {
+            addCriterion("update_ts >=", value, "updateTs");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsLessThan(String value) {
+            addCriterion("update_ts <", value, "updateTs");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsLessThanOrEqualTo(String value) {
+            addCriterion("update_ts <=", value, "updateTs");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsLike(String value) {
+            addCriterion("update_ts like", value, "updateTs");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsNotLike(String value) {
+            addCriterion("update_ts not like", value, "updateTs");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsIn(List<String> values) {
+            addCriterion("update_ts in", values, "updateTs");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsNotIn(List<String> values) {
+            addCriterion("update_ts not in", values, "updateTs");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsBetween(String value1, String value2) {
+            addCriterion("update_ts between", value1, value2, "updateTs");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTsNotBetween(String value1, String value2) {
+            addCriterion("update_ts not between", value1, value2, "updateTs");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table ba_status_history
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table ba_status_history
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/model/BasicUser.java

@@ -183,6 +183,24 @@ public class BasicUser implements Serializable {
      */
     private Integer createPlatform;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column basic_user.last_name
+     *
+     * @mbg.generated
+     */
+    private String lastName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column basic_user.first_name
+     *
+     * @mbg.generated
+     */
+    private String firstName;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table basic_user
@@ -671,6 +689,54 @@ public class BasicUser implements Serializable {
         this.createPlatform = createPlatform;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column basic_user.last_name
+     *
+     * @return the value of basic_user.last_name
+     *
+     * @mbg.generated
+     */
+    public String getLastName() {
+        return lastName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column basic_user.last_name
+     *
+     * @param lastName the value for basic_user.last_name
+     *
+     * @mbg.generated
+     */
+    public void setLastName(String lastName) {
+        this.lastName = lastName == null ? null : lastName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column basic_user.first_name
+     *
+     * @return the value of basic_user.first_name
+     *
+     * @mbg.generated
+     */
+    public String getFirstName() {
+        return firstName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column basic_user.first_name
+     *
+     * @param firstName the value for basic_user.first_name
+     *
+     * @mbg.generated
+     */
+    public void setFirstName(String firstName) {
+        this.firstName = firstName == null ? null : firstName.trim();
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method corresponds to the database table basic_user
@@ -703,6 +769,8 @@ public class BasicUser implements Serializable {
         sb.append(", modifierId=").append(modifierId);
         sb.append(", superRole=").append(superRole);
         sb.append(", createPlatform=").append(createPlatform);
+        sb.append(", lastName=").append(lastName);
+        sb.append(", firstName=").append(firstName);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/model/BasicUserExample.java

@@ -1463,6 +1463,146 @@ public class BasicUserExample {
             addCriterion("create_platform not between", value1, value2, "createPlatform");
             return (Criteria) this;
         }
+
+        public Criteria andLastNameIsNull() {
+            addCriterion("last_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameIsNotNull() {
+            addCriterion("last_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameEqualTo(String value) {
+            addCriterion("last_name =", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameNotEqualTo(String value) {
+            addCriterion("last_name <>", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameGreaterThan(String value) {
+            addCriterion("last_name >", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameGreaterThanOrEqualTo(String value) {
+            addCriterion("last_name >=", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameLessThan(String value) {
+            addCriterion("last_name <", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameLessThanOrEqualTo(String value) {
+            addCriterion("last_name <=", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameLike(String value) {
+            addCriterion("last_name like", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameNotLike(String value) {
+            addCriterion("last_name not like", value, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameIn(List<String> values) {
+            addCriterion("last_name in", values, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameNotIn(List<String> values) {
+            addCriterion("last_name not in", values, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameBetween(String value1, String value2) {
+            addCriterion("last_name between", value1, value2, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLastNameNotBetween(String value1, String value2) {
+            addCriterion("last_name not between", value1, value2, "lastName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameIsNull() {
+            addCriterion("first_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameIsNotNull() {
+            addCriterion("first_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameEqualTo(String value) {
+            addCriterion("first_name =", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameNotEqualTo(String value) {
+            addCriterion("first_name <>", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameGreaterThan(String value) {
+            addCriterion("first_name >", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameGreaterThanOrEqualTo(String value) {
+            addCriterion("first_name >=", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameLessThan(String value) {
+            addCriterion("first_name <", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameLessThanOrEqualTo(String value) {
+            addCriterion("first_name <=", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameLike(String value) {
+            addCriterion("first_name like", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameNotLike(String value) {
+            addCriterion("first_name not like", value, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameIn(List<String> values) {
+            addCriterion("first_name in", values, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameNotIn(List<String> values) {
+            addCriterion("first_name not in", values, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameBetween(String value1, String value2) {
+            addCriterion("first_name between", value1, value2, "firstName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstNameNotBetween(String value1, String value2) {
+            addCriterion("first_name not between", value1, value2, "firstName");
+            return (Criteria) this;
+        }
     }
 
     /**

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/model/DashboardNotification.java

@@ -39,6 +39,15 @@ public class DashboardNotification implements Serializable {
      */
     private String category;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_notification.category_id
+     *
+     * @mbg.generated
+     */
+    private Long categoryId;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -197,6 +206,30 @@ public class DashboardNotification implements Serializable {
         this.category = category == null ? null : category.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_notification.category_id
+     *
+     * @return the value of dashboard_notification.category_id
+     *
+     * @mbg.generated
+     */
+    public Long getCategoryId() {
+        return categoryId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_notification.category_id
+     *
+     * @param categoryId the value for dashboard_notification.category_id
+     *
+     * @mbg.generated
+     */
+    public void setCategoryId(Long categoryId) {
+        this.categoryId = categoryId;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column dashboard_notification.flag
@@ -357,6 +390,7 @@ public class DashboardNotification implements Serializable {
         sb.append(", companyId=").append(companyId);
         sb.append(", demandTime=").append(demandTime);
         sb.append(", category=").append(category);
+        sb.append(", categoryId=").append(categoryId);
         sb.append(", flag=").append(flag);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", createdBy=").append(createdBy);

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/model/DashboardNotificationCategory.java

@@ -0,0 +1,336 @@
+package com.dongjian.dashboard.back.model;
+
+import java.io.Serializable;
+
+public class DashboardNotificationCategory implements Serializable {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_notification_category.id
+     *
+     * @mbg.generated
+     */
+    private Long id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_notification_category.company_id
+     *
+     * @mbg.generated
+     */
+    private Long companyId;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_notification_category.name
+     *
+     * @mbg.generated
+     */
+    private String name;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_notification_category.remark
+     *
+     * @mbg.generated
+     */
+    private String remark;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_notification_category.flag
+     *
+     * @mbg.generated
+     */
+    private Integer flag;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_notification_category.created_by
+     *
+     * @mbg.generated
+     */
+    private Long createdBy;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_notification_category.created_at
+     *
+     * @mbg.generated
+     */
+    private Long createdAt;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_notification_category.updated_at
+     *
+     * @mbg.generated
+     */
+    private Long updatedAt;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column dashboard_notification_category.updated_by
+     *
+     * @mbg.generated
+     */
+    private Long updatedBy;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_notification_category.id
+     *
+     * @return the value of dashboard_notification_category.id
+     *
+     * @mbg.generated
+     */
+    public Long getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_notification_category.id
+     *
+     * @param id the value for dashboard_notification_category.id
+     *
+     * @mbg.generated
+     */
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_notification_category.company_id
+     *
+     * @return the value of dashboard_notification_category.company_id
+     *
+     * @mbg.generated
+     */
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_notification_category.company_id
+     *
+     * @param companyId the value for dashboard_notification_category.company_id
+     *
+     * @mbg.generated
+     */
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_notification_category.name
+     *
+     * @return the value of dashboard_notification_category.name
+     *
+     * @mbg.generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_notification_category.name
+     *
+     * @param name the value for dashboard_notification_category.name
+     *
+     * @mbg.generated
+     */
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_notification_category.remark
+     *
+     * @return the value of dashboard_notification_category.remark
+     *
+     * @mbg.generated
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_notification_category.remark
+     *
+     * @param remark the value for dashboard_notification_category.remark
+     *
+     * @mbg.generated
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_notification_category.flag
+     *
+     * @return the value of dashboard_notification_category.flag
+     *
+     * @mbg.generated
+     */
+    public Integer getFlag() {
+        return flag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_notification_category.flag
+     *
+     * @param flag the value for dashboard_notification_category.flag
+     *
+     * @mbg.generated
+     */
+    public void setFlag(Integer flag) {
+        this.flag = flag;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_notification_category.created_by
+     *
+     * @return the value of dashboard_notification_category.created_by
+     *
+     * @mbg.generated
+     */
+    public Long getCreatedBy() {
+        return createdBy;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_notification_category.created_by
+     *
+     * @param createdBy the value for dashboard_notification_category.created_by
+     *
+     * @mbg.generated
+     */
+    public void setCreatedBy(Long createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_notification_category.created_at
+     *
+     * @return the value of dashboard_notification_category.created_at
+     *
+     * @mbg.generated
+     */
+    public Long getCreatedAt() {
+        return createdAt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_notification_category.created_at
+     *
+     * @param createdAt the value for dashboard_notification_category.created_at
+     *
+     * @mbg.generated
+     */
+    public void setCreatedAt(Long createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_notification_category.updated_at
+     *
+     * @return the value of dashboard_notification_category.updated_at
+     *
+     * @mbg.generated
+     */
+    public Long getUpdatedAt() {
+        return updatedAt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_notification_category.updated_at
+     *
+     * @param updatedAt the value for dashboard_notification_category.updated_at
+     *
+     * @mbg.generated
+     */
+    public void setUpdatedAt(Long updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column dashboard_notification_category.updated_by
+     *
+     * @return the value of dashboard_notification_category.updated_by
+     *
+     * @mbg.generated
+     */
+    public Long getUpdatedBy() {
+        return updatedBy;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column dashboard_notification_category.updated_by
+     *
+     * @param updatedBy the value for dashboard_notification_category.updated_by
+     *
+     * @mbg.generated
+     */
+    public void setUpdatedBy(Long updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", companyId=").append(companyId);
+        sb.append(", name=").append(name);
+        sb.append(", remark=").append(remark);
+        sb.append(", flag=").append(flag);
+        sb.append(", createdBy=").append(createdBy);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", updatedBy=").append(updatedBy);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/model/DashboardNotificationCategoryExample.java

@@ -0,0 +1,862 @@
+package com.dongjian.dashboard.back.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DashboardNotificationCategoryExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    public DashboardNotificationCategoryExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Long value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Long value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Long value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Long value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Long value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Long value1, Long value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Long value1, Long value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("company_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("company_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(Long value) {
+            addCriterion("company_id =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(Long value) {
+            addCriterion("company_id <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(Long value) {
+            addCriterion("company_id >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("company_id >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(Long value) {
+            addCriterion("company_id <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(Long value) {
+            addCriterion("company_id <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<Long> values) {
+            addCriterion("company_id in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<Long> values) {
+            addCriterion("company_id not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(Long value1, Long value2) {
+            addCriterion("company_id between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(Long value1, Long value2) {
+            addCriterion("company_id not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("`name` is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("`name` is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("`name` =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("`name` <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("`name` >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("`name` >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("`name` <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("`name` <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("`name` like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("`name` not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("`name` in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("`name` not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("`name` between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("`name` not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagIsNull() {
+            addCriterion("flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagIsNotNull() {
+            addCriterion("flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagEqualTo(Integer value) {
+            addCriterion("flag =", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagNotEqualTo(Integer value) {
+            addCriterion("flag <>", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagGreaterThan(Integer value) {
+            addCriterion("flag >", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagGreaterThanOrEqualTo(Integer value) {
+            addCriterion("flag >=", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagLessThan(Integer value) {
+            addCriterion("flag <", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagLessThanOrEqualTo(Integer value) {
+            addCriterion("flag <=", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagIn(List<Integer> values) {
+            addCriterion("flag in", values, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagNotIn(List<Integer> values) {
+            addCriterion("flag not in", values, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagBetween(Integer value1, Integer value2) {
+            addCriterion("flag between", value1, value2, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagNotBetween(Integer value1, Integer value2) {
+            addCriterion("flag not between", value1, value2, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByIsNull() {
+            addCriterion("created_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByIsNotNull() {
+            addCriterion("created_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByEqualTo(Long value) {
+            addCriterion("created_by =", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByNotEqualTo(Long value) {
+            addCriterion("created_by <>", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByGreaterThan(Long value) {
+            addCriterion("created_by >", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByGreaterThanOrEqualTo(Long value) {
+            addCriterion("created_by >=", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByLessThan(Long value) {
+            addCriterion("created_by <", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByLessThanOrEqualTo(Long value) {
+            addCriterion("created_by <=", value, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByIn(List<Long> values) {
+            addCriterion("created_by in", values, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByNotIn(List<Long> values) {
+            addCriterion("created_by not in", values, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByBetween(Long value1, Long value2) {
+            addCriterion("created_by between", value1, value2, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedByNotBetween(Long value1, Long value2) {
+            addCriterion("created_by not between", value1, value2, "createdBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNull() {
+            addCriterion("created_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIsNotNull() {
+            addCriterion("created_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtEqualTo(Long value) {
+            addCriterion("created_at =", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotEqualTo(Long value) {
+            addCriterion("created_at <>", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThan(Long value) {
+            addCriterion("created_at >", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtGreaterThanOrEqualTo(Long value) {
+            addCriterion("created_at >=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThan(Long value) {
+            addCriterion("created_at <", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtLessThanOrEqualTo(Long value) {
+            addCriterion("created_at <=", value, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtIn(List<Long> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Long> values) {
+            addCriterion("created_at not in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtBetween(Long value1, Long value2) {
+            addCriterion("created_at between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotBetween(Long value1, Long value2) {
+            addCriterion("created_at not between", value1, value2, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNull() {
+            addCriterion("updated_at is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIsNotNull() {
+            addCriterion("updated_at is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtEqualTo(Long value) {
+            addCriterion("updated_at =", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotEqualTo(Long value) {
+            addCriterion("updated_at <>", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThan(Long value) {
+            addCriterion("updated_at >", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtGreaterThanOrEqualTo(Long value) {
+            addCriterion("updated_at >=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThan(Long value) {
+            addCriterion("updated_at <", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtLessThanOrEqualTo(Long value) {
+            addCriterion("updated_at <=", value, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtIn(List<Long> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Long> values) {
+            addCriterion("updated_at not in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtBetween(Long value1, Long value2) {
+            addCriterion("updated_at between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotBetween(Long value1, Long value2) {
+            addCriterion("updated_at not between", value1, value2, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByIsNull() {
+            addCriterion("updated_by is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByIsNotNull() {
+            addCriterion("updated_by is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByEqualTo(Long value) {
+            addCriterion("updated_by =", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByNotEqualTo(Long value) {
+            addCriterion("updated_by <>", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByGreaterThan(Long value) {
+            addCriterion("updated_by >", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByGreaterThanOrEqualTo(Long value) {
+            addCriterion("updated_by >=", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByLessThan(Long value) {
+            addCriterion("updated_by <", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByLessThanOrEqualTo(Long value) {
+            addCriterion("updated_by <=", value, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByIn(List<Long> values) {
+            addCriterion("updated_by in", values, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByNotIn(List<Long> values) {
+            addCriterion("updated_by not in", values, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByBetween(Long value1, Long value2) {
+            addCriterion("updated_by between", value1, value2, "updatedBy");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedByNotBetween(Long value1, Long value2) {
+            addCriterion("updated_by not between", value1, value2, "updatedBy");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table dashboard_notification_category
+     *
+     * @mbg.generated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/model/DashboardNotificationExample.java

@@ -454,6 +454,66 @@ public class DashboardNotificationExample {
             return (Criteria) this;
         }
 
+        public Criteria andCategoryIdIsNull() {
+            addCriterion("category_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIdIsNotNull() {
+            addCriterion("category_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIdEqualTo(Long value) {
+            addCriterion("category_id =", value, "categoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIdNotEqualTo(Long value) {
+            addCriterion("category_id <>", value, "categoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIdGreaterThan(Long value) {
+            addCriterion("category_id >", value, "categoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("category_id >=", value, "categoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIdLessThan(Long value) {
+            addCriterion("category_id <", value, "categoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIdLessThanOrEqualTo(Long value) {
+            addCriterion("category_id <=", value, "categoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIdIn(List<Long> values) {
+            addCriterion("category_id in", values, "categoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIdNotIn(List<Long> values) {
+            addCriterion("category_id not in", values, "categoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIdBetween(Long value1, Long value2) {
+            addCriterion("category_id between", value1, value2, "categoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCategoryIdNotBetween(Long value1, Long value2) {
+            addCriterion("category_id not between", value1, value2, "categoryId");
+            return (Criteria) this;
+        }
+
         public Criteria andFlagIsNull() {
             addCriterion("flag is null");
             return (Criteria) this;

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/dashboardnotification/DashboardNotificationCategoryPageVO.java

@@ -0,0 +1,28 @@
+package com.dongjian.dashboard.back.vo.dashboardnotification;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/** 
+* @author Mr.Jiang
+* @time 2022年7月21日 下午8:50:31 
+*/
+@Data
+public class DashboardNotificationCategoryPageVO {
+
+	@Schema(description = "unique identifier ID, not required for new entries", example = "2738967")
+	private Long categoryId;
+
+	@Schema(description = "Company ID", example = "2738967", hidden = true)
+	private Long companyId;
+
+	@Schema(description = "name", example = "webhook", required = true)
+	private String name;
+
+	@Schema(description = "remark", example = "remark")
+	private String remark;
+	
+	@Schema(description = "created time", example = "2738967")
+	private Long createdAt;
+
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/dashboardnotification/DashboardNotificationPageVO.java

@@ -13,12 +13,18 @@ public class DashboardNotificationPageVO {
 	@Schema(description = "Provider unique identifier ID, not required for new entries", example = "2738967")
 	private Long dashboardNotificationId;
 
+	@Schema(description = "Company ID", example = "2738967", hidden = true)
+	private Long companyId;
+
 	@Schema(description = "demand time", example = "testProvider1")
 	private String demandTime;
 
 	@Schema(description = "category", example = "remark")
 	private String category;
 
+	@Schema(description = "Category ID", example = "2738967")
+	private Long categoryId;
+
 	@Schema(description ="content", example = "2")
 	private String content;
 

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/BaseData.java

@@ -15,6 +15,12 @@ public class BaseData {
     @Schema(description = "device name", example = "12-34")
     private String deviceName;
 
+    @Schema(description = "building ID", example = "33")
+    private Long buildingId;
+
+    @Schema(description = "building name", example = "66")
+    private String buildingName;
+
     @Schema(description = "upload timestamp", example = "1740033000234")
     private Long uploadTimestamp;
 

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/DeviceAlarmData.java

@@ -39,5 +39,8 @@ public class DeviceAlarmData extends BaseData{
     @Schema(description = "已过去时长", example = "177日3時間54分間")
     private String elapsedTimeStr;
 
+    @Schema(description = "0=正常，1=告警", example = "1")
+    private Integer inAlarm;
+
 
 }

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/OverviewCategoryVO.java

@@ -0,0 +1,23 @@
+package com.dongjian.dashboard.back.vo.data;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class OverviewCategoryVO {
+
+    private Long buildingId;
+
+    private String buildingName;
+
+    private String deviceId;
+
+    private Long monitoringPointCategoryId;
+
+    private String monitoringPointCategoryName;
+
+
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/data/OverviewVO.java

@@ -33,6 +33,9 @@ public class OverviewVO {
     @Schema(description = "今天告警数量",example = "1111")
     private Integer alarmCountToday = 0;
 
+    @Schema(description = "楼宇下设备没有的监视点分类",example = "[]")
+    private List<Long> missingMonitoringPointCategoryList = new ArrayList<>();
+
     @Schema(description = "监视点分类告警数量",example = "1111")
     private List<MonitoringPointCategoryAlarm> monitoringPointCategoryAlarmList = new ArrayList<>();
 

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/device/AccumulateLineData.java → dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/device/SubLineData.java

@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Map;
 
 @Data
-public class AccumulateLineData {
+public class SubLineData {
 
     @Schema(description = "属性编码, 默认：single，温湿度设备：temperature或者humidity")
     private String attrCode;

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/monitoringpointcategory/MonitoringPointCategoryPageVO.java

@@ -24,4 +24,6 @@ public class MonitoringPointCategoryPageVO {
 	@Schema(description = "告警图标", example = "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAalarm")
 	private String thumbnailAlarmBase64;
 
+	@Schema(description = "无效图标", example = "data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAalarm")
+	private String thumbnailDisBase64;
 }

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/role/DashboardTreeMenusDTO.java

@@ -0,0 +1,32 @@
+package com.dongjian.dashboard.back.vo.role;
+
+import com.dongjian.dashboard.back.vo.TreeMenusDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/** 
+* @author Mr.Jiang
+* @time 2022年7月29日 下午4:37:50 
+*/
+@Data
+public class DashboardTreeMenusDTO {
+
+    @Schema(description = "节点ID",example = "11", required = true)
+    private Long menuId;
+
+    @Schema(description = "父节点ID",example = "2", hidden = true)
+    private Long parentMenuId;
+
+    @Schema(description = "节点名称",example = "添加", required = true)
+    private String title;
+
+    @Schema(description = "子节点",example = "[]", required = false)
+    private List<DashboardTreeMenusDTO> children;
+
+    private Integer permissionType; // 0-拒绝 1-只读 2-全部 null=半选
+
+    private Integer dashboardLowestNode; // 0-否 1-是
+
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/role/MenuEntity.java

@@ -0,0 +1,13 @@
+package com.dongjian.dashboard.back.vo.role;
+
+import lombok.Data;
+
+@Data
+public class MenuEntity {
+
+    private Long id;
+    private Long parentMenuId;
+    private String menuName;
+    private Integer menuLevel;
+    private Integer flag;
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/role/MenuTreeVO.java

@@ -0,0 +1,14 @@
+package com.dongjian.dashboard.back.vo.role;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MenuTreeVO {
+
+    private Long id;
+    private String name;
+    private Integer permissionType;
+    private List<MenuTreeVO> children;
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/role/RoleMenuPermissionEntity.java

@@ -0,0 +1,13 @@
+package com.dongjian.dashboard.back.vo.role;
+
+import lombok.Data;
+
+@Data
+public class RoleMenuPermissionEntity {
+
+
+    private Long roleId;
+    private Long menuId;
+    private Integer permissionType;
+    private Long createTime;
+}

dongjian-dashboard-back-model/src/main/java/com/dongjian/dashboard/back/vo/user/UserPageDTO.java

@@ -49,4 +49,10 @@ public class UserPageDTO {
     @Schema(description = "创建时间",example = "1678990326897", required = false)
     private Long createTime;
 
+    @Schema(description = "姓",example = "鸠山", required = true)
+    private String lastName;
+
+    @Schema(description = "名",example = "由纪夫", required = true)
+    private String firstName;
+    
 }

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/DashboardNotificationCategoryService.java

@@ -0,0 +1,24 @@
+package com.dongjian.dashboard.back.service;
+
+import com.dongjian.dashboard.back.common.response.PageInfo;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DashboardNotificationCategorySearchParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DeleteDashboardNotificationCategoryParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.OptDashboardNotificationCategoryParams;
+import com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationCategoryPageVO;
+
+public interface DashboardNotificationCategoryService {
+
+	SimpleDataResponse add(OptDashboardNotificationCategoryParams optDashboardNotificationCategoryParams, Long userId, Long companyId,
+			Integer languageType);
+
+	SimpleDataResponse edit(OptDashboardNotificationCategoryParams optDashboardNotificationCategoryParams, Long userId, Long companyId,
+			Integer languageType);
+
+	SimpleDataResponse batchDelete(DeleteDashboardNotificationCategoryParams deleteParams, Long userId, Long companyId,
+			Integer languageType);
+
+	PageInfo<DashboardNotificationCategoryPageVO> getListPage(DashboardNotificationCategorySearchParams searchParams, Long companyId, Long userId,
+			Integer languageType, Integer uTCOffset);
+	
+}

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/DashboardNotificationService.java

@@ -0,0 +1,24 @@
+package com.dongjian.dashboard.back.service;
+
+import com.dongjian.dashboard.back.common.response.PageInfo;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DashboardNotificationSearchParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DeleteDashboardNotificationParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.OptDashboardNotificationParams;
+import com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationPageVO;
+
+public interface DashboardNotificationService {
+
+	SimpleDataResponse add(OptDashboardNotificationParams optDashboardNotificationParams, Long userId, Long companyId,
+			Integer languageType);
+
+	SimpleDataResponse edit(OptDashboardNotificationParams optDashboardNotificationParams, Long userId, Long companyId,
+			Integer languageType);
+
+	SimpleDataResponse batchDelete(DeleteDashboardNotificationParams deleteParams, Long userId, Long companyId,
+			Integer languageType);
+
+	PageInfo<DashboardNotificationPageVO> getListPage(DashboardNotificationSearchParams searchParams, Long companyId, Long userId,
+			Integer languageType, Integer uTCOffset);
+	
+}

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/DeviceDataBaStatusService.java

@@ -1,8 +1,11 @@
 package com.dongjian.dashboard.back.service;
 
 import com.dongjian.dashboard.back.common.response.PageInfo;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
 import com.dongjian.dashboard.back.dto.data.BaStatusDataSearchParam;
+import com.dongjian.dashboard.back.dto.device.LineDataSearchParams;
 import com.dongjian.dashboard.back.vo.data.DeviceBaStatusData;
+import com.dongjian.dashboard.back.vo.device.LineData;
 
 import java.util.List;
 
@@ -14,4 +17,6 @@ public interface DeviceDataBaStatusService {
 	PageInfo<DeviceBaStatusData> getDataList(BaStatusDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType);
 
     List<DeviceBaStatusData> handleDeviceBaStatusData(BaStatusDataSearchParam pageSearchParam);
+
+    SimpleDataResponse<List<LineData>> getLineData(Integer searchType, LineDataSearchParams lineDataSearchParams, Long companyId, Long userId, Integer languageType);
 }

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/OverviewService.java

@@ -17,5 +17,5 @@ public interface OverviewService {
 
     SimpleDataResponse<JpMeshHourlyForecasts> getWeatherInfo(QueryWeather queryWeather, Long userId, Long companyId, Integer languageType, Integer utcOffset);
 
-    SimpleDataResponse<DashboardNotificationPageVO> getNotification(Long userId, Long companyId, Integer languageType, Integer utcOffset);
+    SimpleDataResponse<List<DashboardNotificationPageVO>> getNotification(Long userId, Long companyId, Integer languageType, Integer utcOffset);
 }

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/RoleService.java

@@ -6,7 +6,11 @@ import com.dongjian.dashboard.back.common.response.PageInfo;
 import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
 import com.dongjian.dashboard.back.dto.role.DeleteRoleParam;
 import com.dongjian.dashboard.back.dto.role.OptRoleParam;
+import com.dongjian.dashboard.back.dto.role.RoleMenuPermissionDTO;
 import com.dongjian.dashboard.back.vo.TreeMenusDTO;
+import com.dongjian.dashboard.back.vo.role.DashboardTreeMenusDTO;
+import com.dongjian.dashboard.back.vo.role.MenuTreeVO;
+import com.dongjian.dashboard.back.vo.role.RoleMenuPermissionEntity;
 import com.dongjian.dashboard.back.vo.role.RolePageDTO;
 
 /**
@@ -28,4 +32,9 @@ public interface RoleService {
 			Long companyId, Long userId, Integer languageType);
 
 
+	SimpleDataResponse<List<DashboardTreeMenusDTO>> getOwnMenuTree(Long companyId, Long userId, Integer languageType);
+
+	void saveRolePermission(Long roleId, List<RoleMenuPermissionDTO> list);
+
+	SimpleDataResponse<List<RoleMenuPermissionEntity>> getMenuIdListByRoleId(Long roleId, Long companyId, Long userId, Integer languageType);
 }

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/CommonOpt.java

@@ -25,7 +25,7 @@ import com.dongjian.dashboard.back.util.DateUtil;
 import com.dongjian.dashboard.back.util.DurationData;
 import com.dongjian.dashboard.back.vo.building.BindedBuildingVO;
 import com.dongjian.dashboard.back.vo.company.AuroraInfo;
-import com.dongjian.dashboard.back.vo.device.AccumulateLineData;
+import com.dongjian.dashboard.back.vo.device.SubLineData;
 import com.dongjian.dashboard.back.vo.device.DeviceIncrement;
 import com.dongjian.dashboard.back.vo.device.LineData;
 import com.dongjian.dashboard.back.vo.record.RecordAccumulateDto;
@@ -159,11 +159,6 @@ public class CommonOpt {
 		return getAuroraInfoByApikey(paramMap);
 	}
 
-	public String buildAuroraJdbcUrl(String dbUrl, String auroraHost) {
-		String regex = "(jdbc:mysql://)([^/]+)(/data_center_aeon_admin.*)";
-		return dbUrl.replaceAll(regex, "$1" + auroraHost + "$3");
-	}
-
 	public String extractValue(ObjectMapper mapper, Long categoryId, String rawData) {
 		if (Constants.DEVICE_TYPE_TEMPERATURE_HUMIDITY.contains(categoryId)){
 			List<String> values = extractAllValues(mapper, rawData);
@@ -260,7 +255,7 @@ public class CommonOpt {
 
 	public List<String> getPreDay(int days) {
 		// 日本时区
-		ZoneId JST = ZoneId.of("Asia/Tokyo");
+		ZoneId JST = Constants.ZONE_TOKYO;
 		// 获取当前日期
 		LocalDate currentDate = LocalDate.now(JST);
 		// 设置日期格式化
@@ -300,14 +295,14 @@ public class CommonOpt {
 						Double yesterdayBase = getDayAccumulate(conn, beforeYesterday, lineDataSearchParams.getDeviceId());
 						Double lastYearBase = getDayAccumulate(conn, lastYearPrev, lineDataSearchParams.getDeviceId());
 
-						AccumulateLineData acc = new AccumulateLineData();
+						SubLineData acc = new SubLineData();
 						acc.setAttrCode(lineData.getAttrCode());
 
 						processAccumulateDay(conn, current, todayBase, "today", acc, deviceInfo);
 						if (searchType == 1) {
 							processAccumulateDay(conn, yesterday, yesterdayBase, "yesterday", acc, deviceInfo);
 							processAccumulateDay(conn, lastYear, lastYearBase, "lastYear", acc, deviceInfo);
-							LineDataAggregator.convertToLineDataHour(acc, lineData);
+							LineDataAggregator.convertToAccumulateLineData(acc, lineData);
 						} else {
 							LineDataAggregator.convertToLineDataAll(acc, lineData);
 						}
@@ -381,10 +376,10 @@ public class CommonOpt {
 			LocalDate date,
 			Double baseValue,
 			String yKey,
-			AccumulateLineData accumulateLineData,
+			SubLineData SubLineData,
 			DeviceInfo deviceInfo) {
 
-        AccumulateLineData.childLineData childLineData = new AccumulateLineData.childLineData();
+        SubLineData.childLineData childLineData = new SubLineData.childLineData();
 
 
 		String sql = "SELECT upload_value, upload_at FROM dashboard_record_accumulate " +
@@ -392,15 +387,15 @@ public class CommonOpt {
 
 		try (PreparedStatement ps = conn.prepareStatement(sql)) {
 			ps.setString(1, deviceInfo.getDeviceId());
-			ps.setString(2, accumulateLineData.getAttrCode());
+			ps.setString(2, SubLineData.getAttrCode());
 			ps.setInt(3, date.getYear());
 			ps.setInt(4, date.getMonthValue());
 			ps.setInt(5, date.getDayOfMonth());
 
 			try (ResultSet rs = ps.executeQuery()) {
 
-				DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+				DateTimeFormatter formatter = Constants.FORMATTER_YMDHMS;
-				ZoneId JST = ZoneId.of("Asia/Tokyo");
+				ZoneId JST = Constants.ZONE_TOKYO;
 
 				while (rs.next()) {
 					long ts = rs.getLong("upload_at");
@@ -429,7 +424,7 @@ public class CommonOpt {
 			logger.error("processAccumulateDay error", e);
 		}
 
-		accumulateLineData.getSubData().put(yKey, childLineData);
+		SubLineData.getSubData().put(yKey, childLineData);
 	}
 
 	private Double getDayAccumulate(Connection conn, LocalDate date, String deviceId) {
@@ -476,38 +471,76 @@ public class CommonOpt {
 					List<String> dateList = getPreDay(1);
 
 					for (String date : dateList) {
-						LocalDate localDate = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy_MM_dd"));
+						LocalDate today = LocalDate.parse(date, DateTimeFormatter.ofPattern("yyyy_MM_dd"));
+						LocalDate yesterday = today.minusDays(1);
+						LocalDate lastYear = DateUtil.getLastYearSameIsoWeekDay(today);
+
+						SubLineData sub = new SubLineData();
+						sub.setAttrCode(lineData.getAttrCode());
+
+						processMeasureDay(conn, today, "today", sub, deviceInfo);
+						if (searchType == 1) {
+							processMeasureDay(conn, yesterday, "yesterday", sub, deviceInfo);
+							processMeasureDay(conn, lastYear, "lastYear", sub, deviceInfo);
+							LineDataAggregator.convertToMeasureLineDataAvg(sub, lineData);
+						} else {
+							LineDataAggregator.convertToLineDataAll(sub, lineData);
+						}
+					}
+				});
+
+		return list;
+	}
+
+	private void processMeasureDay(
+			Connection conn,
+			LocalDate date,
+			String yKey,
+			SubLineData sub,
+			DeviceInfo deviceInfo
+	) {
+		SubLineData.childLineData child = new SubLineData.childLineData();
 
 		String sql = "SELECT upload_value, upload_at FROM dashboard_record_measure " +
-								"WHERE device_id = ? AND attr_code = ? AND date_year = ? AND date_month = ? AND date_day = ? ORDER BY id";
+				"WHERE device_id = ? AND attr_code = ? " +
+				"AND date_year = ? AND date_month = ? AND date_day = ? ORDER BY id";
 
 		try (PreparedStatement ps = conn.prepareStatement(sql)) {
-							ps.setString(1, lineDataSearchParams.getDeviceId());
+			ps.setString(1, deviceInfo.getDeviceId());
-							ps.setString(2, lineData.getAttrCode());
+			ps.setString(2, sub.getAttrCode());
-							ps.setInt(3, localDate.getYear());
+			ps.setInt(3, date.getYear());
-							ps.setInt(4, localDate.getMonthValue());
+			ps.setInt(4, date.getMonthValue());
-							ps.setInt(5, localDate.getDayOfMonth());
+			ps.setInt(5, date.getDayOfMonth());
 
 			try (ResultSet rs = ps.executeQuery()) {
-								if (rs.next()) {
+				DateTimeFormatter formatter = Constants.FORMATTER_YMDHMS;
-									processResult(rs, lineData, deviceInfo);
+
+				while (rs.next()) {
+					long ts = rs.getLong("upload_at");
+					String value = rs.getString("upload_value");
+					if (ts == 0) continue;
+
+					String time = Instant.ofEpochMilli(ts)
+							.atZone(Constants.ZONE_TOKYO)
+							.toLocalDateTime()
+							.format(formatter);
+
+					child.getXData().add(time);
+					child.getYData().add(
+							CommonUtil.formatDecimal(
+									StringUtils.isBlank(value) ? "0" : value,
+									deviceInfo.getDashboardDecimalPlaces()
+							)
+					);
 				}
 			}
 		} catch (Exception e) {
-							logger.error("process measure data error", e);
+			logger.error("processMeasureDay error", e);
-						}
 		}
-				});
 
-		if (searchType == 1) {
+		sub.getSubData().put(yKey, child);
-			list.forEach(ld -> {
-				LineDataAggregator.aggregateAverageByHalfHour(ld);
-				LineDataAggregator.fillTo48HalfHour(ld);
-			});
 	}
 
-		return list;
-	}
 
 	private void processResult(ResultSet result, LineData lineData, DeviceInfo deviceInfo) {
 		try {
@@ -516,7 +549,7 @@ public class CommonOpt {
 			List<Object> yDataList = new ArrayList<>();
 
 			// 使用 DateTimeFormatter 来格式化时间
-			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+			DateTimeFormatter formatter = Constants.FORMATTER_YMDHMS;
 			ObjectMapper mapper = new ObjectMapper();
 
 			// 遍历查询结果
@@ -532,7 +565,7 @@ public class CommonOpt {
 
 				// 将 long 时间戳转换为 LocalDateTime（日本时区）
 				Instant instant = Instant.ofEpochMilli(receiveTs);
-				String formattedDate = instant.atZone(ZoneId.of("Asia/Tokyo"))
+				String formattedDate = instant.atZone(Constants.ZONE_TOKYO)
 						.toLocalDateTime()
 						.format(formatter);
 
@@ -761,4 +794,18 @@ public class CommonOpt {
 		return result;
 	}
 
+	public String status111Mapping(String status111) {
+		if(StringUtils.isBlank(status111)){
+			return null;
+		}
+        return switch (status111) {
+            case "0" -> "NML";
+            case "128" -> "MSK";
+            case "64" -> "OVR";
+            case "32" -> "TBL";
+            case "16" -> "ALM";
+            default -> null;
+        };
+	}
+
 }

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/DashboardMenuTree.java

@@ -0,0 +1,70 @@
+package com.dongjian.dashboard.back.service.common;
+
+import com.dongjian.dashboard.back.vo.role.DashboardTreeMenusDTO;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+public class DashboardMenuTree {
+
+    private List<DashboardTreeMenusDTO> menuList = new ArrayList<>();
+
+    public DashboardMenuTree(List<DashboardTreeMenusDTO> menuList) {
+        this.menuList = menuList;
+    }
+
+    /**
+     * 构建树
+     */
+    public List<DashboardTreeMenusDTO> buildTree(String rootNodeKey) {
+        List<DashboardTreeMenusDTO> treeMenus = new ArrayList<>();
+
+        for (DashboardTreeMenusDTO node : getRootNode(rootNodeKey)) {
+            treeMenus.add(buildChildTree(node));
+        }
+
+        return treeMenus;
+    }
+
+    /**
+     * 构建子树（核心修改点）
+     */
+    private DashboardTreeMenusDTO buildChildTree(DashboardTreeMenusDTO parent) {
+
+        // 如果是最小节点 → 直接终止
+        if (parent.getDashboardLowestNode() != null
+                && parent.getDashboardLowestNode() == 1) {
+
+            parent.setChildren(new ArrayList<>());
+            return parent;
+        }
+
+        List<DashboardTreeMenusDTO> children = new ArrayList<>();
+
+        for (DashboardTreeMenusDTO node : menuList) {
+            if (node.getParentMenuId().equals(parent.getMenuId())) {
+                children.add(buildChildTree(node));
+            }
+        }
+
+        parent.setChildren(children);
+        return parent;
+    }
+
+    /**
+     * 获取根节点
+     */
+    private List<DashboardTreeMenusDTO> getRootNode(String rootNodeKey) {
+
+        List<DashboardTreeMenusDTO> roots = new ArrayList<>();
+
+        for (DashboardTreeMenusDTO node : menuList) {
+            if (Objects.equals(String.valueOf(node.getParentMenuId()), rootNodeKey)) {
+                roots.add(node);
+            }
+        }
+
+        return roots;
+    }
+}

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/common/LineDataAggregator.java

@@ -1,6 +1,6 @@
 package com.dongjian.dashboard.back.service.common;
 
-import com.dongjian.dashboard.back.vo.device.AccumulateLineData;
+import com.dongjian.dashboard.back.vo.device.SubLineData;
 import com.dongjian.dashboard.back.vo.device.LineData;
 
 import java.time.LocalDate;
@@ -149,84 +149,104 @@ public class LineDataAggregator {
         return LocalDateTime.parse(String.valueOf(x), TimeAxisUtil.DATETIME_FMT);
     }
 
-    /* ===============================
+    public static void convertToMeasureLineDataAvg(SubLineData accumulate, LineData lineData) {
-     * 按小时聚合（平均值）
+        if (accumulate == null || accumulate.getSubData() == null) return;
-     * =============================== */
-    public static void aggregateByHour(LineData lineData) {
-        aggregateByHourOrHalfHour(lineData, new AvgCollector(), true);
-    }
 
-    /* ===============================
+        // 1. 每个 series 做「半小时平均」
-     * 按半小时聚合（平均值）
+        Map<String, HalfHourSeries> seriesMap = new LinkedHashMap<>();
-     * =============================== */
+        for (Map.Entry<String, SubLineData.childLineData> entry : accumulate.getSubData().entrySet()) {
-    public static void aggregateAverageByHalfHour(LineData lineData) {
+            seriesMap.put(entry.getKey(), aggregateAvgByHalfHour(entry.getValue()));
-        aggregateByHourOrHalfHour(lineData, new AvgCollector(), false);
         }
 
-    /* 公共聚合方法 */
+        // 2. today 作为 X 轴基准
-    private static <T> void aggregateByHourOrHalfHour(
+        HalfHourSeries today = seriesMap.get("today");
-            LineData lineData,
+        if (today == null) {
-            HalfHourCollector<T> collector,
+            throw new IllegalStateException("subData 必须包含 today");
-            boolean byHour
+        }
-    ) {
-        if (lineData == null) return;
 
-        List<String> xData = lineData.getXData();
+        // 3. 构建最终 X（yyyy-MM-dd HH:mm:00）
-        Map<String, List<Object>> yDataMap = lineData.getYData();
+        List<String> finalX = new ArrayList<>();
-        if (xData == null || xData.isEmpty() || yDataMap == null || yDataMap.isEmpty()) return;
+        for (String hm : today.xList) {
+            finalX.add(today.date + " " + hm + ":00");
+        }
 
-        Set<String> allSeriesKeys = yDataMap.keySet();
+        // 4. 构建临时 map，用 today.xList 对齐
+        Map<String, Map<String, Object>> tmpMap = new HashMap<>();
+        for (Map.Entry<String, HalfHourSeries> entry : seriesMap.entrySet()) {
+            tmpMap.put(entry.getKey(), entry.getValue().toMap());
+        }
 
-        Map<String, Map<String, T>> bucket = new TreeMap<>();
+        // 5. 写入 LineData
-        for (int i = 0; i < xData.size(); i++) {
+        lineData.setXData(finalX);
-            LocalDateTime time = parseTime(xData.get(i));
+        lineData.setYData(LineDataAligner.alignY(today.xList, tmpMap));
-            String key = byHour ? TimeAxisUtil.hourKey(time) : TimeAxisUtil.halfHourKey(time);
+        lineData.setAttrCode(accumulate.getAttrCode());
 
-            for (String series : allSeriesKeys) {
+        // 6. 补齐 48 半小时
-                Object yVal = safeGet(yDataMap.get(series), i);
+        fillTo48HalfHour(lineData);
-                if (yVal == null) continue;
+    }
 
-                bucket.computeIfAbsent(key, k -> new HashMap<>());
+    private static HalfHourSeries aggregateAvgByHalfHour(SubLineData.childLineData child) {
-                collector.collect(bucket.get(key), series, time, yVal);
+        if (child == null || child.getXData() == null || child.getYData() == null) {
+            return new HalfHourSeries(null);
         }
+
+        Map<String, List<Double>> bucket = new HashMap<>();
+        String date = null;
+
+        int size = Math.min(child.getXData().size(), child.getYData().size());
+
+        for (int i = 0; i < size; i++) {
+            Object x = child.getXData().get(i);
+            Object y = child.getYData().get(i);
+            if (x == null || y == null) continue;
+
+            LocalDateTime time;
+            try {
+                time = LocalDateTime.parse(x.toString(), TimeAxisUtil.DATETIME_FMT);
+            } catch (Exception e) {
+                continue;
             }
 
-        // 构建临时 Map 用于统一对齐
+            if (date == null) {
-        Map<String, Map<String, Object>> tmpMap = new HashMap<>();
+                date = time.toLocalDate().toString();
-        boolean isAvg = collector instanceof AvgCollector;
+            }
 
-        for (Map.Entry<String, Map<String, T>> entry : bucket.entrySet()) {
+            double num;
-            String xKey = entry.getKey();
+            try {
-            Map<String, T> seriesMap = entry.getValue();
+                num = Double.parseDouble(y.toString());
-            for (String series : allSeriesKeys) {
+            } catch (Exception e) {
-                Object val;
+                // 非数字直接丢
-                T tVal = seriesMap.get(series);
+                continue;
-                if (isAvg && tVal instanceof List) {
-                    List<Double> list = (List<Double>) tVal;
-                    val = list.stream().mapToDouble(Double::doubleValue).average().orElse(0);
-                } else if (!isAvg && tVal instanceof TimeValue) {
-                    val = ((TimeValue) tVal).value;
-                } else {
-                    val = tVal;
             }
-                tmpMap.computeIfAbsent(series, k -> new HashMap<>()).put(xKey, val);
+
+            String hm = TimeAxisUtil.alignToHalfHour(time.toLocalTime()); // HH:mm
+            bucket.computeIfAbsent(hm, k -> new ArrayList<>()).add(num);
         }
+
+        List<String> sortedHM = new ArrayList<>(bucket.keySet());
+        Collections.sort(sortedHM);
+
+        List<Object> values = new ArrayList<>();
+        for (String hm : sortedHM) {
+            List<Double> list = bucket.get(hm);
+            double avg = list.stream().mapToDouble(Double::doubleValue).average().orElse(0D);
+            values.add(avg);
         }
 
-        List<String> newX = new ArrayList<>(bucket.keySet());
+        return new HalfHourSeries(date, sortedHM, values);
-        lineData.setXData(newX);
-        lineData.setYData(LineDataAligner.alignY(newX, tmpMap));
     }
 
+
+
     /* ===============================
-     * AccumulateLineData -> LineData
+     * SubLineData -> LineData
      * 半小时取最后一条
      * =============================== */
-    public static void convertToLineDataHour(AccumulateLineData accumulate, LineData lineData) {
+    public static void convertToAccumulateLineData(SubLineData accumulate, LineData lineData) {
         if (accumulate == null || accumulate.getSubData() == null) return;
 
         Map<String, HalfHourSeries> seriesMap = new LinkedHashMap<>();
-        for (Map.Entry<String, AccumulateLineData.childLineData> entry : accumulate.getSubData().entrySet()) {
+        for (Map.Entry<String, SubLineData.childLineData> entry : accumulate.getSubData().entrySet()) {
             seriesMap.put(entry.getKey(), aggregateLastByHalfHour(entry.getValue()));
         }
 
@@ -250,7 +270,7 @@ public class LineDataAggregator {
         fillTo48HalfHour(lineData);
     }
 
-    private static HalfHourSeries aggregateLastByHalfHour(AccumulateLineData.childLineData child) {
+    private static HalfHourSeries aggregateLastByHalfHour(SubLineData.childLineData child) {
         if (child == null || child.getXData() == null || child.getYData() == null)
             return new HalfHourSeries(null);
 
@@ -307,19 +327,19 @@ public class LineDataAggregator {
     /* ===============================
      * 全量对齐
      * =============================== */
-    public static void convertToLineDataAll(AccumulateLineData accumulate, LineData lineData) {
+    public static void convertToLineDataAll(SubLineData accumulate, LineData lineData) {
         if (accumulate == null || accumulate.getSubData() == null) return;
 
         LinkedHashSet<String> xSet = new LinkedHashSet<>();
-        for (AccumulateLineData.childLineData child : accumulate.getSubData().values()) {
+        for (SubLineData.childLineData child : accumulate.getSubData().values()) {
             if (child.getXData() != null) xSet.addAll(child.getXData());
         }
         List<String> mergedX = new ArrayList<>(xSet);
 
         Map<String, Map<String, Object>> tmpMap = new LinkedHashMap<>();
-        for (Map.Entry<String, AccumulateLineData.childLineData> entry : accumulate.getSubData().entrySet()) {
+        for (Map.Entry<String, SubLineData.childLineData> entry : accumulate.getSubData().entrySet()) {
             Map<String, Object> map = new LinkedHashMap<>();
-            AccumulateLineData.childLineData child = entry.getValue();
+            SubLineData.childLineData child = entry.getValue();
             if (child.getXData() != null && child.getYData() != null) {
                 int size = Math.min(child.getXData().size(), child.getYData().size());
                 for (int i = 0; i < size; i++) map.put(child.getXData().get(i), child.getYData().get(i));

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DashboardNotificationCategoryServiceImpl.java

@@ -0,0 +1,269 @@
+package com.dongjian.dashboard.back.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.dongjian.dashboard.back.common.exception.MsgCodeException;
+import com.dongjian.dashboard.back.common.language.msg.MsgLanguageChange;
+import com.dongjian.dashboard.back.common.response.PageInfo;
+import com.dongjian.dashboard.back.common.response.ResponseCode;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
+import com.dongjian.dashboard.back.dao.ex.DashboardNotificationCategoryMapperExt;
+import com.dongjian.dashboard.back.dao.ex.DeviceInfoMapperExt;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DashboardNotificationCategorySearchParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DeleteDashboardNotificationCategoryParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.OptDashboardNotificationCategoryParams;
+import com.dongjian.dashboard.back.model.DashboardNotificationCategory;
+import com.dongjian.dashboard.back.model.DashboardNotificationCategoryExample;
+import com.dongjian.dashboard.back.service.DashboardNotificationCategoryService;
+import com.dongjian.dashboard.back.service.common.CommonOpt;
+import com.dongjian.dashboard.back.util.CommonUtil;
+import com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationCategoryPageVO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 
+ * @author jwy-style
+ *
+ */
+@Service
+public class DashboardNotificationCategoryServiceImpl implements DashboardNotificationCategoryService {
+	
+	private static Logger logger = LoggerFactory.getLogger(DashboardNotificationCategoryServiceImpl.class);
+	
+	
+	@Autowired
+	private CommonOpt commonOpt;
+	@Autowired
+	private MsgLanguageChange msgLanguageChange;
+	@Autowired
+	private DashboardNotificationCategoryMapperExt dashboardNotificationCategoryMapperExt;
+	@Autowired
+	private DeviceInfoMapperExt deviceInfoMapperExt;
+
+
+
+	/**
+	 * Adds a new dashboardNotificationCategory based on the provided parameters.
+	 * Validates company ownership, performs common verification, and inserts the dashboardNotificationCategory into the database.
+	 *
+	 * @param optDashboardNotificationCategoryParams Parameters for the new dashboardNotificationCategory to be added
+	 * @param userId          ID of the user performing the operation
+	 * @param companyId       ID of the company associated with the dashboardNotificationCategory
+	 * @param languageType    Language type for error messages
+	 * @return SimpleDataResponse indicating success or failure of the operation
+	 */
+	@Override
+	@Transactional
+	public SimpleDataResponse add(OptDashboardNotificationCategoryParams optDashboardNotificationCategoryParams, Long userId, Long companyId,
+			Integer languageType) {
+		try {
+			optDashboardNotificationCategoryParams.setCategoryId(null);
+			try {
+				// Validate company ownership to prevent unauthorized operations
+				if (ObjectUtils.isEmpty(optDashboardNotificationCategoryParams.getCompanyId())) {
+					optDashboardNotificationCategoryParams.setCompanyId(companyId);
+				} else {
+					checkCompany(optDashboardNotificationCategoryParams, languageType, companyId);
+				}
+
+				// Perform common verification for the dashboardNotificationCategory parameters
+				commonVerifyOpt(optDashboardNotificationCategoryParams, companyId, languageType);
+				
+			} catch (MsgCodeException e) {
+				return new SimpleDataResponse(ResponseCode.MSG_ERROR, e.getMessage());
+			}
+			
+			long currentUnix = System.currentTimeMillis();
+			DashboardNotificationCategory dashboardNotificationCategory = new DashboardNotificationCategory();
+			BeanUtils.copyProperties(optDashboardNotificationCategoryParams,dashboardNotificationCategory);
+			dashboardNotificationCategory.setId(null);
+			dashboardNotificationCategory.setCreatedAt(currentUnix);
+			dashboardNotificationCategory.setCreatedBy(userId);
+			dashboardNotificationCategoryMapperExt.insertSelective(dashboardNotificationCategory);
+
+			return SimpleDataResponse.success();
+		} catch (Exception e) {
+			logger.error("Error occurred while adding a new dashboardNotificationCategory", e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return new SimpleDataResponse(ResponseCode.SERVER_ERROR, "server error");
+		}
+	}
+
+	/**
+	 * Performs common verification operations on the dashboardNotificationCategory parameters.
+	 * Checks parameter validity and existence of the dashboardNotificationCategory name.
+	 *
+	 * @param optDashboardNotificationCategoryParams Parameters of the dashboardNotificationCategory to be verified
+	 * @param companyId       ID of the company associated with the dashboardNotificationCategory
+	 * @param languageType    Language type for error messages
+	 */
+	private void commonVerifyOpt(OptDashboardNotificationCategoryParams optDashboardNotificationCategoryParams, Long companyId, Integer languageType) {
+		checkParam(optDashboardNotificationCategoryParams, languageType);
+		checkExist(optDashboardNotificationCategoryParams, languageType);
+	}
+
+	private void checkExist(OptDashboardNotificationCategoryParams optDashboardNotificationCategoryParams, Integer languageType) {
+		if (dashboardNotificationCategoryMapperExt.checkExist(optDashboardNotificationCategoryParams) > 0) {
+			throw new MsgCodeException(msgLanguageChange.getParameterMapByCode(languageType, "categoryHasExisted"));
+		}
+	}
+
+	/**
+	 * Checks if the specified dashboardNotificationCategory's company ID matches the logged-in user's company or its subsidiary.
+	 * Throws a MsgCodeException if the company ID does not match.
+	 *
+	 * @param optDashboardNotificationCategoryParams Parameters of the dashboardNotificationCategory to be checked
+	 * @param languageType    Language type for error messages
+	 * @param companyId       ID of the company associated with the logged-in user
+	 * @throws MsgCodeException If the operation is not authorized for the given company
+	 */
+	private void checkCompany(OptDashboardNotificationCategoryParams optDashboardNotificationCategoryParams, Integer languageType, Long companyId) {
+		if (!commonOpt.isSubCompany(companyId, optDashboardNotificationCategoryParams.getCompanyId())) {
+			throw new MsgCodeException(msgLanguageChange.getParameterMapByCode(languageType, "noOperationAuth"));
+		}
+	}
+
+	/**
+	 * Checks the validity of the dashboardNotificationCategory name parameter.
+	 * Throws a MsgCodeException if the dashboardNotificationCategory name is blank or exceeds 100 characters.
+	 *
+	 * @param optDashboardNotificationCategoryParams Parameters of the dashboardNotificationCategory to be checked
+	 * @param languageType    Language type for error messages
+	 * @throws MsgCodeException If the dashboardNotificationCategory name parameter is invalid
+	 */
+	private void checkParam(OptDashboardNotificationCategoryParams optDashboardNotificationCategoryParams, Integer languageType) {
+		if(StringUtils.isBlank(optDashboardNotificationCategoryParams.getName()) || optDashboardNotificationCategoryParams.getName().length() > 255){
+			throw new MsgCodeException("Parameter error [name]");
+		}
+		if(StringUtils.isNotBlank(optDashboardNotificationCategoryParams.getRemark()) && optDashboardNotificationCategoryParams.getRemark().length() > 255){
+			throw new MsgCodeException("Parameter error [remark]");
+		}
+	}
+
+
+	/**
+	 * Updates an existing dashboardNotificationCategory with the provided parameters.
+	 * Performs validation checks on the dashboardNotificationCategory parameters and authorization.
+	 *
+	 * @param optDashboardNotificationCategoryParams Parameters of the dashboardNotificationCategory to be updated
+	 * @param userId           ID of the user performing the update
+	 * @param companyId        ID of the company associated with the dashboardNotificationCategory
+	 * @param languageType     Language type for error messages
+	 * @return SimpleDataResponse indicating success or failure of the update operation
+	 */
+	@Override
+	@Transactional
+	public SimpleDataResponse edit(OptDashboardNotificationCategoryParams optDashboardNotificationCategoryParams, Long userId, Long companyId,
+			Integer languageType) {
+		try {
+			DashboardNotificationCategory oldBP = dashboardNotificationCategoryMapperExt.selectByPrimaryKey(optDashboardNotificationCategoryParams.getCategoryId());
+			if (ObjectUtils.isEmpty(oldBP) || 1 == oldBP.getFlag()){
+				return new SimpleDataResponse(ResponseCode.MSG_ERROR, "Not found");
+			}
+			try {
+				List<Long> selfAndSubCompanyList = commonOpt.getSelfAndSubCompanyId(companyId);
+				if (!selfAndSubCompanyList.contains(oldBP.getCompanyId())){
+					throw new MsgCodeException(msgLanguageChange.getParameterMapByCode(languageType, "noOperationAuth"));
+				}
+				//
+				if (ObjectUtils.isEmpty(optDashboardNotificationCategoryParams.getCompanyId())) {
+					optDashboardNotificationCategoryParams.setCompanyId(oldBP.getCompanyId());
+				} else if(!selfAndSubCompanyList.contains(optDashboardNotificationCategoryParams.getCompanyId())){//设置的所属企业不属于自己权限企业
+					throw new MsgCodeException(msgLanguageChange.getParameterMapByCode(languageType, "noOperationAuth"));
+				}
+
+				commonVerifyOpt(optDashboardNotificationCategoryParams, companyId, languageType);
+				
+			} catch (MsgCodeException e) {
+				return new SimpleDataResponse(ResponseCode.MSG_ERROR, e.getMessage());
+			}
+			
+			DashboardNotificationCategory dashboardNotificationCategory = new DashboardNotificationCategory();
+			BeanUtils.copyProperties(optDashboardNotificationCategoryParams,dashboardNotificationCategory);
+			dashboardNotificationCategory.setUpdatedAt(System.currentTimeMillis());
+			dashboardNotificationCategory.setUpdatedBy(userId);
+			
+			DashboardNotificationCategoryExample example = new DashboardNotificationCategoryExample();
+			DashboardNotificationCategoryExample.Criteria criteria = example.createCriteria();
+			criteria.andIdEqualTo(optDashboardNotificationCategoryParams.getCategoryId());
+			
+			
+			dashboardNotificationCategoryMapperExt.updateByExampleSelective(dashboardNotificationCategory, example);
+
+			return SimpleDataResponse.success();
+		} catch (Exception e) {
+			logger.error("Edit dashboardNotificationCategory error", e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return new SimpleDataResponse(ResponseCode.SERVER_ERROR, "server error");
+		}
+	}
+
+
+	/**
+	 * Batch deletes dashboardNotificationCategorys based on the provided dashboardNotificationCategory IDs.
+	 * Performs validation checks on the dashboardNotificationCategory IDs and authorization.
+	 *
+	 * @param deleteDashboardNotificationCategoryParams Parameters containing dashboardNotificationCategory IDs to be deleted
+	 * @param userId             ID of the user performing the deletion
+	 * @param companyId          ID of the company associated with the dashboardNotificationCategorys
+	 * @param languageType       Language type for error messages
+	 * @return SimpleDataResponse indicating success or failure of the batch deletion operation
+	 */
+	@Override
+	@Transactional
+	public SimpleDataResponse batchDelete(DeleteDashboardNotificationCategoryParams deleteDashboardNotificationCategoryParams, Long userId,
+			Long companyId, Integer languageType) {
+		if (StringUtils.isBlank(deleteDashboardNotificationCategoryParams.getCategoryIds())) {
+			return SimpleDataResponse.success();
+		}
+		try {
+			List<Long> ids = Arrays.asList(StringUtils.split(deleteDashboardNotificationCategoryParams.getCategoryIds(), ",")).stream()
+					.map(id -> CommonUtil.String2Long(id.trim())).collect(Collectors.toList());
+
+
+			DashboardNotificationCategoryExample dashboardNotificationCategoryExample = new DashboardNotificationCategoryExample();
+			DashboardNotificationCategoryExample.Criteria criteria = dashboardNotificationCategoryExample.createCriteria();
+			criteria.andIdIn(ids).andCompanyIdIn(commonOpt.getSelfAndSubCompanyId(companyId));
+
+			DashboardNotificationCategory dashboardNotificationCategory = new DashboardNotificationCategory();
+			dashboardNotificationCategory.setFlag(1);
+			dashboardNotificationCategoryMapperExt.updateByExampleSelective(dashboardNotificationCategory, dashboardNotificationCategoryExample);
+
+			return SimpleDataResponse.success();
+		} catch (Exception e) {
+			logger.error("Batch delete dashboardNotificationCategory error", e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return new SimpleDataResponse(ResponseCode.SERVER_ERROR, "server error");
+		}
+	}
+
+
+	@Override
+	public PageInfo<DashboardNotificationCategoryPageVO> getListPage(DashboardNotificationCategorySearchParams pageSearchParam, Long companyId,
+			Long userId, Integer languageType, Integer uTCOffset) {
+		//list防${}注入
+		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {
+			pageSearchParam.setCompanyIdList(Arrays.asList(companyId));
+		} else {
+			pageSearchParam.setCompanyIdList(commonOpt.filterCompanyIds(companyId, pageSearchParam.getCompanyIds()));
+		}
+		if (StringUtils.isNotBlank(pageSearchParam.getCategoryIds())) {
+			pageSearchParam.setCategoryIdList(CommonUtil.commaStr2LongList(pageSearchParam.getCategoryIds()));
+		}
+		PageHelper.startPage(pageSearchParam.getPageNum() == null ? 1 : pageSearchParam.getPageNum(), pageSearchParam.getPageSize() == null ? 20 : pageSearchParam.getPageSize());
+		List<DashboardNotificationCategoryPageVO> resultList = dashboardNotificationCategoryMapperExt.getListPage(pageSearchParam);
+
+		return new PageInfo<>(resultList);
+	}
+}

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DashboardNotificationServiceImpl.java

@@ -0,0 +1,260 @@
+package com.dongjian.dashboard.back.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.dongjian.dashboard.back.common.exception.MsgCodeException;
+import com.dongjian.dashboard.back.common.language.msg.MsgLanguageChange;
+import com.dongjian.dashboard.back.common.response.PageInfo;
+import com.dongjian.dashboard.back.common.response.ResponseCode;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
+import com.dongjian.dashboard.back.dao.ex.DashboardNotificationMapperExt;
+import com.dongjian.dashboard.back.dao.ex.DeviceInfoMapperExt;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DashboardNotificationSearchParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.DeleteDashboardNotificationParams;
+import com.dongjian.dashboard.back.dto.dashboardnotification.OptDashboardNotificationParams;
+import com.dongjian.dashboard.back.model.DashboardNotification;
+import com.dongjian.dashboard.back.model.DashboardNotificationExample;
+import com.dongjian.dashboard.back.service.DashboardNotificationService;
+import com.dongjian.dashboard.back.service.common.CommonOpt;
+import com.dongjian.dashboard.back.util.CommonUtil;
+import com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationPageVO;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 
+ * @author jwy-style
+ *
+ */
+@Service
+public class DashboardNotificationServiceImpl implements DashboardNotificationService {
+	
+	private static Logger logger = LoggerFactory.getLogger(DashboardNotificationServiceImpl.class);
+	
+	
+	@Autowired
+	private CommonOpt commonOpt;
+	@Autowired
+	private MsgLanguageChange msgLanguageChange;
+	@Autowired
+	private DashboardNotificationMapperExt dashboardNotificationMapperExt;
+
+
+
+	/**
+	 * Adds a new dashboardNotification based on the provided parameters.
+	 * Validates company ownership, performs common verification, and inserts the dashboardNotification into the database.
+	 *
+	 * @param optDashboardNotificationParams Parameters for the new dashboardNotification to be added
+	 * @param userId          ID of the user performing the operation
+	 * @param companyId       ID of the company associated with the dashboardNotification
+	 * @param languageType    Language type for error messages
+	 * @return SimpleDataResponse indicating success or failure of the operation
+	 */
+	@Override
+	@Transactional
+	public SimpleDataResponse add(OptDashboardNotificationParams optDashboardNotificationParams, Long userId, Long companyId,
+			Integer languageType) {
+		try {
+			optDashboardNotificationParams.setDashboardNotificationId(null);
+			try {
+				// Validate company ownership to prevent unauthorized operations
+				if (ObjectUtils.isEmpty(optDashboardNotificationParams.getCompanyId())) {
+					optDashboardNotificationParams.setCompanyId(companyId);
+				} else {
+					checkCompany(optDashboardNotificationParams, languageType, companyId);
+				}
+
+				// Perform common verification for the dashboardNotification parameters
+				commonVerifyOpt(optDashboardNotificationParams, companyId, languageType);
+				
+			} catch (MsgCodeException e) {
+				return new SimpleDataResponse(ResponseCode.MSG_ERROR, e.getMessage());
+			}
+			
+			long currentUnix = System.currentTimeMillis();
+			DashboardNotification dashboardNotification = new DashboardNotification();
+			BeanUtils.copyProperties(optDashboardNotificationParams,dashboardNotification);
+			dashboardNotification.setId(null);
+			dashboardNotification.setCreatedAt(currentUnix);
+			dashboardNotification.setCreatedBy(userId);
+			dashboardNotificationMapperExt.insertSelective(dashboardNotification);
+
+			return SimpleDataResponse.success();
+		} catch (Exception e) {
+			logger.error("Error occurred while adding a new dashboardNotification", e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return new SimpleDataResponse(ResponseCode.SERVER_ERROR, "server error");
+		}
+	}
+
+	/**
+	 * Performs common verification operations on the dashboardNotification parameters.
+	 * Checks parameter validity and existence of the dashboardNotification name.
+	 *
+	 * @param optDashboardNotificationParams Parameters of the dashboardNotification to be verified
+	 * @param companyId       ID of the company associated with the dashboardNotification
+	 * @param languageType    Language type for error messages
+	 */
+	private void commonVerifyOpt(OptDashboardNotificationParams optDashboardNotificationParams, Long companyId, Integer languageType) {
+		checkParam(optDashboardNotificationParams, languageType);
+	}
+
+	/**
+	 * Checks if the specified dashboardNotification's company ID matches the logged-in user's company or its subsidiary.
+	 * Throws a MsgCodeException if the company ID does not match.
+	 *
+	 * @param optDashboardNotificationParams Parameters of the dashboardNotification to be checked
+	 * @param languageType    Language type for error messages
+	 * @param companyId       ID of the company associated with the logged-in user
+	 * @throws MsgCodeException If the operation is not authorized for the given company
+	 */
+	private void checkCompany(OptDashboardNotificationParams optDashboardNotificationParams, Integer languageType, Long companyId) {
+		if (!commonOpt.isSubCompany(companyId, optDashboardNotificationParams.getCompanyId())) {
+			throw new MsgCodeException(msgLanguageChange.getParameterMapByCode(languageType, "noOperationAuth"));
+		}
+	}
+
+	/**
+	 * Checks the validity of the dashboardNotification name parameter.
+	 * Throws a MsgCodeException if the dashboardNotification name is blank or exceeds 100 characters.
+	 *
+	 * @param optDashboardNotificationParams Parameters of the dashboardNotification to be checked
+	 * @param languageType    Language type for error messages
+	 * @throws MsgCodeException If the dashboardNotification name parameter is invalid
+	 */
+	private void checkParam(OptDashboardNotificationParams optDashboardNotificationParams, Integer languageType) {
+		if(StringUtils.isNotBlank(optDashboardNotificationParams.getDemandTime()) && optDashboardNotificationParams.getDemandTime().length() > 100){
+			throw new MsgCodeException("Parameter error [demandTime]");
+		}
+		if(null == optDashboardNotificationParams.getCategoryId()){
+			throw new MsgCodeException("Parameter error [categoryId]");
+		}
+	}
+
+
+	/**
+	 * Updates an existing dashboardNotification with the provided parameters.
+	 * Performs validation checks on the dashboardNotification parameters and authorization.
+	 *
+	 * @param optDashboardNotificationParams Parameters of the dashboardNotification to be updated
+	 * @param userId           ID of the user performing the update
+	 * @param companyId        ID of the company associated with the dashboardNotification
+	 * @param languageType     Language type for error messages
+	 * @return SimpleDataResponse indicating success or failure of the update operation
+	 */
+	@Override
+	@Transactional
+	public SimpleDataResponse edit(OptDashboardNotificationParams optDashboardNotificationParams, Long userId, Long companyId,
+			Integer languageType) {
+		try {
+			DashboardNotification oldBP = dashboardNotificationMapperExt.selectByPrimaryKey(optDashboardNotificationParams.getDashboardNotificationId());
+			if (ObjectUtils.isEmpty(oldBP) || 1 == oldBP.getFlag()){
+				return new SimpleDataResponse(ResponseCode.MSG_ERROR, "Not found");
+			}
+			try {
+				List<Long> selfAndSubCompanyList = commonOpt.getSelfAndSubCompanyId(companyId);
+				if (!selfAndSubCompanyList.contains(oldBP.getCompanyId())){
+					throw new MsgCodeException(msgLanguageChange.getParameterMapByCode(languageType, "noOperationAuth"));
+				}
+				//
+				if (ObjectUtils.isEmpty(optDashboardNotificationParams.getCompanyId())) {
+					optDashboardNotificationParams.setCompanyId(oldBP.getCompanyId());
+				} else if(!selfAndSubCompanyList.contains(optDashboardNotificationParams.getCompanyId())){//设置的所属企业不属于自己权限企业
+					throw new MsgCodeException(msgLanguageChange.getParameterMapByCode(languageType, "noOperationAuth"));
+				}
+
+				commonVerifyOpt(optDashboardNotificationParams, companyId, languageType);
+				
+			} catch (MsgCodeException e) {
+				return new SimpleDataResponse(ResponseCode.MSG_ERROR, e.getMessage());
+			}
+			
+			DashboardNotification dashboardNotification = new DashboardNotification();
+			BeanUtils.copyProperties(optDashboardNotificationParams,dashboardNotification);
+			dashboardNotification.setUpdatedAt(System.currentTimeMillis());
+			dashboardNotification.setUpdatedBy(userId);
+			
+			DashboardNotificationExample example = new DashboardNotificationExample();
+			DashboardNotificationExample.Criteria criteria = example.createCriteria();
+			criteria.andIdEqualTo(optDashboardNotificationParams.getDashboardNotificationId());
+			
+			
+			dashboardNotificationMapperExt.updateByExampleSelective(dashboardNotification, example);
+
+			return SimpleDataResponse.success();
+		} catch (Exception e) {
+			logger.error("Edit dashboardNotification error", e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return new SimpleDataResponse(ResponseCode.SERVER_ERROR, "server error");
+		}
+	}
+
+
+	/**
+	 * Batch deletes dashboardNotifications based on the provided dashboardNotification IDs.
+	 * Performs validation checks on the dashboardNotification IDs and authorization.
+	 *
+	 * @param deleteDashboardNotificationParams Parameters containing dashboardNotification IDs to be deleted
+	 * @param userId             ID of the user performing the deletion
+	 * @param companyId          ID of the company associated with the dashboardNotifications
+	 * @param languageType       Language type for error messages
+	 * @return SimpleDataResponse indicating success or failure of the batch deletion operation
+	 */
+	@Override
+	@Transactional
+	public SimpleDataResponse batchDelete(DeleteDashboardNotificationParams deleteDashboardNotificationParams, Long userId,
+			Long companyId, Integer languageType) {
+		if (StringUtils.isBlank(deleteDashboardNotificationParams.getDashboardNotificationIds())) {
+			return SimpleDataResponse.success();
+		}
+		try {
+			List<Long> ids = Arrays.asList(StringUtils.split(deleteDashboardNotificationParams.getDashboardNotificationIds(), ",")).stream()
+					.map(id -> CommonUtil.String2Long(id.trim())).collect(Collectors.toList());
+
+
+			DashboardNotificationExample dashboardNotificationExample = new DashboardNotificationExample();
+			DashboardNotificationExample.Criteria criteria = dashboardNotificationExample.createCriteria();
+			criteria.andIdIn(ids).andCompanyIdIn(commonOpt.getSelfAndSubCompanyId(companyId));
+
+			DashboardNotification dashboardNotification = new DashboardNotification();
+			dashboardNotification.setFlag(1);
+			dashboardNotificationMapperExt.updateByExampleSelective(dashboardNotification, dashboardNotificationExample);
+
+			return SimpleDataResponse.success();
+		} catch (Exception e) {
+			logger.error("Batch delete dashboardNotification error", e);
+			TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+			return new SimpleDataResponse(ResponseCode.SERVER_ERROR, "server error");
+		}
+	}
+
+
+	@Override
+	public PageInfo<DashboardNotificationPageVO> getListPage(DashboardNotificationSearchParams pageSearchParam, Long companyId,
+			Long userId, Integer languageType, Integer uTCOffset) {
+		//list防${}注入
+		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {
+			pageSearchParam.setCompanyIdList(Arrays.asList(companyId));
+		} else {
+			pageSearchParam.setCompanyIdList(commonOpt.filterCompanyIds(companyId, pageSearchParam.getCompanyIds()));
+		}
+		if (StringUtils.isNotBlank(pageSearchParam.getDashboardNotificationIds())) {
+			pageSearchParam.setDashboardNotificationIdList(CommonUtil.commaStr2LongList(pageSearchParam.getDashboardNotificationIds()));
+		}
+		PageHelper.startPage(pageSearchParam.getPageNum() == null ? 1 : pageSearchParam.getPageNum(), pageSearchParam.getPageSize() == null ? 20 : pageSearchParam.getPageSize());
+		List<DashboardNotificationPageVO> resultList = dashboardNotificationMapperExt.getListPage(pageSearchParam);
+
+		return new PageInfo<>(resultList);
+	}
+}

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAccumulateServiceImpl.java

@@ -64,9 +64,9 @@ public class DeviceDataAccumulateServiceImpl implements DeviceDataAccumulateServ
 
 	@Override
 	public PageInfo<DeviceAccumulateData> getDataList(AccumulateDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) {
-		if (null == pageSearchParam.getBuildingId()) {
+//		if (null == pageSearchParam.getBuildingId()) {
-			return new PageInfo<>(new ArrayList<>());
+//			return new PageInfo<>(new ArrayList<>());
-		}
+//		}
 
 		//list防${}注入
 		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {
@@ -138,7 +138,7 @@ public class DeviceDataAccumulateServiceImpl implements DeviceDataAccumulateServ
 				}
 			}
 
-			LocalDateTime now = LocalDateTime.now(ZoneId.of("Asia/Tokyo"));
+			LocalDateTime now = LocalDateTime.now(Constants.ZONE_TOKYO);
 			LocalDate today = now.toLocalDate();
 			LocalDate yesterday = today.minusDays(1);
 			LocalDate lastYear = DateUtil.getLastYearSameIsoWeekDay(today);

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataAlarmServiceImpl.java

@@ -61,9 +61,9 @@ public class DeviceDataAlarmServiceImpl implements DeviceDataAlarmService {
 
 	@Override
 	public PageInfo<DeviceAlarmData> getDataList(AlarmDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) {
-		if (null == pageSearchParam.getBuildingId()) {
+//		if (null == pageSearchParam.getBuildingId()) {
-			return new PageInfo<>(new ArrayList<>());
+//			return new PageInfo<>(new ArrayList<>());
-		}
+//		}
 
 		//list防${}注入
 		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {
@@ -108,17 +108,40 @@ public class DeviceDataAlarmServiceImpl implements DeviceDataAlarmService {
 				} else {
 					data.setCollected(0);
 				}
+				if (null != data.getAlertLevel()) {
 					data.setAlertLevelStr(msgLanguageChange.getParameterMapByCode(languageType, "alertLevel_" + data.getAlertLevel()));
+				}
+				if (null != data.getConfirmStatus()) {
 					data.setConfirmStatusStr(msgLanguageChange.getParameterMapByCode(languageType, "confirmStatus_" + data.getConfirmStatus()));
+				}
+				if (null != data.getHandleStatus()) {
 					data.setHandleStatusStr(msgLanguageChange.getParameterMapByCode(languageType, "handleStatus_" + data.getHandleStatus()));
+				}
+				if (null != data.getUploadTimestamp()) {
 					data.setElapsedTime(currentTs - data.getUploadTimestamp());
 					data.setElapsedTimeStr(commonOpt.formatElapsedTime(data.getElapsedTime(), languageType));
 				}
+				data.setInAlarm(isInAlarm(data.getHandleStatus(), data.getRetainAlert()) ? 1 : 0);
+			}
 		}
 
 		return resultList;
 	}
 
+	public static boolean isInAlarm(Integer handleStatus, Integer retainAlert) {
+		if (handleStatus == null) {
+			return false;
+		}
+
+		// (handle_status != 3 AND handle_status != 4)
+		if (handleStatus != 3 && handleStatus != 4) {
+			return true;
+		}
+
+		// (handle_status = 4 AND retain_alert = 1)
+		return handleStatus == 4 && Integer.valueOf(1).equals(retainAlert);
+	}
+
 	@Override
 	@Transactional
 	public SimpleDataResponse handleAlarm(HandleAlarmParams handleAlarmParams, Long userId, Long companyId, Integer languageType) {

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java

@@ -1,22 +1,28 @@
 package com.dongjian.dashboard.back.service.impl;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.dongjian.dashboard.back.bo.LatestValueBO;
 import com.dongjian.dashboard.back.common.Constants;
 import com.dongjian.dashboard.back.common.language.msg.MsgLanguageChange;
 import com.dongjian.dashboard.back.common.response.PageInfo;
+import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
+import com.dongjian.dashboard.back.dao.ex.BaStatusHistoryMapperExt;
 import com.dongjian.dashboard.back.dao.ex.DeviceInfoMapperExt;
 import com.dongjian.dashboard.back.dao.ex.DeviceRawdataRealtimeMapperExt;
 import com.dongjian.dashboard.back.dao.ex.FavoritedDeviceMapperExt;
 import com.dongjian.dashboard.back.dto.data.BaStatusDataSearchParam;
+import com.dongjian.dashboard.back.dto.device.LineDataSearchParams;
 import com.dongjian.dashboard.back.easyexcel.SecondsToHMSConverter;
-import com.dongjian.dashboard.back.model.DeviceInfo;
+import com.dongjian.dashboard.back.model.*;
-import com.dongjian.dashboard.back.model.DeviceInfoExample;
-import com.dongjian.dashboard.back.model.DeviceRawdataRealtime;
-import com.dongjian.dashboard.back.model.DeviceRawdataRealtimeExample;
 import com.dongjian.dashboard.back.service.DeviceDataBaStatusService;
 import com.dongjian.dashboard.back.service.common.CommonOpt;
+import com.dongjian.dashboard.back.util.DateUtil;
+import com.dongjian.dashboard.back.util.redis.RedisUtil;
 import com.dongjian.dashboard.back.vo.data.DeviceAccumulateData;
 import com.dongjian.dashboard.back.vo.data.DeviceBaStatusData;
 import com.dongjian.dashboard.back.vo.data.DeviceMeasureData;
+import com.dongjian.dashboard.back.vo.device.LineData;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
@@ -30,6 +36,8 @@ import org.springframework.stereotype.Service;
 
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
+import java.time.*;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -49,20 +57,24 @@ public class DeviceDataBaStatusServiceImpl implements DeviceDataBaStatusService
 	@Autowired
 	private FavoritedDeviceMapperExt favoritedDeviceMapperExt;
 	@Autowired
+	private BaStatusHistoryMapperExt baStatusHistoryMapperExt;
+	@Autowired
 	private DeviceRawdataRealtimeMapperExt deviceRawdataRealtimeMapperExt;
     @Autowired
     private MsgLanguageChange msgLanguageChange;
 	@Autowired
 	private CommonOpt commonOpt;
+	@Autowired
+	private RedisUtil redisUtil;
 
 
 
 
 	@Override
 	public PageInfo<DeviceBaStatusData> getDataList(BaStatusDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) {
-		if (null == pageSearchParam.getBuildingId()) {
+//		if (null == pageSearchParam.getBuildingId()) {
-			return new PageInfo<>(new ArrayList<>());
+//			return new PageInfo<>(new ArrayList<>());
-		}
+//		}
 
 		//list防${}注入
 		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {
@@ -160,6 +172,7 @@ public class DeviceDataBaStatusServiceImpl implements DeviceDataBaStatusService
 					data.setStopRun(commonOpt.judgeStopRun(objectMapper, realtime85Map.get(deviceId)));
 				}
 
+				if (null != data.getStopRun()) {
 					if (0 == data.getStopRun()) {
 						data.setContinuousRunningTimeStr(SecondsToHMSConverter.covertSeconds(data.getContinuousRunningTime()));
 					} else if (StringUtils.isNotBlank(data.getLatestTs()) && currentTs >= Long.parseLong(data.getLatestTs())) {
@@ -168,8 +181,94 @@ public class DeviceDataBaStatusServiceImpl implements DeviceDataBaStatusService
 					}
 				}
 			}
+		}
 
 		return resultList;
 	}
 
+	@Override
+	public SimpleDataResponse<List<LineData>> getLineData(Integer searchType, LineDataSearchParams lineDataSearchParams, Long companyId, Long userId, Integer languageType) {
+		List<LineData> lineDataList = new ArrayList<>();
+
+		LineData lineData = new LineData();
+		lineData.setAttrCode(lineDataSearchParams.getAttrCodeList()[0]);
+
+		List<Object> yCommon = new ArrayList<>();
+
+		//** 获取昨日最新数据 **//
+		String redisKey = Constants.REDIS_BA_STATUS_LATEST_VALUE + DateUtil.getYesterdayInJapan();
+		Object cacheLastValue = redisUtil.HGet(redisKey, lineDataSearchParams.getDeviceId().toLowerCase());
+		if (null != cacheLastValue) {
+            try {
+				String value = cacheLastValue.toString();
+				// 如果是被双引号包住的 JSON（双层 JSON）
+				if (value.startsWith("\"")) {
+					value = objectMapper.readValue(value, String.class);
+				}
+				LatestValueBO latestValueBO = objectMapper.readValue(value, LatestValueBO.class);
+				String dateFormatted = Instant.ofEpochMilli(latestValueBO.getUpdateTs())
+						.atZone(Constants.ZONE_TOKYO)
+						.format(Constants.FORMATTER_YMDHMS);
+				lineData.getXData().add(dateFormatted);
+				yCommon.add(latestValueBO.getValue());
+            } catch (JsonProcessingException e) {
+                logger.error("LatestValueBO error", e);
+            }
+        }
+
+		DeviceInfoExample devExample = new DeviceInfoExample();
+		devExample.createCriteria()
+				.andCompanyIdEqualTo(companyId)
+				.andDeviceIdEqualTo(lineDataSearchParams.getDeviceId());
+		List<DeviceInfo> deviceInfoList = deviceInfoMapperExt.selectByExample(devExample);
+		if (CollectionUtils.isEmpty(deviceInfoList)) {
+			return SimpleDataResponse.success(lineDataList);
+		}
+
+		DeviceInfo deviceInfo = deviceInfoList.get(0);
+
+		// 今天 00:00:00.000
+		LocalDate today = LocalDate.now();
+		long startOfDay = today
+				.atStartOfDay(ZoneId.systemDefault())
+				.toInstant()
+				.toEpochMilli();
+		String startTs = String.valueOf(startOfDay);
+
+		BaStatusHistoryExample bshExample = new BaStatusHistoryExample();
+		BaStatusHistoryExample.Criteria criteria = bshExample.createCriteria();
+		criteria.andUpdateTsGreaterThanOrEqualTo(startTs).andDeviceInfoIdEqualTo(deviceInfo.getId());
+
+		List<BaStatusHistory> result = baStatusHistoryMapperExt.selectByExample(bshExample);
+		if (CollectionUtils.isNotEmpty(result)) {
+			for (BaStatusHistory item : result) {
+				String tsStr = item.getUpdateTs();
+				if (tsStr == null || tsStr.isEmpty()) {
+					continue; // 跳过
+				}
+
+				long ts;
+				try {
+					ts = Long.parseLong(tsStr);
+				} catch (NumberFormatException e) {
+					logger.error("Invalid timestamp: {}", tsStr);
+					continue; // 非法时间戳跳过
+				}
+
+				// 毫秒 -> 日本时间 -> 格式化
+				String formatted = Instant.ofEpochMilli(ts)
+						.atZone(Constants.ZONE_TOKYO)
+						.format(Constants.FORMATTER_YMDHMS);
+
+				lineData.getXData().add(formatted);
+				yCommon.add(item.getIsRunning());
+			}
+		}
+
+		lineData.getYData().put("common", yCommon);
+		lineDataList.add(lineData);
+
+		return SimpleDataResponse.success(lineDataList);
+	}
+
 }

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataMeasureServiceImpl.java

@@ -75,9 +75,9 @@ public class DeviceDataMeasureServiceImpl implements DeviceDataMeasureService {
 
 	@Override
 	public PageInfo<DeviceMeasureData> getDataList(MeasureDataSearchParam pageSearchParam, Long companyId, Long userId, Integer languageType) {
-		if (null == pageSearchParam.getBuildingId()) {
+//		if (null == pageSearchParam.getBuildingId()) {
-			return new PageInfo<>(new ArrayList<>());
+//			return new PageInfo<>(new ArrayList<>());
-		}
+//		}
 
 		//list防${}注入
 		if (StringUtils.isBlank(pageSearchParam.getCompanyIds())) {
@@ -148,7 +148,7 @@ public class DeviceDataMeasureServiceImpl implements DeviceDataMeasureService {
 				}
 			}
 
-			ZoneId tokyoZone = ZoneId.of("Asia/Tokyo");
+			ZoneId tokyoZone = Constants.ZONE_TOKYO;
 			LocalDate tokyoToday = LocalDate.now(tokyoZone);
 			int year = tokyoToday.getYear();
 			int month = tokyoToday.getMonthValue();

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/FavoritedDeviceServiceImpl.java

@@ -7,19 +7,19 @@ import com.dongjian.dashboard.back.common.response.ResponseCode;
 import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
 import com.dongjian.dashboard.back.dao.ex.FavoritedDeviceMapperExt;
 import com.dongjian.dashboard.back.dto.data.AccumulateDataSearchParam;
+import com.dongjian.dashboard.back.dto.data.AlarmDataSearchParam;
 import com.dongjian.dashboard.back.dto.data.BaStatusDataSearchParam;
 import com.dongjian.dashboard.back.dto.data.MeasureDataSearchParam;
 import com.dongjian.dashboard.back.dto.device.FavoritedDeviceSearchParams;
 import com.dongjian.dashboard.back.dto.device.OptFavoritedDeviceParams;
-import com.dongjian.dashboard.back.service.DeviceDataAccumulateService;
+import com.dongjian.dashboard.back.service.*;
-import com.dongjian.dashboard.back.service.DeviceDataBaStatusService;
-import com.dongjian.dashboard.back.service.DeviceDataMeasureService;
-import com.dongjian.dashboard.back.service.FavoritedDeviceService;
 import com.dongjian.dashboard.back.service.common.CommonOpt;
 import com.dongjian.dashboard.back.vo.data.DeviceAccumulateData;
+import com.dongjian.dashboard.back.vo.data.DeviceAlarmData;
 import com.dongjian.dashboard.back.vo.data.DeviceBaStatusData;
 import com.dongjian.dashboard.back.vo.data.DeviceMeasureData;
 import com.dongjian.dashboard.back.vo.device.FavoritedDeviceVO;
+import com.github.pagehelper.PageHelper;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -52,6 +52,8 @@ public class FavoritedDeviceServiceImpl implements FavoritedDeviceService {
 	DeviceDataBaStatusService deviceDataBaStatusService;
 	@Autowired
 	DeviceDataMeasureService deviceDataMeasureService;
+	@Autowired
+	DeviceDataAlarmService deviceDataAlarmService;
 
 
 	@Override
@@ -64,8 +66,11 @@ public class FavoritedDeviceServiceImpl implements FavoritedDeviceService {
 		}
 		if (null != pageSearchParam.getClassId()){
 			pageSearchParam.setCategoryIdList(Constants.CATEGORY_MAP.get(pageSearchParam.getClassId()));
+		} else {
+			pageSearchParam.setCategoryIdList(Constants.ALL_CATEGORY_IDS);
  		}
 
+		PageHelper.startPage(pageSearchParam.getPageNum() == null ? 1 : pageSearchParam.getPageNum(), pageSearchParam.getPageSize() == null ? 20 : pageSearchParam.getPageSize());
 		List<FavoritedDeviceVO> favoritedDeviceVOList = favoritedDeviceMapperExt.getListPage(pageSearchParam);
 
 		List<Object> resultList = new ArrayList<>();
@@ -77,6 +82,7 @@ public class FavoritedDeviceServiceImpl implements FavoritedDeviceService {
 		List<String> accumulateDeviceIds = new ArrayList<>();
 		List<String> measureDeviceIds = new ArrayList<>();
 		List<String> statusDeviceIds = new ArrayList<>();
+		List<String> alarmDeviceIds = new ArrayList<>();
 
 		for (FavoritedDeviceVO vo : favoritedDeviceVOList) {
 			Long categoryId = vo.getCategoryId();
@@ -86,6 +92,8 @@ public class FavoritedDeviceServiceImpl implements FavoritedDeviceService {
 				measureDeviceIds.add(vo.getDeviceId());
 			} else if (Constants.CATEGORY_MAP.get(Constants.CATEGORY_STATUS).contains(categoryId)) {
 				statusDeviceIds.add(vo.getDeviceId());
+			} else if (Constants.CATEGORY_MAP.get(Constants.CATEGORY_ALARM).contains(categoryId)) {
+				alarmDeviceIds.add(vo.getDeviceId());
 			}
 		}
 
@@ -93,6 +101,7 @@ public class FavoritedDeviceServiceImpl implements FavoritedDeviceService {
 		Map<String, DeviceAccumulateData> accumulateDataMap = buildAccumulateDataMap(companyId, accumulateDeviceIds);
 		Map<String, DeviceMeasureData> measureDataMap = buildMeasureDataMap(companyId, measureDeviceIds);
 		Map<String, DeviceBaStatusData> statusDataMap = buildStatusDataMap(companyId, statusDeviceIds);
+		Map<String, DeviceAlarmData> alarmDataMap = buildAlarmDataMap(companyId, languageType, alarmDeviceIds);
 
 		// 按收藏顺序生成结果
 		for (FavoritedDeviceVO vo : favoritedDeviceVOList) {
@@ -106,14 +115,39 @@ public class FavoritedDeviceServiceImpl implements FavoritedDeviceService {
 				data = measureDataMap.get(deviceId);
 			} else if (Constants.CATEGORY_MAP.get(Constants.CATEGORY_STATUS).contains(categoryId)) {
 				data = statusDataMap.get(deviceId);
+			} else if (Constants.CATEGORY_MAP.get(Constants.CATEGORY_ALARM).contains(categoryId)) {
+				data = alarmDataMap.get(deviceId);
 			}
 
-			if (data != null) {
+			if (data == null) {
+				data = vo; // 保留原 VO，避免返回条数不足
+			}
 			resultList.add(data);
 		}
+
+		// -------------------- 保留 PageHelper 分页信息 --------------------
+		PageInfo<FavoritedDeviceVO> pageInfo = new PageInfo<>(favoritedDeviceVOList);
+		PageInfo<Object> resultPageInfo = new PageInfo<>();
+		resultPageInfo.setList(resultList);
+		resultPageInfo.setPageNum(pageInfo.getPageNum());
+		resultPageInfo.setPageSize(pageInfo.getPageSize());
+		resultPageInfo.setTotal(pageInfo.getTotal());
+		resultPageInfo.setPages(pageInfo.getPages());
+		resultPageInfo.setHasNextPage(pageInfo.isHasNextPage());
+		resultPageInfo.setHasPreviousPage(pageInfo.isHasPreviousPage());
+
+		return resultPageInfo;
 	}
 
-		return new PageInfo<>(resultList);
+	private Map<String, DeviceAlarmData> buildAlarmDataMap(Long companyId, Integer languageType, List<String> deviceIds) {
+		if (CollectionUtils.isEmpty(deviceIds)) return Collections.emptyMap();
+
+		AlarmDataSearchParam param = new AlarmDataSearchParam();
+		param.setDeviceIdList(deviceIds);
+		param.setCompanyIdList(List.of(companyId));
+		param.setSearchType(4);
+		return deviceDataAlarmService.handleDeviceAlarmData(languageType, param).stream()
+				.collect(Collectors.toMap(DeviceAlarmData::getDeviceId, Function.identity(), (existing, replacement) -> replacement));
 	}
 
 	private Map<String, DeviceAccumulateData> buildAccumulateDataMap(Long companyId, List<String> deviceIds) {

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/OverviewServiceImpl.java

@@ -1,18 +1,19 @@
 package com.dongjian.dashboard.back.service.impl;
 
 import com.dongjian.dashboard.back.common.Constants;
-import com.dongjian.dashboard.back.common.language.msg.MsgLanguageChange;
 import com.dongjian.dashboard.back.common.response.ResponseCode;
 import com.dongjian.dashboard.back.common.response.SimpleDataResponse;
 import com.dongjian.dashboard.back.dao.ex.DashboardNotificationMapperExt;
-import com.dongjian.dashboard.back.dao.ex.DeviceRawdataRealtimeMapperExt;
+import com.dongjian.dashboard.back.dao.ex.MonitoringPointCategoryMapperExt;
-import com.dongjian.dashboard.back.model.DashboardNotification;
+import com.dongjian.dashboard.back.dao.ex.OverviewInfoMapperExt;
-import com.dongjian.dashboard.back.model.DashboardNotificationExample;
+import com.dongjian.dashboard.back.dto.monitoringpointcategory.MonitoringPointCategorySearchParams;
 import com.dongjian.dashboard.back.service.OverviewService;
 import com.dongjian.dashboard.back.service.common.CommonOpt;
 import com.dongjian.dashboard.back.vo.dashboardnotification.DashboardNotificationPageVO;
+import com.dongjian.dashboard.back.vo.data.OverviewCategoryVO;
 import com.dongjian.dashboard.back.vo.data.OverviewInfo;
 import com.dongjian.dashboard.back.vo.data.OverviewVO;
+import com.dongjian.dashboard.back.vo.monitoringpointcategory.MonitoringPointCategoryPageVO;
 import com.dongjian.dashboard.back.weather.JpMeshHourlyForecasts;
 import com.dongjian.dashboard.back.weather.QueryWeather;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -47,11 +48,11 @@ public class OverviewServiceImpl implements OverviewService {
 
 
 	@Autowired
-	private DeviceRawdataRealtimeMapperExt deviceRawdataRealtimeMapperExt;
+	private OverviewInfoMapperExt overviewInfoMapperExt;
 	@Autowired
 	private DashboardNotificationMapperExt dashboardNotificationMapperExt;
 	@Autowired
-    private MsgLanguageChange msgLanguageChange;
+	private MonitoringPointCategoryMapperExt monitoringPointCategoryMapperExt;
 	@Autowired
 	private CommonOpt commonOpt;
 
@@ -61,21 +62,78 @@ public class OverviewServiceImpl implements OverviewService {
 		buildingMap.put("companyId", companyId);
 		buildingMap.put("bindBuildingIdList", commonOpt.getBindBuildingIdList(userId));
 
-		List<OverviewVO> buildingInfoList = deviceRawdataRealtimeMapperExt.getBuildingInfo(buildingMap);
+		List<OverviewVO> buildingInfoList = overviewInfoMapperExt.getBuildingInfo(buildingMap);
 
 		if (CollectionUtils.isNotEmpty(buildingInfoList)){
 			Map<String, Object> paramMap = new HashMap<>();
 			paramMap.put("companyId", companyId);
 			paramMap.put("categoryIdList", Constants.CATEGORY_MAP.get(Constants.CATEGORY_ALARM));
-			List<OverviewInfo> alarmInfoList = deviceRawdataRealtimeMapperExt.getOverviewInfo(paramMap);
+			List<OverviewInfo> alarmInfoList = overviewInfoMapperExt.getOverviewInfo(paramMap);
 			List<OverviewVO> overviewVOList = convert(alarmInfoList, utcOffset);
 
 			mergeOverviewList(buildingInfoList, overviewVOList);
+
+			// 查找楼宇没有的监测点分类
+			Map<Long, List<Long>> notExistingCategoryMap = handleMissingMonitoringPointCategory(companyId, buildingInfoList);
+			mergeMissingMonitoringPointCategory(buildingInfoList, notExistingCategoryMap);
 		}
 
 		return SimpleDataResponse.success(buildingInfoList);
 	}
 
+	private void mergeMissingMonitoringPointCategory(List<OverviewVO> buildingInfoList, Map<Long, List<Long>> notExistingCategoryMap) {
+		buildingInfoList.forEach(building -> {
+			List<Long> missingCategoryIds = notExistingCategoryMap.get(building.getBuildingId());
+			if (missingCategoryIds != null && !missingCategoryIds.isEmpty()) {
+				building.setMissingMonitoringPointCategoryList(missingCategoryIds);
+			}
+		});
+	}
+
+	private Map<Long, List<Long>> handleMissingMonitoringPointCategory(Long companyId, List<OverviewVO> buildingInfoList) {
+		//全部分类
+		MonitoringPointCategorySearchParams categorySearchParam = new MonitoringPointCategorySearchParams();
+		categorySearchParam.setCompanyIdList(List.of(companyId));
+		List<MonitoringPointCategoryPageVO> categoryList = monitoringPointCategoryMapperExt.getListPage(categorySearchParam);
+
+		List<Long> allCategoryIds = categoryList.stream()
+				.map(MonitoringPointCategoryPageVO::getMonitoringPointCategoryId)
+				.filter(Objects::nonNull)
+				.toList();
+
+		//所有楼宇的监测点分类
+		Map<String, Object> allCategoryParamMap = new HashMap<>();
+		allCategoryParamMap.put("companyId", companyId);
+		allCategoryParamMap.put("categoryIdList", Constants.ALL_CATEGORY_IDS);
+		List<OverviewCategoryVO> existingCategoryList = overviewInfoMapperExt.getExistingCategoryList(allCategoryParamMap);
+
+		Map<Long, Set<Long>> existingCategoryMap =
+				existingCategoryList.stream()
+						.filter(e -> e.getBuildingId() != null && e.getMonitoringPointCategoryId() != null)
+						.collect(Collectors.groupingBy(
+								OverviewCategoryVO::getBuildingId,
+								Collectors.mapping(
+										OverviewCategoryVO::getMonitoringPointCategoryId,
+										Collectors.toSet()
+								)
+						));
+
+		Map<Long, List<Long>> notExistingCategoryMap = new HashMap<>();
+		for (OverviewVO building : buildingInfoList) {
+			Long buildingId = building.getBuildingId();
+			Set<Long> existingIds = existingCategoryMap.getOrDefault(buildingId, Collections.emptySet());
+			List<Long> missingIds = new ArrayList<>();
+			for (Long categoryId : allCategoryIds) {
+				if (!existingIds.contains(categoryId)) {
+					missingIds.add(categoryId);
+				}
+			}
+			notExistingCategoryMap.put(buildingId, missingIds);
+		}
+
+		return notExistingCategoryMap;
+	}
+
 	public static void mergeOverviewList(List<OverviewVO> buildingInfoList, List<OverviewVO> overviewVOList) {
 		// 构建 buildingId 到 OverviewVO 的映射表
 		Map<Long, OverviewVO> overviewMap = overviewVOList.stream()
@@ -138,6 +196,7 @@ public class OverviewServiceImpl implements OverviewService {
 
 			// 分组监测点分类
 			List<OverviewVO.MonitoringPointCategoryAlarm> categoryAlarms = buildingInfos.stream()
+					.filter(dto -> dto.getMonitoringPointCategoryId() != null)
 					.collect(Collectors.groupingBy(OverviewInfo::getMonitoringPointCategoryId))
 					.entrySet()
 					.stream()
@@ -201,7 +260,7 @@ public class OverviewServiceImpl implements OverviewService {
 	}
 
 	@Override
-	public SimpleDataResponse<DashboardNotificationPageVO> getNotification(Long userId, Long companyId, Integer languageType, Integer utcOffset) {
+	public SimpleDataResponse<List<DashboardNotificationPageVO>> getNotification(Long userId, Long companyId, Integer languageType, Integer utcOffset) {
 		return SimpleDataResponse.success(dashboardNotificationMapperExt.getNotification(companyId));
 	}
 

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/RoleServiceImpl.java

@@ -1,5 +1,8 @@
 package com.dongjian.dashboard.back.service.impl;
 
+import com.dongjian.dashboard.back.dto.role.RoleMenuPermissionDTO;
+import com.dongjian.dashboard.back.service.common.DashboardMenuTree;
+import com.dongjian.dashboard.back.vo.role.*;
 import com.github.pagehelper.PageHelper;
 import com.dongjian.dashboard.back.common.exception.MsgCodeException;
 import com.dongjian.dashboard.back.common.language.msg.MsgLanguageChange;
@@ -19,7 +22,6 @@ import com.dongjian.dashboard.back.service.common.CommonOpt;
 import com.dongjian.dashboard.back.service.common.MenuTree;
 import com.dongjian.dashboard.back.util.CommonUtil;
 import com.dongjian.dashboard.back.vo.TreeMenusDTO;
-import com.dongjian.dashboard.back.vo.role.RolePageDTO;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -94,26 +96,23 @@ public class RoleServiceImpl implements RoleService {
     
 
 
-	private void insertRoleMenuRelation(Long companyId, Long userId, long currentUnix, Long roleId, String menuIds) {
+	private void insertRoleMenuRelation(Long companyId, Long userId, long currentUnix, Long roleId, List<RoleMenuPermissionDTO> menuIds) {
-		if (StringUtils.isNoneBlank(menuIds)) {
+		basicRoleMenuRelationMapperExt.deleteByRoleId(roleId);
-			//把无效的id去掉
+
-			menuIds = filterMenuIds(companyId, userId, menuIds);
+		if (menuIds == null || menuIds.isEmpty()) {
-			if (StringUtils.isBlank(menuIds)) {
 			return;
 		}
-			//先删除原有的角色ID
+
-			Map<String, Object> deleteMap = new HashMap<>();
+		List<RoleMenuPermissionEntity> entities = menuIds.stream().map(item -> {
-			deleteMap.put("roleId", roleId);
+			RoleMenuPermissionEntity entity = new RoleMenuPermissionEntity();
-			basicRoleMenuRelationMapperExt.deleteDashboardRelation(deleteMap);
+			entity.setRoleId(roleId);
-			//重新插入关联关系
+			entity.setMenuId(item.getMenuId());
-			List<Long> idList = Arrays.asList(menuIds.split(",")).stream().map(s -> Long.parseLong(s.trim())).collect(Collectors.toList());
+			entity.setPermissionType(item.getPermissionType());
-			Map<String, Object> paramMap = new HashMap<String, Object>();
+			entity.setCreateTime(currentUnix);
-			paramMap.put("roleId", roleId);
+			return entity;
-			paramMap.put("menuIds", idList);
+		}).collect(Collectors.toList());
-			paramMap.put("creatorId", userId);
+
-			paramMap.put("createTime", currentUnix);
+		basicRoleMenuRelationMapperExt.dashboardBatchInsert(entities);
-			basicRoleMenuRelationMapperExt.batchInsert(paramMap);
-		}
 	}
 
 
@@ -143,7 +142,7 @@ public class RoleServiceImpl implements RoleService {
 		if(StringUtils.isBlank(param.getRoleName()) || param.getRoleName().length() > 100){
 			return new SimpleDataResponse(ResponseCode.MSG_ERROR, "Parameter [roleName] error");
 		}
-		if(StringUtils.isBlank(param.getMenuIds())){
+		if(CollectionUtils.isEmpty(param.getMenuIds())){
 			return new SimpleDataResponse(ResponseCode.MSG_ERROR, "menuIds can not be null");
 		}
 		return SimpleDataResponse.success();
@@ -315,4 +314,149 @@ public class RoleServiceImpl implements RoleService {
 		return new PageInfo<>(resultList);
 	}
 
+	@Override
+	public SimpleDataResponse<List<DashboardTreeMenusDTO>> getOwnMenuTree(Long companyId, Long userId, Integer languageType) {
+
+		// 1查询用户信息
+		BasicUser basicUser = basicUserMapperExt.selectByPrimaryKey(userId);
+		int superRole = basicUser.getSuperRole() == null ? 0 : basicUser.getSuperRole();
+
+		// 获取角色权限（非超级管理员）
+		Map<Long, Integer> permissionMap = new HashMap<>();
+		if (superRole != 1) {
+			Long roleId = basicRoleMenuRelationMapperExt.getRoleIdByUserId(userId);
+			List<RoleMenuPermissionEntity> permissions = basicRoleMenuRelationMapperExt.selectByRoleId(roleId);
+			permissionMap = permissions.stream()
+					.collect(Collectors.toMap(
+                            RoleMenuPermissionEntity::getMenuId,
+							RoleMenuPermissionEntity::getPermissionType
+					));
+		}
+
+		// 查询全量菜单
+		List<DashboardTreeMenusDTO> allMenus = basicRoleMenuRelationMapperExt.selectAllMenu(Collections.emptyMap());
+		Map<Long, DashboardTreeMenusDTO> fullMenuMap = allMenus.stream()
+				.collect(Collectors.toMap(DashboardTreeMenusDTO::getMenuId, m -> m));
+
+		// 获取用户可见菜单（叶子或有权限的节点）
+		List<DashboardTreeMenusDTO> visibleMenus;
+		if (superRole == 1) {
+			// 超级管理员可见所有
+			visibleMenus = new ArrayList<>(allMenus);
+		} else {
+			Long roleId = basicRoleMenuRelationMapperExt.getRoleIdByUserId(userId);
+			Map<String, Object> paramMap = new HashMap<>();
+			paramMap.put("superRole", superRole);
+			paramMap.put("roleId", roleId);
+			visibleMenus = basicRoleMenuRelationMapperExt.selectAllMenu(paramMap);
+		}
+
+		// 补全父节点
+		visibleMenus = fillMissingParents(visibleMenus, fullMenuMap);
+
+		// 构建树
+		DashboardMenuTree tree = new DashboardMenuTree(visibleMenus);
+		List<DashboardTreeMenusDTO> result = tree.buildTree("-1");
+
+		// 叶子权限赋值
+		fillLeafPermission(result, permissionMap, superRole);
+
+		// 父节点统一赋值=2
+		fillParentPermission(result);
+
+		return SimpleDataResponse.success(result);
+	}
+
+	/**
+	 * 补全父节点（一次传入全量菜单 map）
+	 */
+	private List<DashboardTreeMenusDTO> fillMissingParents(List<DashboardTreeMenusDTO> menuList,
+														   Map<Long, DashboardTreeMenusDTO> fullMenuMap) {
+
+		Set<Long> allIds = menuList.stream().map(DashboardTreeMenusDTO::getMenuId).collect(Collectors.toSet());
+		Set<Long> missingParentIds = new HashSet<>();
+
+		for (DashboardTreeMenusDTO menu : menuList) {
+			Long pid = menu.getParentMenuId();
+			while (pid != null && !Objects.equals(pid, -1L) && !allIds.contains(pid)) {
+				missingParentIds.add(pid);
+				DashboardTreeMenusDTO parentMenu = fullMenuMap.get(pid);
+				if (parentMenu == null) break; // 防止死循环
+				pid = parentMenu.getParentMenuId();
+			}
+		}
+
+		for (Long pid : missingParentIds) {
+			DashboardTreeMenusDTO parentMenu = fullMenuMap.get(pid);
+			if (parentMenu != null) {
+				menuList.add(parentMenu);
+			}
+		}
+
+		return menuList;
+	}
+
+	/**
+	 * 叶子赋权
+	 */
+	private void fillLeafPermission(List<DashboardTreeMenusDTO> nodes,
+									Map<Long, Integer> permissionMap, Integer superRole) {
+		for (DashboardTreeMenusDTO node : nodes) {
+			if (node.getDashboardLowestNode() != null && node.getDashboardLowestNode() == 1) {
+				if (superRole == 1) {
+					node.setPermissionType(2);
+				} else {
+					node.setPermissionType(permissionMap.getOrDefault(node.getMenuId(), 0));
+				}
+			}
+			if (node.getChildren() != null && !node.getChildren().isEmpty()) {
+				fillLeafPermission(node.getChildren(), permissionMap, superRole);
+			}
+		}
+	}
+
+	/**
+	 * 父节点权限统一赋值 2
+	 */
+	private void fillParentPermission(List<DashboardTreeMenusDTO> nodes) {
+		for (DashboardTreeMenusDTO node : nodes) {
+			if (node.getChildren() != null && !node.getChildren().isEmpty()) {
+				fillParentPermission(node.getChildren());
+				node.setPermissionType(2);
+			}
+		}
+	}
+
+	@Override
+	@Transactional
+	public void saveRolePermission(Long roleId, List<RoleMenuPermissionDTO> list) {
+
+		basicRoleMenuRelationMapperExt.deleteByRoleId(roleId);
+
+		if (list == null || list.isEmpty()) {
+			return;
+		}
+
+		List<RoleMenuPermissionEntity> entities = list.stream().map(item -> {
+			RoleMenuPermissionEntity entity = new RoleMenuPermissionEntity();
+			entity.setRoleId(roleId);
+			entity.setMenuId(item.getMenuId());
+			entity.setPermissionType(item.getPermissionType());
+			entity.setCreateTime(System.currentTimeMillis());
+			return entity;
+		}).collect(Collectors.toList());
+
+		basicRoleMenuRelationMapperExt.dashboardBatchInsert(entities);
+	}
+
+	@Override
+	public SimpleDataResponse<List<RoleMenuPermissionEntity>> getMenuIdListByRoleId(Long roleId, Long companyId, Long userId, Integer languageType) {
+		try {
+			return SimpleDataResponse.success(basicRoleMenuRelationMapperExt.getMenuIdListByRoleId(roleId));
+		} catch (Exception e) {
+			logger.error("获取角色菜单出错", e);
+			return new SimpleDataResponse(ResponseCode.SERVER_ERROR, e.getMessage());
+		}
+	}
+
 }