Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.3

# Conflicts:
#	project_data/sql/0.0.3/soc/soc.sql

project_data/sql/0.0.3/soc/soc.sql

@@ -1,79 +1,79 @@
 
 CREATE TABLE if not exists  `core_safety_dict` (
-   `id` int NOT NULL AUTO_INCREMENT,
-   `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '指标分类code',
-   `parent_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '父级code',
-   `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '指标分类name',
-   PRIMARY KEY (`id`) USING BTREE,
-   UNIQUE KEY `code` (`code`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=35 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指标配置字典表';
+                                                   `id` int NOT NULL AUTO_INCREMENT,
+                                                   `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '指标分类code',
+    `parent_code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '父级code',
+    `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '指标分类name',
+    PRIMARY KEY (`id`) USING BTREE,
+    UNIQUE KEY `code` (`code`) USING BTREE
+    ) ENGINE=InnoDB AUTO_INCREMENT=35 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指标配置字典表';
 
 -- 新增安保综合评价规则表
 CREATE TABLE if not exists`core_safety_index_calculate_rule` (
-     id             bigint default 0 not null ,
-     type_code      varchar(50)      null comment '指标分类code',
-     project_code   varchar(50)      null comment '指标项目code',
-     point_code     varchar(50)      null comment '指标要点code',
-     deduction_type int              null comment '扣分方式 1：直接扣分，2最高扣分',
-     score          int              null comment '分值',
-     formula        varchar(500)     null comment '扣分规则描述',
-     org_type       int              null comment '机构类型',
-     deleted        int    default 0 null comment '是否删除 0否1是',
-     cycle          int              null comment '周期，只有在指标分类为安保履职时使用',
-     remark         varchar(500)     null comment '备注',
-     create_time    datetime         null,
-     create_by      varchar(125)     null,
-     update_time    datetime         null,
-     update_by      varchar(125)     null,
-     PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指标配置表';
+                                                                 id             bigint default 0 not null ,
+                                                                 type_code      varchar(50)      null comment '指标分类code',
+    project_code   varchar(50)      null comment '指标项目code',
+    point_code     varchar(50)      null comment '指标要点code',
+    deduction_type int              null comment '扣分方式 1：直接扣分，2最高扣分',
+    score          int              null comment '分值',
+    formula        varchar(500)     null comment '扣分规则描述',
+    org_type       int              null comment '机构类型',
+    deleted        int    default 0 null comment '是否删除 0否1是',
+    cycle          int              null comment '周期，只有在指标分类为安保履职时使用',
+    remark         varchar(500)     null comment '备注',
+    create_time    datetime         null,
+    create_by      varchar(125)     null,
+    update_time    datetime         null,
+    update_by      varchar(125)     null,
+    PRIMARY KEY (`id`) USING BTREE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指标配置表';
 
 
 CREATE TABLE if not exists `core_safety_index_calculate_rule_item` (
-   id             bigint default 0 not null ,
-   rule_id        bigint           null comment '安全指标主键',
-   indicator_note varchar(100)     null comment '细化指数描述',
-   calculate_type int              null comment '计算类型 1累计数，2连续数，3 分类,4 固化值',
-   indicator_days int              null comment '连续数，连续多少天',
-   item_type      int              null comment 'calculate_type为3是用来存具体分类',
-   item_value     double(5, 2)     null comment '扣分系数',
-   order_num      int              null comment '排序',
-   create_time    datetime         null,
-   create_by      varchar(125)     null,
-   update_time    datetime         null,
-   update_by      varchar(125)     null,
-   PRIMARY KEY (`id`) USING BTREE,
-   KEY `rule_id` (`rule_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指标指数细化表';
+                                                                       id             bigint default 0 not null ,
+                                                                       rule_id        bigint           null comment '安全指标主键',
+                                                                       indicator_note varchar(100)     null comment '细化指数描述',
+    calculate_type int              null comment '计算类型 1累计数，2连续数，3 分类,4 固化值',
+    indicator_days int              null comment '连续数，连续多少天',
+    item_type      int              null comment 'calculate_type为3是用来存具体分类',
+    item_value     double(5, 2)     null comment '扣分系数',
+    order_num      int              null comment '排序',
+    create_time    datetime         null,
+    create_by      varchar(125)     null,
+    update_time    datetime         null,
+    update_by      varchar(125)     null,
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `rule_id` (`rule_id`) USING BTREE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指标指数细化表';
 
 
 CREATE TABLE if not exists core_safe_level
 (
-id          int auto_increment primary key,
-level_name  varchar(50)  null comment '安全等级名称：L1,L2,L3，l4',
-min_value   double(5, 2) null comment '最小值',
-max_value   double(5, 2) null comment '最大值',
-risk_level  int          null comment '等级风险：0：低，1：中，2：高,3: 极高',
-description varchar(50)  null comment '安全等级描述:'
-) comment '安全等级配置表';
+    id          int auto_increment primary key,
+    level_name  varchar(50)  null comment '安全等级名称：L1,L2,L3，l4',
+    min_value   double(5, 2) null comment '最小值',
+    max_value   double(5, 2) null comment '最大值',
+    risk_level  int          null comment '等级风险：0：低，1：中，2：高,3: 极高',
+    description varchar(50)  null comment '安全等级描述:'
+    ) comment '安全等级配置表';
 
 CREATE TABLE if not exists `core_safe_month_score` (
-   `id` bigint NOT NULL COMMENT '主键id',
-   `level_id` bigint DEFAULT NULL COMMENT '评分等级id',
-   `org_id` bigint DEFAULT NULL COMMENT '机构id',
-   `data_year` int DEFAULT NULL COMMENT '数据所在年',
-   `data_month` int DEFAULT NULL COMMENT '数据所在月',
-   `org_score` double(10,2) NOT NULL COMMENT '机构得分',
-   `release_status` int DEFAULT NULL COMMENT '评分状态',
-   `org_path` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构path',
-   PRIMARY KEY (`id`) USING BTREE,
-   KEY `idx_year_month` (`data_year`,`data_month`) USING BTREE,
-   KEY `idx_orgId` (`org_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指数机构月度得分表';
+                                                       `id` bigint NOT NULL COMMENT '主键id',
+                                                       `level_id` bigint DEFAULT NULL COMMENT '评分等级id',
+                                                       `org_id` bigint DEFAULT NULL COMMENT '机构id',
+                                                       `data_year` int DEFAULT NULL COMMENT '数据所在年',
+                                                       `data_month` int DEFAULT NULL COMMENT '数据所在月',
+                                                       `org_score` double(10,2) NOT NULL COMMENT '机构得分',
+    `release_status` int DEFAULT NULL COMMENT '评分状态',
+    `org_path` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构path',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_year_month` (`data_year`,`data_month`) USING BTREE,
+    KEY `idx_orgId` (`org_id`) USING BTREE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指数机构月度得分表';
 
 create table if not exists core_safety_exception_data(
-    id           bigint auto_increment comment '主键' primary key,
-    data_id      varchar(100)                       null comment '异常数据id',
+                                                         id           bigint auto_increment comment '主键' primary key,
+                                                         data_id      varchar(100)                       null comment '异常数据id',
     org_id       bigint                             null comment '机构id',
     org_name     varchar(225)                       null comment '机构名称',
     org_path     varchar(225)                       null comment '机构path',
@@ -82,56 +82,56 @@ create table if not exists core_safety_exception_data(
     extra_field1 varchar(100)                       null comment '扩展预留字段',
     extra_field2 varchar(100)                       null comment '扩展预留字段',
     create_time  datetime default CURRENT_TIMESTAMP null comment '创建时间'
-) comment '安全指标的异常数据';
+    ) comment '安全指标的异常数据';
 
 CREATE TABLE if not exists`core_safety_source_data` (
-    `id` bigint NOT NULL COMMENT '主键id',
-    `rule_id` bigint DEFAULT NULL COMMENT '评价规则id',
-    `item_id` bigint DEFAULT NULL COMMENT '评价规则项id',
-    `org_id` bigint DEFAULT NULL COMMENT '机构id',
-    `data_year` int DEFAULT NULL COMMENT '数据所在年',
-    `data_month` int DEFAULT NULL COMMENT '数据所在月',
-    `times` int DEFAULT NULL COMMENT '出现次数',
-    `score` double(10,2) DEFAULT NULL COMMENT '扣分值',
+                                                        `id` bigint NOT NULL COMMENT '主键id',
+                                                        `rule_id` bigint DEFAULT NULL COMMENT '评价规则id',
+                                                        `item_id` bigint DEFAULT NULL COMMENT '评价规则项id',
+                                                        `org_id` bigint DEFAULT NULL COMMENT '机构id',
+                                                        `data_year` int DEFAULT NULL COMMENT '数据所在年',
+                                                        `data_month` int DEFAULT NULL COMMENT '数据所在月',
+                                                        `times` int DEFAULT NULL COMMENT '出现次数',
+                                                        `score` double(10,2) DEFAULT NULL COMMENT '扣分值',
     `type_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '配置项',
     PRIMARY KEY (`id`) USING BTREE,
     KEY `idx_year_month` (`data_year`,`data_month`) USING BTREE,
     KEY `idx_orgId` (`org_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指数机构扣分细项表';
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指数机构扣分细项表';
 
 CREATE TABLE if not exists `core_safety_deduct_data` (
-     `id` bigint NOT NULL COMMENT '主键id',
-     `rule_id` bigint DEFAULT NULL COMMENT '评价规则表',
-     `org_id` bigint DEFAULT NULL COMMENT '机构id',
-     `data_year` int DEFAULT NULL COMMENT '数据所在年',
-     `data_month` int DEFAULT NULL COMMENT '数据所在月',
-     `score` double(10,2) DEFAULT NULL COMMENT '合计每个子项后得出安全指标的分数',
-     `score_real` double(10,2) DEFAULT NULL COMMENT '真实扣分',
-     PRIMARY KEY (`id`) USING BTREE,
-     KEY `idx_year_month` (`data_year`,`data_month`) USING BTREE,
-     KEY `idx_orgId` (`org_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指数扣分表';
+                                                         `id` bigint NOT NULL COMMENT '主键id',
+                                                         `rule_id` bigint DEFAULT NULL COMMENT '评价规则表',
+                                                         `org_id` bigint DEFAULT NULL COMMENT '机构id',
+                                                         `data_year` int DEFAULT NULL COMMENT '数据所在年',
+                                                         `data_month` int DEFAULT NULL COMMENT '数据所在月',
+                                                         `score` double(10,2) DEFAULT NULL COMMENT '合计每个子项后得出安全指标的分数',
+    `score_real` double(10,2) DEFAULT NULL COMMENT '真实扣分',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_year_month` (`data_year`,`data_month`) USING BTREE,
+    KEY `idx_orgId` (`org_id`) USING BTREE
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='安全指数扣分表';
 
 CREATE TABLE  if not exists `core_safecheck_plan_to_check_org_type` (
-                                                         `plan_id` bigint NOT NULL COMMENT '计划id',
-                                                         `type_id` bigint NOT NULL COMMENT '类型id',
-                                                         `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                                                         `update_time` datetime DEFAULT NULL COMMENT '修改时间',
-                                                         `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
-                                                         `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='常规安全检查-受检机构类型关联表';
+                                                                        `plan_id` bigint NOT NULL COMMENT '计划id',
+                                                                        `type_id` bigint NOT NULL COMMENT '类型id',
+                                                                        `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+                                                                        `update_time` datetime DEFAULT NULL COMMENT '修改时间',
+                                                                        `create_by` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '创建人',
+    `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '修改人'
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='常规安全检查-受检机构类型关联表';
 
 create table if not exists core_register_book_pdf(
-    id                 bigint       not null
-        primary key,
-    register_book_type int          not null comment '登记簿类型',
-    date               date         not null comment '保存日期',
-    org_id             bigint       not null comment '机构id',
-    org_name           varchar(255)       not null comment '机构名称',
+                                                     id                 bigint       not null
+                                                     primary key,
+                                                     register_book_type int          not null comment '登记簿类型',
+                                                     date               date         not null comment '保存日期',
+                                                     org_id             bigint       not null comment '机构id',
+                                                     org_name           varchar(255)       not null comment '机构名称',
     org_path           varchar(255)       not null comment '机构path',
     file_name          varchar(255) null comment '文件名称',
     file_url           varchar(255) null comment '文件地址'
-);
+    );
 
 create table if not exists core_edu_training_plan_to_org_type
 (
@@ -305,9 +305,9 @@ INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_cla
 delete from sys_dict_type where dict_type='administrative_level';
 delete from sys_dict_data where dict_type='administrative_level';
 INSERT INTO sys_dict_type (dict_name, dict_type, status, create_by, create_time, update_by, update_time, remark)
- VALUES ('行政级别', 'administrative_level', '0', null, now(), null, now(), '省市县');
+VALUES ('行政级别', 'administrative_level', '0', null, now(), null, now(), '省市县');
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
- VALUES (1, '省级', '1', 'administrative_level', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), '省级');
+VALUES (1, '省级', '1', 'administrative_level', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), '省级');
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
 VALUES (2, '市级', '2', 'administrative_level', null, 'default', 'N', '0', '超级管理员', now(), '超级管理员', now(), '市级');
 INSERT INTO sys_dict_data (dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, update_by, update_time, remark)
@@ -442,22 +442,22 @@ alter table core_drill_dictionary modify drill_type_name varchar(32) null commen
 alter table core_drill_task modify comment varchar(2000) null comment '点评总结(登记人自评)';
 DELIMITER ??
 DROP PROCEDURE IF EXISTS schema_change ??
-	CREATE PROCEDURE schema_change () BEGIN
+CREATE PROCEDURE schema_change () BEGIN
 
 	-- 履职表增加次数
 	IF
         NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption' AND COLUMN_NAME = 'times' ) THEN
-        ALTER TABLE `core_resumption`
-			ADD COLUMN `times` smallint NULL COMMENT '第几次' AFTER `role_id`;
-    END IF;
+ALTER TABLE `core_resumption`
+    ADD COLUMN `times` smallint NULL COMMENT '第几次' AFTER `role_id`;
+END IF;
 
 		-- 履职表增加提交人
 	IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption' AND COLUMN_NAME = 'submitor_id' ) THEN
-		ALTER TABLE `soc`.`core_resumption`
-			ADD COLUMN `submitor_id` bigint NULL COMMENT '提交人id' AFTER `submit_time`,
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_resumption' AND COLUMN_NAME = 'submitor_id' ) THEN
+ALTER TABLE `soc`.`core_resumption`
+    ADD COLUMN `submitor_id` bigint NULL COMMENT '提交人id' AFTER `submit_time`,
 			ADD COLUMN `submitor_name` varchar(32) NULL COMMENT '提交人姓名' AFTER `submitor_id`;
-    END IF;
+END IF;
 		-- 人员补充信息表增加金融安全防范工程专家
 	IF
 NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_user_information' AND COLUMN_NAME = 'financial_experts' ) THEN
@@ -466,36 +466,36 @@ ALTER TABLE `sys_user_information`
 END IF;
 	-- 机构扩展添加字段
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'remote_count' ) THEN
-        ALTER TABLE `sys_org_extend`
-            ADD COLUMN `remote_count` int NULL COMMENT '业务库防控隔离门出入口数量';
-    END IF;
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'remote_count' ) THEN
+ALTER TABLE `sys_org_extend`
+    ADD COLUMN `remote_count` int NULL COMMENT '业务库防控隔离门出入口数量';
+END IF;
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'cash_adding_room' ) THEN
-        ALTER TABLE `sys_org_extend`
-            ADD COLUMN `cash_adding_room` int NULL COMMENT '离行式加钞间出入口数量';
-    END IF;
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'cash_adding_room' ) THEN
+ALTER TABLE `sys_org_extend`
+    ADD COLUMN `cash_adding_room` int NULL COMMENT '离行式加钞间出入口数量';
+END IF;
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'safe_box' ) THEN
-        ALTER TABLE `sys_org_extend`
-            ADD COLUMN `safe_box` int NULL COMMENT '是否设立保管箱库';
-    END IF;
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'safe_box' ) THEN
+ALTER TABLE `sys_org_extend`
+    ADD COLUMN `safe_box` int NULL COMMENT '是否设立保管箱库';
+END IF;
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'inner_count' ) THEN
-        ALTER TABLE `sys_org_extend`
-            ADD COLUMN `inner_count` int NULL COMMENT '内部保安人数';
-    END IF;
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'inner_count' ) THEN
+ALTER TABLE `sys_org_extend`
+    ADD COLUMN `inner_count` int NULL COMMENT '内部保安人数';
+END IF;
     IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'outside_count' ) THEN
-        ALTER TABLE `sys_org_extend`
-            ADD COLUMN `outside_count` int NULL COMMENT '外聘保安人数';
-    END IF;
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'sys_org_extend' AND COLUMN_NAME = 'outside_count' ) THEN
+ALTER TABLE `sys_org_extend`
+    ADD COLUMN `outside_count` int NULL COMMENT '外聘保安人数';
+END IF;
 	IF
-        NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_protection' AND COLUMN_NAME = 'status_updator_id' ) THEN
-		ALTER TABLE `core_protection`
-			ADD COLUMN `status_updator_id` bigint NULL DEFAULT NULL COMMENT '上报人id' AFTER `status_update_time`,
+NOT EXISTS ( SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE () and TABLE_NAME = 'core_protection' AND COLUMN_NAME = 'status_updator_id' ) THEN
+ALTER TABLE `core_protection`
+    ADD COLUMN `status_updator_id` bigint NULL DEFAULT NULL COMMENT '上报人id' AFTER `status_update_time`,
 			ADD COLUMN `status_updator_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上报人姓名' AFTER `status_updator_id`;
-	END IF;
+END IF;
 
     -- 安全指数机构分数表增加机构名称字段
     IF NOT EXISTS(SELECT *
@@ -503,9 +503,9 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_safe_month_score'
                     AND column_name = 'org_name') THEN
-        alter table core_safe_month_score
-            add org_name varchar(125) null comment '机构名称' after org_id;
-    END IF;
+alter table core_safe_month_score
+    add org_name varchar(125) null comment '机构名称' after org_id;
+END IF;
 
     -- 安全指数机构扣分细项表增加机构名称字段
     IF NOT EXISTS(SELECT *
@@ -514,13 +514,13 @@ END IF;
                     AND table_name = 'core_safety_source_data'
                     AND column_name = 'org_name') THEN
 
-        alter table core_safety_source_data
-            add org_name varchar(225) null comment '机构名称' after org_id;
+alter table core_safety_source_data
+    add org_name varchar(225) null comment '机构名称' after org_id;
 
-        alter table core_safety_source_data
-            add org_path varchar(225) null comment '机构path' after org_name;
+alter table core_safety_source_data
+    add org_path varchar(225) null comment '机构path' after org_name;
 
-    END IF;
+END IF;
 
     -- 安全指数扣分表增加机构名称字段
     IF NOT EXISTS(SELECT *
@@ -529,13 +529,13 @@ END IF;
                     AND table_name = 'core_safety_deduct_data'
                     AND column_name = 'org_name') THEN
 
-        alter table core_safety_deduct_data
-            add org_name varchar(225) null comment '机构名称' after org_id;
+alter table core_safety_deduct_data
+    add org_name varchar(225) null comment '机构名称' after org_id;
 
-        alter table core_safety_deduct_data
-            add org_path varchar(225) null comment '机构path' after org_name;
+alter table core_safety_deduct_data
+    add org_path varchar(225) null comment '机构path' after org_name;
 
-    END IF;
+END IF;
 
     -- 安全指数异常数据表增加机构名称字段
     IF NOT EXISTS(SELECT *
@@ -544,13 +544,13 @@ END IF;
                     AND table_name = 'core_safety_exception_data'
                     AND column_name = 'org_name') THEN
 
-        alter table core_safety_exception_data
-            add org_name varchar(225) null comment '机构名称' after org_id;
+alter table core_safety_exception_data
+    add org_name varchar(225) null comment '机构名称' after org_id;
 
-        alter table core_safety_exception_data
-            add org_path varchar(225) null comment '机构path' after org_name;
+alter table core_safety_exception_data
+    add org_path varchar(225) null comment '机构path' after org_name;
 
-    END IF;
+END IF;
 
     -- 安全指数机构分数表增加索引
     IF EXISTS(SELECT *
@@ -558,11 +558,11 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_safe_month_score'
                     AND INDEX_NAME = 'idx_year_month') THEN
-        drop index idx_orgId on core_safe_month_score;
-        drop index idx_year_month on core_safe_month_score;
+drop index idx_orgId on core_safe_month_score;
+drop index idx_year_month on core_safe_month_score;
 
-        create unique index idx_orgId_year_month on core_safe_month_score (org_id, data_year, data_month) comment '机构id+年+月';
-    END IF;
+create unique index idx_orgId_year_month on core_safe_month_score (org_id, data_year, data_month) comment '机构id+年+月';
+END IF;
 
 
     -- 调阅计划加所属机构
@@ -571,9 +571,9 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_monitoring_retrieval_plan'
                     AND column_name = 'organization') THEN
-    alter table core_monitoring_retrieval_plan
+alter table core_monitoring_retrieval_plan
     add organization varchar(255) DEFAULT NULL COMMENT '所属机构';
-    END IF;
+END IF;
 
     -- 履职添加pdf
     IF NOT EXISTS(SELECT *
@@ -581,9 +581,9 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_resumption_plan'
                     AND column_name = 'pdf_url') THEN
-        alter table core_resumption_plan
-            add pdf_url varchar(255) DEFAULT NULL COMMENT 'pdf下载地址';
-    END IF;
+alter table core_resumption_plan
+    add pdf_url varchar(255) DEFAULT NULL COMMENT 'pdf下载地址';
+END IF;
 
     -- 作息添加是否值班打卡
     IF NOT EXISTS(SELECT *
@@ -591,29 +591,29 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'sys_work_time'
                     AND column_name = 'is_duty') THEN
-        alter table sys_work_time
-            add is_duty int  NULL COMMENT '是否值班打卡';
-    END IF;
+alter table sys_work_time
+    add is_duty int  NULL COMMENT '是否值班打卡';
+END IF;
     IF NOT EXISTS(SELECT *
                   FROM information_schema.columns
                   WHERE table_schema = DATABASE()
                     AND table_name = 'sys_work_time_set_dayofweek'
                     AND column_name = 'is_duty') THEN
-        alter table sys_work_time_set_dayofweek
-            add is_duty int  NULL COMMENT '是否值班打卡';
-    END IF;
+alter table sys_work_time_set_dayofweek
+    add is_duty int  NULL COMMENT '是否值班打卡';
+END IF;
     -- 演练范本库表增加演练类型字段
     IF NOT EXISTS(SELECT *
                   FROM information_schema.columns
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_drill_dictionary'
                     AND column_name = 'drill_category') THEN
-        alter table core_drill_dictionary
-            add drill_category int null comment '演练类型,字典表取值' after drill_type_name;
+alter table core_drill_dictionary
+    add drill_category int null comment '演练类型,字典表取值' after drill_type_name;
 
-        alter table core_drill_dictionary
-            add drill_category_name varchar(125) null comment '演练类型名称' after drill_category;
-    END IF;
+alter table core_drill_dictionary
+    add drill_category_name varchar(125) null comment '演练类型名称' after drill_category;
+END IF;
 
     -- 履职计划增加是否有任务已经完成
     IF NOT EXISTS(SELECT *
@@ -621,20 +621,20 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_resumption_plan'
                     AND column_name = 'task_has_completed') THEN
-		ALTER TABLE `core_resumption_plan` 
-			ADD COLUMN `task_has_completed` int NULL COMMENT '1：表示有已完成的任务';
-    END IF;
-	
+ALTER TABLE `core_resumption_plan`
+    ADD COLUMN `task_has_completed` int NULL COMMENT '1：表示有已完成的任务';
+END IF;
+
     -- 履职内容增加生效日期
     IF NOT EXISTS(SELECT *
                   FROM information_schema.columns
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_resumption_plan_to_point'
                     AND column_name = 'effective_date') THEN
-		ALTER TABLE `core_resumption_plan_to_point`
-			ADD COLUMN `effective_date` date NULL COMMENT '生效日期。不为null';
-		UPDATE core_resumption_plan_to_point set effective_date='2000-01-01';
-    END IF;
+ALTER TABLE `core_resumption_plan_to_point`
+    ADD COLUMN `effective_date` date NULL COMMENT '生效日期。不为null';
+UPDATE core_resumption_plan_to_point set effective_date='2000-01-01';
+END IF;
 
 
        IF NOT EXISTS(SELECT *
@@ -642,18 +642,18 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'sys_org_physical_defense_construction'
                     AND column_name = 'date_of_complete') THEN
-		ALTER TABLE `sys_org_physical_defense_construction`
-			ADD COLUMN `date_of_complete` datetime NULL DEFAULT NULL COMMENT '计划达标日期';
-    END IF;
+ALTER TABLE `sys_org_physical_defense_construction`
+    ADD COLUMN `date_of_complete` datetime NULL DEFAULT NULL COMMENT '计划达标日期';
+END IF;
 
     IF NOT EXISTS(SELECT *
                   FROM information_schema.columns
                   WHERE table_schema = DATABASE()
                     AND table_name = 'sys_org_physical_defense_construction'
                     AND column_name = 'reason') THEN
-		ALTER TABLE `sys_org_physical_defense_construction`
-			ADD COLUMN `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '未达标原因';
-    END IF;
+ALTER TABLE `sys_org_physical_defense_construction`
+    ADD COLUMN `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '未达标原因';
+END IF;
 
 	-- 培训计划表新增字段 培训类型
     IF NOT EXISTS(SELECT *
@@ -661,9 +661,9 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_edu_training_plan'
                     AND column_name = 'type') THEN
-        alter table core_edu_training_plan
-            add type int default 0 not null comment '培训类型,0:行社安全保卫教育培训,1:行社消防安全培训,2:营业网点安全保卫教育培训,3:营业网点消防安全培训,4:其他' after id;
-    END IF;
+alter table core_edu_training_plan
+    add type int default 0 not null comment '培训类型,0:行社安全保卫教育培训,1:行社消防安全培训,2:营业网点安全保卫教育培训,3:营业网点消防安全培训,4:其他' after id;
+END IF;
 
     -- 演练计划表新增字段 演练类型
     IF NOT EXISTS(SELECT *
@@ -671,9 +671,9 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_drill_plan'
                     AND column_name = 'category') THEN
-        alter table core_drill_plan
-            add category int default 0 not null comment '演练类型,0:应急预案演练,1:灭火和应急疏散预案演练,2:其他' after id;
-    END IF;
+alter table core_drill_plan
+    add category int default 0 not null comment '演练类型,0:应急预案演练,1:灭火和应急疏散预案演练,2:其他' after id;
+END IF;
 
     -- 演练任务表新增字段 演练类型
     IF NOT EXISTS(SELECT *
@@ -681,12 +681,12 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_drill_task'
                     AND column_name = 'category') THEN
-        alter table core_drill_task
-            add category int default 0 not null comment '演练类型,0:应急预案演练,1:灭火和应急疏散预案演练,2:其他' after id;
-        -- 修改表字段释义
-        alter table core_drill_task
-            modify type int null comment '演练项目';
-    END IF;
+alter table core_drill_task
+    add category int default 0 not null comment '演练类型,0:应急预案演练,1:灭火和应急疏散预案演练,2:其他' after id;
+-- 修改表字段释义
+alter table core_drill_task
+    modify type int null comment '演练项目';
+END IF;
 
     -- 隐患问题增加来源任务的任务类型字段
     IF NOT EXISTS(SELECT *
@@ -694,14 +694,14 @@ END IF;
                   WHERE table_schema = DATABASE()
                     AND table_name = 'core_question'
                     AND column_name = 'src_task_type') THEN
-        ALTER TABLE `core_question` 
-			ADD COLUMN `src_task_type` int NULL COMMENT '来源任务的任务类型' AFTER `src_type`;
-		update core_question set src_task_type=(SELECT p.plan_type FROM core_resumption r INNER JOIN core_resumption_plan p on r.plan_id=p.id WHERE r.id=core_question.src_task_id) WHERE src_task_type is null and src_type=1;
-		update core_question set src_task_type=(SELECT p.check_type FROM core_safety_task r INNER JOIN core_safecheck_plan p on r.plan_id=p.id WHERE r.id=core_question.src_task_id) WHERE src_task_type is null and src_type=2;
-    END IF;
+ALTER TABLE `core_question`
+    ADD COLUMN `src_task_type` int NULL COMMENT '来源任务的任务类型' AFTER `src_type`;
+update core_question set src_task_type=(SELECT p.plan_type FROM core_resumption r INNER JOIN core_resumption_plan p on r.plan_id=p.id WHERE r.id=core_question.src_task_id) WHERE src_task_type is null and src_type=1;
+update core_question set src_task_type=(SELECT p.check_type FROM core_safety_task r INNER JOIN core_safecheck_plan p on r.plan_id=p.id WHERE r.id=core_question.src_task_id) WHERE src_task_type is null and src_type=2;
+END IF;
 
 
-    END ??
+END ??
 DELIMITER;
 CALL schema_change ();
 
@@ -721,7 +721,7 @@ UPDATE sys_menu t SET t.menu_name = '教育培训任务下发' WHERE t.menu_name
 UPDATE sys_menu t SET t.menu_name = '教育培训任务查询' WHERE t.menu_name = '教育培训计划查询' limit 1;
 UPDATE sys_menu t SET t.menu_name = '教育培训任务导出' WHERE t.menu_name = '教育培训计划导出' limit 1;
 update sys_menu set menu_name='培训登记跟踪' where menu_name='培训任务管理' limit 1;
- -- 培训计划菜单名称修改
+-- 培训计划菜单名称修改
 update sys_menu set menu_name ='培训登记查询' where perms='core:eduTask:list' and menu_name='查询' limit 1;
 update sys_menu set menu_name ='培训登记新增' where perms='core:eduTask:add' and menu_name='新增' limit 1;
 update sys_menu set menu_name ='培训登记编辑' where perms='core:eduTask:edit' and menu_name='编辑' limit 1;
@@ -828,7 +828,7 @@ INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type
 
 -- 报警控制器
 ALTER TABLE `core_protection_log`
-MODIFY COLUMN `status_updator_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上报人姓名' AFTER `status_updator_id`;
+    MODIFY COLUMN `status_updator_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '上报人姓名' AFTER `status_updator_id`;
 -- 修改安全指数机构分数表机构path字段长度
 alter table core_safe_month_score modify org_path varchar(225) null comment '机构path';
 DELETE FROM sys_menu WHERE id IN(01724607752400044034,01723993298998222849,01719287834364436482,01719288533101928450,01719892877586239490,01720000571298115585,1722135552494403586,01722523915868221442,01724355771043504129,01726904309791121409);
@@ -1380,6 +1380,11 @@ MODIFY COLUMN `reform_status` int NULL DEFAULT NULL COMMENT '整改状态。10
 delete from `sys_dict_data` Where dict_type='question_reform_status' and dict_value=12;
 INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (3, '已逾期', '12', 'question_reform_status', NULL, 'default', 'N', '0', 'jwx', '2023-11-22 14:23:36', '', NULL, NULL);
 
+ALTER TABLE `core_question`
+    MODIFY COLUMN `reform_status` int NULL DEFAULT NULL COMMENT '整改状态。10待整改，11已整改,12已逾期' AFTER `confirm_status`;
+delete from `sys_dict_data` Where dict_type='question_reform_status' and dict_value=12;
+INSERT INTO `sys_dict_data` (`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (3, '已逾期', '12', 'question_reform_status', NULL, 'default', 'N', '0', 'jwx', '2023-11-22 14:23:36', '', NULL, NULL);
+
 DELIMITER ??
 DROP PROCEDURE IF EXISTS schema_change ??
 CREATE PROCEDURE schema_change () BEGIN
@@ -1448,7 +1453,7 @@ END ??
 DELIMITER;
 CALL schema_change ();
 
-UPDATE `sys_menu` SET `menu_name` = '来访管理',`icon`='#' WHERE `menu_name` = '出入管理' AND `parent_id` = 0 AND platform_type=1;
+UPDATE `sys_menu` SET `menu_name` = '来访管理',`icon`='link' WHERE `menu_name` = '出入管理' AND `parent_id` = 0 AND platform_type=1;
 UPDATE `sys_menu` SET `menu_name` = '来访•核验',`order_num`=2  WHERE `menu_name` = '来访' AND `parent_id` = 0 AND platform_type=0;
 
 -- 调整移动端菜单分组 开始

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/RemoteRoleService.java

@@ -37,7 +37,7 @@ public interface RemoteRoleService {
     List<IdNameVo> getNames(@RequestBody RoleConditionEto condition);
 
     @GetMapping("/role/selectUserByRoleNameAndOrgId")
-    List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName, @RequestParam(value = "orgId") Long orgId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName, @RequestParam(value = "orgId") Long orgId,@RequestParam(value = "isLock") Integer isLock, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
     @GetMapping("/userRole/getUserRoleId")
     List<Long> getUserRoleId(@RequestParam(value = "userId") Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/factory/RemoteRoleFallbackFactory.java

@@ -48,7 +48,7 @@ public class RemoteRoleFallbackFactory implements FallbackFactory<RemoteRoleServ
             }
 
             @Override
-            public List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId, String inner) {
+            public List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId, Integer isLock,String inner) {
                 return null;
             }
 

soc-auth/src/main/java/com/xunmei/auth/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.auth.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-gateway/src/main/java/com/xunmei/gateway/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.gateway.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/controller/CoreMonitoringTaskRegistrationController.java

@@ -1,83 +0,0 @@
-package com.xunmei.core.access.controller;
-
-
-import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
-
-import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationMonitorService;
-import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.xunmei.common.log.annotation.Log;
-import com.xunmei.common.log.enums.BusinessType;
-import com.xunmei.common.security.annotation.RequiresPermissions;
-
-import com.xunmei.common.core.web.controller.BaseController;
-import com.xunmei.common.core.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.context.annotation.Lazy;
-
-/**
- * 【请填写功能名称】Controller
- *
- * @author xunmei
- * @date 2023-08-28
- */
-@Api(tags = {"CoreMonitoringTaskRegistration"})
-@RestController
-@RequestMapping("/registration")
-public class CoreMonitoringTaskRegistrationController extends BaseController {
-    @Autowired
-    private ICoreMonitoringTaskRegistrationService iCoreMonitoringTaskRegistrationService;//扫描
-    @Autowired
-    private ICoreMonitoringTaskRegistrationMonitorService iCoreMonitoringTaskRegistrationMonitorService;//监控
-
-    /**
-     * 查询【请填写功能名称】列表
-     */
-    @ApiOperation(value = "查询CoreMonitoringTaskRegistration列表")
-  //  @RequiresPermissions("core:registration:list")
-    @GetMapping("/list")
-    public AjaxResult list(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-        return success(iCoreMonitoringTaskRegistrationMonitorService.selectCoreMonitoringTaskRegistrationList(coreMonitoringTaskRegistration.getTaskId()));
-    }
-
-    /**
-     * 获取【请填写功能名称】详细信息
-     */
-    @ApiOperation(value = "获取CoreMonitoringTaskRegistration详细信息")
-   // @RequiresPermissions("core:registration:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(iCoreMonitoringTaskRegistrationService.selectCoreMonitoringTaskRegistrationById(id));
-    }
-
-    /**
-     * 新增【调阅任务登记NCF开始】
-     */
-    @ApiOperation(value = "新增CoreMonitoringTaskRegistration")
- //   @RequiresPermissions("core:registration:add")
-    @Log(title = "【调阅任务登记NCF开始】", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-        return toAjax(iCoreMonitoringTaskRegistrationService.insertCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
-    }
-
-    /**
-     * 修改【请填写功能名称】
-     */
-    @ApiOperation(value = "修改CoreMonitoringTaskRegistration")
-    @PutMapping
-    public AjaxResult edit(@RequestBody CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-        return toAjax(iCoreMonitoringTaskRegistrationService.updateCoreMonitoringTaskRegistration(coreMonitoringTaskRegistration));
-    }
-
-}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/CoreMonitoringTaskRegistrationServiceImpl.java

@@ -1,164 +0,0 @@
-package com.xunmei.core.access.service.impl;
-
-
-import com.alibaba.nacos.common.utils.CollectionUtils;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.domain.retrieval.domain.CoreMonitoringRetrievalTask;
-import com.xunmei.common.core.exception.ServiceException;
-import com.xunmei.common.core.utils.DateUtils;
-import com.xunmei.common.core.utils.StringUtils;
-import com.xunmei.common.core.utils.bean.BeanUtils;
-import com.xunmei.common.security.utils.SecurityUtils;
-import com.xunmei.core.access.domain.CoreMonitoringTaskRegistration;
-import com.xunmei.core.access.mapper.CoreMonitoringTaskMonitorInfoMapper;
-import com.xunmei.core.access.mapper.CoreMonitoringTaskRegistrationMapper;
-import com.xunmei.core.access.service.ICoreMonitoringTaskRegistrationService;
-import com.xunmei.core.access.vo.CoreMonitoringTaskRegistrationVO;
-import com.xunmei.core.retrieval.mapper.CoreMonitoringRetrievalTaskMapper;
-import com.xunmei.core.retrieval.service.ICoreMonitoringRetrievalTaskService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * 【请填写功能名称】Service业务层处理
- *
- * @author xunmei
- * @date 2023-08-28
- */
-@Service
-public class CoreMonitoringTaskRegistrationServiceImpl extends ServiceImpl<CoreMonitoringTaskRegistrationMapper, CoreMonitoringTaskRegistration> implements ICoreMonitoringTaskRegistrationService {
-    private static final String ONE = "1";
-    private static final String TWO = "2";
-    @Autowired
-    private CoreMonitoringTaskRegistrationMapper coreMonitoringTaskRegistrationMapper;
-    @Autowired
-    private ICoreMonitoringRetrievalTaskService iCoreMonitoringRetrievalTaskService;//任务
-    @Autowired
-    private CoreMonitoringRetrievalTaskMapper coreMonitoringRetrievalTaskMapper;//任务
-    @Autowired
-    private CoreMonitoringTaskMonitorInfoMapper coreMonitoringTaskMonitorInfoMapper;//项目
-
-    /**
-     * 查询【请填写功能名称】
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 【请填写功能名称】
-     */
-    @Override
-    public CoreMonitoringTaskRegistrationVO selectCoreMonitoringTaskRegistrationById(Long id) {
-        CoreMonitoringTaskRegistrationVO coreMonitoringTaskRegistrationVO = new CoreMonitoringTaskRegistrationVO();
-        CoreMonitoringTaskRegistration coreMonitoringTaskRegistration = coreMonitoringTaskRegistrationMapper.selectById(id);
-        BeanUtils.copyProperties(coreMonitoringTaskRegistration, coreMonitoringTaskRegistrationVO);
-        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = iCoreMonitoringRetrievalTaskService.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
-        coreMonitoringTaskRegistrationVO.setTaskName(coreMonitoringRetrievalTask.getTaskName());
-        return coreMonitoringTaskRegistrationVO;
-    }
-
-    /**
-     * 查询【请填写功能名称】列表
-     *
-     * @param coreMonitoringTaskRegistration 【请填写功能名称】
-     * @return 【请填写功能名称】
-     */
-    @Override
-    public List<CoreMonitoringTaskRegistration> selectCoreMonitoringTaskRegistrationList(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-        return coreMonitoringTaskRegistrationMapper.selectList(new QueryWrapper<>(coreMonitoringTaskRegistration));
-    }
-
-    /**
-     * 新增【请填写功能名称】
-     *
-     * @param coreMonitoringTaskRegistration 【请填写功能名称】
-     * @return 结果
-     */
-    @Override
-    public int insertCoreMonitoringTaskRegistration(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-        //jiaoyan
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("task_id", coreMonitoringTaskRegistration.getTaskId());
-        queryWrapper.eq("del_flag", 0);
-        List<CoreMonitoringTaskRegistration> list = baseMapper.selectList(queryWrapper);
-        if (CollectionUtils.isNotEmpty(list)) {
-            if (StringUtils.isEmpty(coreMonitoringTaskRegistration.getEndNfc()) && StringUtils.isEmpty(coreMonitoringTaskRegistration.getEndPicture())) {
-                throw new ServiceException("请勿重复扫描");
-            }
-            CoreMonitoringTaskRegistration coreMonitoringTaskRegistration1 = list.get(0);
-            coreMonitoringTaskRegistration1.setEndPicture(coreMonitoringTaskRegistration.getEndPicture());
-            coreMonitoringTaskRegistration1.setEndNfc(coreMonitoringTaskRegistration.getEndNfc());
-            Long time = DateUtils.getNowDate().getTime() - coreMonitoringTaskRegistration1.getTaskStartTime().getTime();
-            Double avg = (double) time / 1000 / 3600;
-            coreMonitoringTaskRegistration1.setAverageDuration(Double.valueOf(String.format("%.2f", avg)));
-            return baseMapper.updateById(coreMonitoringTaskRegistration1);
-        } else {
-            coreMonitoringTaskRegistration.setCreateTime(DateUtils.getNowDate());
-            coreMonitoringTaskRegistration.setTaskStartTime(DateUtils.getNowDate());
-            coreMonitoringTaskRegistration.setDelFlag("0");
-            coreMonitoringTaskRegistration.setCreateBy(SecurityUtils.getUsername());
-            //修改任务状态为进行中
-            CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskMapper.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
-            coreMonitoringRetrievalTask.setStatus(ONE);
-            coreMonitoringRetrievalTask.setStartTime(DateUtils.getNowDate());
-            coreMonitoringRetrievalTaskMapper.updateById(coreMonitoringRetrievalTask);
-            coreMonitoringTaskRegistration.setId(IdWorker.getId());
-            return coreMonitoringTaskRegistrationMapper.insert(coreMonitoringTaskRegistration);
-        }
-
-    }
-
-    /**
-     * 修改【请填写功能名称】
-     *
-     * @param coreMonitoringTaskRegistration 【请填写功能名称】
-     * @return 结果
-     */
-    @Override
-    public int updateCoreMonitoringTaskRegistration(CoreMonitoringTaskRegistration coreMonitoringTaskRegistration) {
-        coreMonitoringTaskRegistration.setUpdateTime(DateUtils.getNowDate());
-        coreMonitoringTaskRegistration.setUpdateBy(SecurityUtils.getUsername());
-        //修改任务状态已完成
-        CoreMonitoringRetrievalTask coreMonitoringRetrievalTask = coreMonitoringRetrievalTaskMapper.selectCoreMonitoringRetrievalTaskById(coreMonitoringTaskRegistration.getTaskId());
-        coreMonitoringRetrievalTask.setStatus(TWO);
-        coreMonitoringRetrievalTask.setEndTime(DateUtils.getNowDate());
-        coreMonitoringRetrievalTask.setUpdateBy(SecurityUtils.getUsername());
-        coreMonitoringRetrievalTask.setUpdateTime(DateUtils.getNowDate());
-        coreMonitoringRetrievalTask.setSubmitTime(DateUtils.getNowDate());
-        coreMonitoringRetrievalTask.setRetrievalUser(SecurityUtils.getUserId());
-        int i = coreMonitoringTaskMonitorInfoMapper.selectAbnormalByTaskId(coreMonitoringTaskRegistration.getTaskId());
-        coreMonitoringRetrievalTask.setExceptionCount(i);
-        coreMonitoringRetrievalTaskMapper.updateCoreMonitoringRetrievalTask(coreMonitoringRetrievalTask);
-        return coreMonitoringTaskRegistrationMapper.updateById(coreMonitoringTaskRegistration);
-    }
-
-    /**
-     * 批量删除【请填写功能名称】
-     *
-     * @param ids 需要删除的【请填写功能名称】主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCoreMonitoringTaskRegistrationByIds(Long[] ids) {
-        return coreMonitoringTaskRegistrationMapper.deleteBatchIds(Arrays.asList((ids)));
-    }
-
-    /**
-     * 删除【请填写功能名称】信息
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCoreMonitoringTaskRegistrationById(Long id) {
-        return coreMonitoringTaskRegistrationMapper.deleteById(id);
-    }
-
-    @Override
-    public void deleteByTaskId(Long taskId) {
-        coreMonitoringTaskRegistrationMapper.deleteByTaskId(taskId);
-    }
-}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.core.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -284,7 +284,7 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         }
         CoreDrillTask finalCoreDrillTask = coreDrillTask;
         List<SysUser> userList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-                roleService.selectUserByRoleNameAndOrgId("网点负责人", finalCoreDrillTask.getOrgId(), SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
+                roleService.selectUserByRoleNameAndOrgId("网点负责人", finalCoreDrillTask.getOrgId(),0, SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
         if (ObjectUtil.isNotEmpty(userList)) {
             coreDrillTask.setHostId(userList.get(0).getId());
         } else {

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -362,7 +362,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
     private Long getHostUserId(Long orgId) {
         List<SysUser> userList = RemoteCallHandlerExecutor.executeRemoteCall(() ->
-                roleService.selectUserByRoleNameAndOrgId("网点负责人", orgId, SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
+                roleService.selectUserByRoleNameAndOrgId("网点负责人", orgId,0, SecurityConstants.INNER), ErrorMsgConstants.QUERY_USER_DATA_ERROR);
         if (ObjectUtil.isNotEmpty(userList)) {
             return userList.get(0).getId();
         } else {
@@ -491,7 +491,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             int x = 0;
             for (int i = 1; i <= plan.getExecTimes(); i++) {
                 final LocalDateTime time = DateUtils.toLocalDateTime(DateUtils.getPreciseTime(dateRangeMap.get(i).getEndTime()));
-                if (time.isBefore(LocalDateTime.now()) || orgTypeList.contains(org.getType())) {
+                if (time.isBefore(LocalDateTime.now()) && orgTypeList.contains(org.getType())) {
                     //如果任务的结束时间 已经小于当前时间则没必要生成任务了,
                     //用于处理周期中生成多次任务,周期初的任务一经生成就无法执行(预期)的问题,
                     log.warn("生成任务时，任务的结束时间已经小于当前时间,本次任务跳过,任务id:{},任务执行机构id:{},任务时间范围:{}-{}", plan.getId(), org.getId(), dateRangeMap.get(i).getStartTime(), dateRangeMap.get(i).getEndTime());

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -71,13 +71,13 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
         });
         return TableDataInfo.build(report);
     }
-public static String getWeekStart(){
+    public static String getWeekStart(){
         Calendar cal=Calendar.getInstance();
         cal.add(Calendar.WEEK_OF_MONTH,0);
         cal.set(Calendar.DAY_OF_WEEK,2);
         Date time=cal.getTime();
         return new SimpleDateFormat("yyyy-MM-dd").format(time);
-}
+    }
     public static String getWeekEnd(){
         Calendar cal=Calendar.getInstance();
         cal.set(Calendar.DAY_OF_WEEK,cal.getActualMaximum(Calendar.DAY_OF_WEEK));

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/MonitorAccessReportMapper.xml

@@ -64,10 +64,10 @@
         SELECT
         IFNULL( ROUND( SUM( a.average_duration )/ COUNT( a.id ), 2 ), 0 )
         FROM
-            core_monitoring_task_registration a
-                LEFT JOIN core_monitoring_retrieval_task b ON a.task_id = b.id
+        core_monitoring_task_registration a
+        LEFT JOIN core_monitoring_retrieval_task b ON a.task_id = b.id
         WHERE
-            b.`status` = 2
+        b.`status` = 2
         <if test="orgPath != null  and orgPath != ''">
             and     b.org_path like concat( #{orgPath}, '%')
         </if>
@@ -76,4 +76,4 @@
         </if>
     </select>
 
-</mapper>
+</mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/SafetyInspectMapper.xml

@@ -29,7 +29,7 @@
             AND   a.ymd_year = #{year}
         </if>
         GROUP BY
-       b.id
+        b.id
     </select>
     <select id="report" resultType="com.xunmei.core.reportForms.safetyInspect.vo.SafetyInspectVO">
         SELECT
@@ -47,10 +47,10 @@
         LEFT JOIN core_safety_task a ON a.org_id = b.id
         AND a.deleted = 0
         WHERE
-       1=1
-      <if test="safetyInspectDTO.orgId != null  and safetyInspectDTO.orgId != ''">
-          AND b.parent_id = #{safetyInspectDTO.orgId}
-      </if>
+        1=1
+        <if test="safetyInspectDTO.orgId != null  and safetyInspectDTO.orgId != ''">
+            AND b.parent_id = #{safetyInspectDTO.orgId}
+        </if>
         <if test="safetyInspectDTO.year != null  and safetyInspectDTO.year != ''">
             AND   a.ymd_year = #{safetyInspectDTO.year}
         </if>
@@ -66,11 +66,11 @@
     </select>
     <select id="selectAllByPath" resultType="com.xunmei.core.reportForms.safetyInspect.vo.SafetyInspectVO">
         SELECT
-            IFNULL( COUNT( a.id ), 0 ) AS planInspectNumber,
-            IFNULL(       SUM(
-                    IF
-                        ( a.`status` = 3, 1, 0 )),0) AS realityInspectNumber,
-            IFNULL( SUM( a.exception_count ), 0 ) AS pitfallNumber,
+        IFNULL( COUNT( a.id ), 0 ) AS planInspectNumber,
+        IFNULL(       SUM(
+        IF
+        ( a.`status` = 3, 1, 0 )),0) AS realityInspectNumber,
+        IFNULL( SUM( a.exception_count ), 0 ) AS pitfallNumber,
         IFNULL(
         IF
         (
@@ -107,56 +107,56 @@
     </select>
     <select id="orgDimension" resultType="java.util.Map">
         SELECT
-            COUNT( a.id ) AS planInspectOrg,
-            IFNULL( SUM( IF ( a.`status` = 1, 1, 0 )), 0 ) AS realityInspectOrg,
-            IFNULL(
-                    CONCAT(
-                            ROUND( SUM( IF ( a.`status` = 1, 1, 0 ))/ COUNT( a.id )* 100, 2 ),
-                            '%'
-                        ),
-                    '0%'
-                ) AS inspectCoverRate
+        COUNT( a.id ) AS planInspectOrg,
+        IFNULL( SUM( IF ( a.`status` = 1, 1, 0 )), 0 ) AS realityInspectOrg,
+        IFNULL(
+        CONCAT(
+        ROUND( SUM( IF ( a.`status` = 1, 1, 0 ))/ COUNT( a.id )* 100, 2 ),
+        '%'
+        ),
+        '0%'
+        ) AS inspectCoverRate
         FROM
-            core_safety_task a
-                LEFT JOIN core_safecheck_plan b ON a.plan_id = b.id
-                LEFT JOIN sys_org c ON a.org_id = c.id
+        core_safety_task a
+        LEFT JOIN core_safecheck_plan b ON a.plan_id = b.id
+        LEFT JOIN sys_org c ON a.org_id = c.id
         WHERE
-            a.deleted = 0
-          <if test="orgPath !=null and orgPath !=''">
-              and a.org_path like concat(#{orgPath},'%')
-          </if>
-          <if test="year !=null and year !=''">
-              AND a.ymd_year = #{year}
-          </if>
-         <if test="orgType !=null">
-             AND c.type = #{orgType}
-         </if>
+        a.deleted = 0
+        <if test="orgPath !=null and orgPath !=''">
+            and a.org_path like concat(#{orgPath},'%')
+        </if>
+        <if test="year !=null and year !=''">
+            AND a.ymd_year = #{year}
+        </if>
+        <if test="orgType !=null">
+            AND c.type = #{orgType}
+        </if>
 
     </select>
     <select id="pitfallDimension" resultType="java.util.Map">
         SELECT
-            IFNULL( SUM( IF ( a.confirm_status >= 2, 1, 0 )), 0 ) AS pitfallNumber,
-            IFNULL( SUM( IF ( a.reform_status = 11, 1, 0 )), 0 ) AS rectificationNumber,
-            IFNULL(
-                    CONCAT(
-                            ROUND(
-                                            SUM(
-                                                    IF
-                                                        ( a.reform_status = 11, 1, 0 ))/ SUM(
-                                                    IF
-                                                        ( a.confirm_status >= 2, 1, 0 ))* 100,
-                                            2
-                                ),
-                            '%'
-                        ),
-                    '0%'
-                ) AS rectificationRate
+        IFNULL( SUM( IF ( a.confirm_status >= 2, 1, 0 )), 0 ) AS pitfallNumber,
+        IFNULL( SUM( IF ( a.reform_status = 11, 1, 0 )), 0 ) AS rectificationNumber,
+        IFNULL(
+        CONCAT(
+        ROUND(
+        SUM(
+        IF
+        ( a.reform_status = 11, 1, 0 ))/ SUM(
+        IF
+        ( a.confirm_status >= 2, 1, 0 ))* 100,
+        2
+        ),
+        '%'
+        ),
+        '0%'
+        ) AS rectificationRate
         FROM
-            core_question a
-                LEFT JOIN sys_org b ON a.org_id = b.id
-                LEFT JOIN core_safety_task c ON c.id = a.src_task_id
+        core_question a
+        LEFT JOIN sys_org b ON a.org_id = b.id
+        LEFT JOIN core_safety_task c ON c.id = a.src_task_id
         WHERE
-            a.src_type = 2
+        a.src_type = 2
         <if test="orgPath !=null and orgPath !=''">
             and a.org_path like concat(#{orgPath},'%')
         </if>

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.file.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-job/src/main/java/com/xunmei/job/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.job.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-sync/src/main/java/com/xunmei/sync/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.sync.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysRoleController.java

@@ -270,8 +270,8 @@ public class SysRoleController extends BaseController {
     }
 
     @GetMapping("/selectUserByRoleNameAndOrgId")
-    public List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName, @RequestParam(value = "orgId") Long orgId) {
-        return roleService.selectUserByRoleNameAndOrgId(roleName, orgId);
+    public List<SysUser> selectUserByRoleNameAndOrgId(@RequestParam(value = "roleName") String roleName, @RequestParam(value = "orgId") Long orgId,@RequestParam(value = "isLock") Integer isLock) {
+        return roleService.selectUserByRoleNameAndOrgId(roleName, orgId,isLock);
     }
 
     @GetMapping("/getRoles")

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/VersionController.java

@@ -0,0 +1,21 @@
+package com.xunmei.system.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @author gaoxiong
+ * @Title: 获取当前服务是否在线
+ * @Package
+ * @Description:
+ * @date 2023/11/2217:55
+ */
+@Controller
+@RequestMapping("/version")
+public class VersionController {
+
+    @RequestMapping
+    public String getVersion(){
+        return "未设置";
+    }
+}

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysConfigMapper.java

@@ -2,6 +2,7 @@ package com.xunmei.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.api.domain.SysConfig;
+import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
@@ -10,6 +11,7 @@ import java.util.List;
  * 
  * @author xunmei
  */
+@Mapper
 public interface SysConfigMapper extends BaseMapper<SysConfig>
 {
     /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysRoleMapper.java

@@ -112,7 +112,7 @@ String selectRoleNameByUserId(Long userId);
      */
      int deleteRoleByIds(Long[] roleIds);
 
-    List<SysUser> selectUserByRoleNameAndOrgId(@Param("roleName") String roleName, @Param("orgId") Long orgId);
+    List<SysUser> selectUserByRoleNameAndOrgId(@Param("roleName") String roleName, @Param("orgId") Long orgId,@Param("isLock") Integer isLock);
 
     /**
      * 查询机构下可用的角色

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/ISysRoleService.java

@@ -192,7 +192,7 @@ String selectRoleNameByUserId(Long userId);
 
     List<SysRole> getRoleByType(String type) ;
 
-    List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId);
+    List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId,Integer isLock);
 
     /**
      * 缓存角色数据

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysConfigServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 
@@ -28,7 +29,7 @@ import java.util.List;
 @Service
 public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService
 {
-    @Autowired
+    @Resource
     private SysConfigMapper configMapper;
 
 

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysRoleServiceImpl.java

@@ -468,8 +468,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     @Override
-    public List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId) {
-        return roleMapper.selectUserByRoleNameAndOrgId(roleName, orgId);
+    public List<SysUser> selectUserByRoleNameAndOrgId(String roleName, Long orgId,Integer isLock) {
+        return roleMapper.selectUserByRoleNameAndOrgId(roleName, orgId,isLock);
     }
 
     @Override

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -255,6 +255,9 @@
                  inner join sys_role r on ur.role_id = r.id
         where r.role_name = #{roleName}
           and o.id = #{orgId}
+        <if test="isLock != null">
+            and u.isLock= #{isLock}
+        </if>
     </select>
     <select id="getNamesByOrgId" resultType="com.xunmei.common.core.vo.IdNameVo">
         select r.id,r.role_name as name