F10告警、告警处理 ppt需求

data-center-business-controller/src/main/resources/db/migration/V88__camera_enabled.sql

@@ -0,0 +1 @@
+ALTER TABLE basic_building ADD `camera_enabled` int DEFAULT '0' COMMENT '是否有监控摄像头，0-没有，1-有';

data-center-business-controller/src/main/resources/db/migration/V89__block_flag.sql

@@ -0,0 +1 @@
+ALTER TABLE alert_history ADD `block_flag` int DEFAULT '0' COMMENT '是否屏蔽，0-不屏蔽，1-屏蔽';

data-center-business-controller/src/main/resources/db/migration/V90__alert_handle_modify.sql

@@ -0,0 +1,6 @@
+ALTER TABLE alert_handle_history ADD `phone_notification_type` int DEFAULT '0' COMMENT '电话通知类型：0-未知，1-拨出，2-来电';
+ALTER TABLE alert_handle_history ADD `phone_notification_time` bigint DEFAULT NULL COMMENT '电话通知时间，毫秒级时间戳';
+ALTER TABLE alert_handle_history ADD `creator` varchar(100) DEFAULT NULL COMMENT '记录创建者（输入者）';
+ALTER TABLE alert_handle_history ADD `detail_title` text DEFAULT NULL COMMENT '状况标题';
+ALTER TABLE alert_handle_history ADD `detail_content` text DEFAULT NULL COMMENT '状况内容';
+

data-center-business-controller/src/main/resources/db/migration/V91__dashboard_block_config.sql

@@ -0,0 +1,18 @@
+CREATE TABLE `dashboard_block_config` (
+      `id` bigint NOT NULL AUTO_INCREMENT,
+      `company_id` bigint DEFAULT NULL,
+      `building_id` bigint DEFAULT NULL,
+      `acceptance_method` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '受理方式',
+      `acceptance_at` bigint DEFAULT NULL COMMENT '受理时间',
+      `work_content` varchar(1000) DEFAULT NULL COMMENT '作业内容',
+      `block_big_class_id` json DEFAULT NULL COMMENT '屏蔽类别，对应basic_asset_class_big表里的id',
+      `start_time` bigint DEFAULT NULL COMMENT '起始时间',
+      `end_time` bigint DEFAULT NULL COMMENT '截止时间',
+      `status` int DEFAULT '0' COMMENT '0-未完成，1-完成',
+      `contact` varchar(255) DEFAULT NULL COMMENT '联系人',
+      `creator` varchar(255) DEFAULT NULL COMMENT '输入者',
+      `completion_time` bigint DEFAULT NULL COMMENT '完成时间',
+      `created_at` bigint DEFAULT NULL,
+      `flag` int DEFAULT '0' COMMENT '0-正常，1-删除',
+      PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='屏蔽设置';

data-center-business-dao/src/main/resources/mappers/auto/BasicBuildingMapper.xml

@@ -27,6 +27,7 @@
     <result column="site_manager" jdbcType="VARCHAR" property="siteManager" />
     <result column="king_contract_no" jdbcType="VARCHAR" property="kingContractNo" />
     <result column="kvm_url" jdbcType="VARCHAR" property="kvmUrl" />
+    <result column="camera_enabled" jdbcType="INTEGER" property="cameraEnabled" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.techsor.datacenter.business.model.BasicBuilding">
     <!--
@@ -110,7 +111,8 @@
     -->
     building_id, company_id, `name`, address, flag, create_time, creator_id, modify_time, 
     modifier_id, udf_building_id, building_bucket, thumbnail_num, show_switch_2d3d, brief_introduction, 
-    latitude, longitude, retain_alert, salesforce_primary_id, site_manager, king_contract_no, kvm_url
+    latitude, longitude, retain_alert, salesforce_primary_id, site_manager, king_contract_no, 
+    kvm_url, camera_enabled
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -203,7 +205,8 @@
       building_bucket, thumbnail_num, show_switch_2d3d, 
       brief_introduction, latitude, longitude, 
       retain_alert, salesforce_primary_id, site_manager, 
-      king_contract_no, kvm_url, floor_info_list, picture_introduction, 
+      king_contract_no, kvm_url, camera_enabled, 
+      floor_info_list, picture_introduction, 
       special_notes)
     values (#{companyId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
       #{flag,jdbcType=INTEGER}, #{createTime,jdbcType=BIGINT}, #{creatorId,jdbcType=BIGINT}, 
@@ -211,7 +214,8 @@
       #{buildingBucket,jdbcType=VARCHAR}, #{thumbnailNum,jdbcType=INTEGER}, #{showSwitch2d3d,jdbcType=INTEGER}, 
       #{briefIntroduction,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, 
       #{retainAlert,jdbcType=INTEGER}, #{salesforcePrimaryId,jdbcType=BIGINT}, #{siteManager,jdbcType=VARCHAR}, 
-      #{kingContractNo,jdbcType=VARCHAR}, #{kvmUrl,jdbcType=VARCHAR}, #{floorInfoList,jdbcType=LONGVARCHAR}, #{pictureIntroduction,jdbcType=LONGVARCHAR}, 
+      #{kingContractNo,jdbcType=VARCHAR}, #{kvmUrl,jdbcType=VARCHAR}, #{cameraEnabled,jdbcType=INTEGER}, 
+      #{floorInfoList,jdbcType=LONGVARCHAR}, #{pictureIntroduction,jdbcType=LONGVARCHAR}, 
       #{specialNotes,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.techsor.datacenter.business.model.BasicBuilding">
@@ -284,6 +288,9 @@
       <if test="kvmUrl != null">
         kvm_url,
       </if>
+      <if test="cameraEnabled != null">
+        camera_enabled,
+      </if>
       <if test="floorInfoList != null">
         floor_info_list,
       </if>
@@ -355,6 +362,9 @@
       <if test="kvmUrl != null">
         #{kvmUrl,jdbcType=VARCHAR},
       </if>
+      <if test="cameraEnabled != null">
+        #{cameraEnabled,jdbcType=INTEGER},
+      </if>
       <if test="floorInfoList != null">
         #{floorInfoList,jdbcType=LONGVARCHAR},
       </if>
@@ -446,6 +456,9 @@
       <if test="record.kvmUrl != null">
         kvm_url = #{record.kvmUrl,jdbcType=VARCHAR},
       </if>
+      <if test="record.cameraEnabled != null">
+        camera_enabled = #{record.cameraEnabled,jdbcType=INTEGER},
+      </if>
       <if test="record.floorInfoList != null">
         floor_info_list = #{record.floorInfoList,jdbcType=LONGVARCHAR},
       </if>
@@ -487,6 +500,7 @@
       site_manager = #{record.siteManager,jdbcType=VARCHAR},
       king_contract_no = #{record.kingContractNo,jdbcType=VARCHAR},
       kvm_url = #{record.kvmUrl,jdbcType=VARCHAR},
+      camera_enabled = #{record.cameraEnabled,jdbcType=INTEGER},
       floor_info_list = #{record.floorInfoList,jdbcType=LONGVARCHAR},
       picture_introduction = #{record.pictureIntroduction,jdbcType=LONGVARCHAR},
       special_notes = #{record.specialNotes,jdbcType=LONGVARCHAR}
@@ -520,7 +534,8 @@
       salesforce_primary_id = #{record.salesforcePrimaryId,jdbcType=BIGINT},
       site_manager = #{record.siteManager,jdbcType=VARCHAR},
       king_contract_no = #{record.kingContractNo,jdbcType=VARCHAR},
-      kvm_url = #{record.kvmUrl,jdbcType=VARCHAR}
+      kvm_url = #{record.kvmUrl,jdbcType=VARCHAR},
+      camera_enabled = #{record.cameraEnabled,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -592,6 +607,9 @@
       <if test="kvmUrl != null">
         kvm_url = #{kvmUrl,jdbcType=VARCHAR},
       </if>
+      <if test="cameraEnabled != null">
+        camera_enabled = #{cameraEnabled,jdbcType=INTEGER},
+      </if>
       <if test="floorInfoList != null">
         floor_info_list = #{floorInfoList,jdbcType=LONGVARCHAR},
       </if>
@@ -630,6 +648,7 @@
       site_manager = #{siteManager,jdbcType=VARCHAR},
       king_contract_no = #{kingContractNo,jdbcType=VARCHAR},
       kvm_url = #{kvmUrl,jdbcType=VARCHAR},
+      camera_enabled = #{cameraEnabled,jdbcType=INTEGER},
       floor_info_list = #{floorInfoList,jdbcType=LONGVARCHAR},
       picture_introduction = #{pictureIntroduction,jdbcType=LONGVARCHAR},
       special_notes = #{specialNotes,jdbcType=LONGVARCHAR}
@@ -660,7 +679,8 @@
       salesforce_primary_id = #{salesforcePrimaryId,jdbcType=BIGINT},
       site_manager = #{siteManager,jdbcType=VARCHAR},
       king_contract_no = #{kingContractNo,jdbcType=VARCHAR},
-      kvm_url = #{kvmUrl,jdbcType=VARCHAR}
+      kvm_url = #{kvmUrl,jdbcType=VARCHAR},
+      camera_enabled = #{cameraEnabled,jdbcType=INTEGER}
     where building_id = #{buildingId,jdbcType=BIGINT}
   </update>
 </mapper>

data-center-business-dao/src/main/resources/mappers/ex/BasicBuildingMapperExt.xml

@@ -49,6 +49,7 @@
             bbuilding.site_manager,
             bbuilding.king_contract_no,
             bbuilding.kvm_url,
+            bbuilding.camera_enabled,
         	bsales.salesforce_id,
             GROUP_CONCAT(DISTINCT pa.id ORDER BY pa.id) AS siteIds,
             GROUP_CONCAT(DISTINCT pa.code ORDER BY pa.id) AS siteCodes,

data-center-business-model/src/main/java/com/techsor/datacenter/business/dto/building/OptBuildingParams.java

@@ -66,6 +66,9 @@ public class OptBuildingParams{
 	@Schema(description = "KVM URL", example = "https://kvm.example.com/building/1")
 	private String kvmUrl;
 
+	@Schema(description ="Whether monitoring is installed, 0-not installed, 1-installed", example = "1")
+	private Integer cameraEnabled;
+	
 	@Data
 	public static class CustomFloorInfo {
 	    private String revitName;

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicBuilding.java

@@ -183,6 +183,24 @@ public class BasicBuilding implements Serializable {
      */
     private String kingContractNo;
 
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column basic_building.kvm_url
+     *
+     * @mbg.generated
+     */
+    private String kvmUrl;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column basic_building.camera_enabled
+     *
+     * @mbg.generated
+     */
+    private Integer cameraEnabled;
+
     /**
      *
      * This field was generated by MyBatis Generator.
@@ -210,12 +228,6 @@ public class BasicBuilding implements Serializable {
      */
     private String specialNotes;
 
-    /**
-     *
-     * This field corresponds to the database column basic_building.kvm_url
-     */
-    private String kvmUrl;
-
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database table basic_building
@@ -705,23 +717,53 @@ public class BasicBuilding implements Serializable {
     }
 
     /**
+     * This method was generated by MyBatis Generator.
      * This method returns the value of the database column basic_building.kvm_url
      *
      * @return the value of basic_building.kvm_url
+     *
+     * @mbg.generated
      */
     public String getKvmUrl() {
         return kvmUrl;
     }
 
     /**
+     * This method was generated by MyBatis Generator.
      * This method sets the value of the database column basic_building.kvm_url
      *
      * @param kvmUrl the value for basic_building.kvm_url
+     *
+     * @mbg.generated
      */
     public void setKvmUrl(String kvmUrl) {
         this.kvmUrl = kvmUrl == null ? null : kvmUrl.trim();
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column basic_building.camera_enabled
+     *
+     * @return the value of basic_building.camera_enabled
+     *
+     * @mbg.generated
+     */
+    public Integer getCameraEnabled() {
+        return cameraEnabled;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column basic_building.camera_enabled
+     *
+     * @param cameraEnabled the value for basic_building.camera_enabled
+     *
+     * @mbg.generated
+     */
+    public void setCameraEnabled(Integer cameraEnabled) {
+        this.cameraEnabled = cameraEnabled;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column basic_building.floor_info_list
@@ -827,6 +869,7 @@ public class BasicBuilding implements Serializable {
         sb.append(", siteManager=").append(siteManager);
         sb.append(", kingContractNo=").append(kingContractNo);
         sb.append(", kvmUrl=").append(kvmUrl);
+        sb.append(", cameraEnabled=").append(cameraEnabled);
         sb.append(", floorInfoList=").append(floorInfoList);
         sb.append(", pictureIntroduction=").append(pictureIntroduction);
         sb.append(", specialNotes=").append(specialNotes);

data-center-business-model/src/main/java/com/techsor/datacenter/business/model/BasicBuildingExample.java

@@ -1553,6 +1553,66 @@ public class BasicBuildingExample {
             addCriterion("kvm_url not between", value1, value2, "kvmUrl");
             return (Criteria) this;
         }
+
+        public Criteria andCameraEnabledIsNull() {
+            addCriterion("camera_enabled is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCameraEnabledIsNotNull() {
+            addCriterion("camera_enabled is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCameraEnabledEqualTo(Integer value) {
+            addCriterion("camera_enabled =", value, "cameraEnabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andCameraEnabledNotEqualTo(Integer value) {
+            addCriterion("camera_enabled <>", value, "cameraEnabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andCameraEnabledGreaterThan(Integer value) {
+            addCriterion("camera_enabled >", value, "cameraEnabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andCameraEnabledGreaterThanOrEqualTo(Integer value) {
+            addCriterion("camera_enabled >=", value, "cameraEnabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andCameraEnabledLessThan(Integer value) {
+            addCriterion("camera_enabled <", value, "cameraEnabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andCameraEnabledLessThanOrEqualTo(Integer value) {
+            addCriterion("camera_enabled <=", value, "cameraEnabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andCameraEnabledIn(List<Integer> values) {
+            addCriterion("camera_enabled in", values, "cameraEnabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andCameraEnabledNotIn(List<Integer> values) {
+            addCriterion("camera_enabled not in", values, "cameraEnabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andCameraEnabledBetween(Integer value1, Integer value2) {
+            addCriterion("camera_enabled between", value1, value2, "cameraEnabled");
+            return (Criteria) this;
+        }
+
+        public Criteria andCameraEnabledNotBetween(Integer value1, Integer value2) {
+            addCriterion("camera_enabled not between", value1, value2, "cameraEnabled");
+            return (Criteria) this;
+        }
     }
 
     /**

data-center-business-model/src/main/java/com/techsor/datacenter/business/vo/building/BuildingPageVO.java

@@ -82,6 +82,9 @@ public class BuildingPageVO{
 	@Schema(description = "KVM URL", example = "https://kvm.example.com/building/1")
 	private String kvmUrl;
 
+	@Schema(description ="Whether monitoring is installed, 0-not installed, 1-installed", example = "1")
+	private Integer cameraEnabled;
+
 	private String branchIds;
 	@Schema(description = "支社名称", example = "user1", required = false)
 	private String branchNames;