增加通知、通知分类管理

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

@@ -78,6 +78,7 @@ msgcn:
         invalidParentLevel: 无效的父级层级
         levelReferencedByChildren: 已被下级层级绑定，请先解绑后再删除
         elapsedTime: '{0}天{1}小时{2}分'
+        categoryHasExisted: 分类已存在
     operationLogMap:
         addRole: 新增角色
         editRole: 编辑角色

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

@@ -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

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

@@ -78,6 +78,7 @@ msgjp:
         invalidParentLevel: 無効な上位階層です
         levelReferencedByChildren: 下位階層に紐づいています。削除する前に紐付けを解除してください。
         elapsedTime: '{0}日{1}時間{2}分間'
+        categoryHasExisted: カテゴリは既に存在します。
     operationLogMap:
         addRole: ロールを追加
         editRole: ロールを編集

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

@@ -0,0 +1,94 @@
+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.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;
+
+    @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);
+    }
+
+    @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);
+    }
+
+    @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,94 @@
+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.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;
+
+    @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);
+    }
+
+    @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);
+    }
+
+    @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-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/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;
@@ -14,4 +15,6 @@ public interface DashboardNotificationMapperExt extends DashboardNotificationMap
 
 	DashboardNotificationPageVO getNotification(Long companyId);
 
+	List<DashboardNotificationPageVO> getListPage(DashboardNotificationSearchParams pageSearchParam);
+
 }

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/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,40 @@
 
     <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
+        LIMIT 1;
+    </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/mybatis-generator/generatorConfig.xml

@@ -154,6 +154,11 @@
             <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" />

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/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-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/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);
+	}
+}