Parcourir la source

安全检查是否下发判定

luojun il y a 2 ans
Parent
commit
507ba88282

+ 6 - 0
project_data/sql/0.0.2/soc/soc.sql

@@ -825,6 +825,12 @@ IF
 		ALTER TABLE `soc`.`core_protection_log` CHANGE COLUMN `alarm_host_code` `alarm_host_id` BIGINT NULL DEFAULT NULL COMMENT '报警主机id' AFTER `code`;
 		
 	END IF;
+	-- 安全检查是否下发
+    IF
+        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'core_safecheck_plan' AND COLUMN_NAME = 'distribute' ) THEN
+        ALTER TABLE `core_safecheck_plan` ADD COLUMN `distribute` VARCHAR ( 2 ) DEFAULT NULL COMMENT '是否已下发';
+
+    END IF;
 	ALTER TABLE `core_protection` MODIFY COLUMN `device_id` BIGINT NULL DEFAULT NULL COMMENT '设备ID' AFTER `id`;
 -- 机构扩展添加是否业务库
 	ALTER TABLE sys_org_extend MODIFY COLUMN business_library INT COMMENT '是否业务库';

+ 1 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/domain/CoreSafecheckPlan.java

@@ -51,6 +51,7 @@ public class CoreSafecheckPlan extends BaseEntity {
 //    @JsonSerialize(using = ToStringSerializer.class)
 //    private Long index;
 
+    private String distribute;
     /**
      * 计划名称
      */

+ 5 - 0
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -157,6 +157,11 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
                 }
             }
         }
+        //更改下发状态
+        CoreSafecheckPlan coreSafecheckPlan = new CoreSafecheckPlan();
+        coreSafecheckPlan.setId(dto.getId());
+        coreSafecheckPlan.setDistribute("1");
+        coreSafecheckPlanMapper.updateById(coreSafecheckPlan);
     }
 
 

+ 2 - 0
soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafecheckPlanMapper.xml

@@ -23,6 +23,7 @@
         <result property="sourceType" column="source_type"/>
         <result property="roleNames" column="role_names"/>
 
+        <result property="distribute" column="distribute"/>
         <result property="distributeStatus" column="distribute_status"/>
         <result property="distributePlanStatus" column="distribute_plan_status"/>
         <result property="parentId" column="parent_id"/>
@@ -205,6 +206,7 @@
         c.count,
         c.id,
         c.parent_id,
+        c.distribute,
         c.distribute_status,
         c.distribute_plan_status,
         o1.NAME AS plan_create_org_name,