Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java

@@ -69,7 +69,7 @@ public class ControllerAop {
             return;
         }
         if (token != null) {
-            String pattern = buildPatternKey(token);
+            String pattern = RedisKey.buildPatternKey(token);
             //验证token有效性，防止token失效
             AgencyUserModel userModel;
             try {
@@ -89,10 +89,6 @@ public class ControllerAop {
         }
     }
 
-    private String buildPatternKey(String token) {
-        return "region_" + "*" + "_" + token;
-    }
-
     private void saveUserRedis(AgencyUserModel user, String token) {
         String authToken = RedisKey.buildReginKey(user.getUserId(), token);
         if (redisUtils.hasKey(authToken)) {

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/utils/RedisKey.java

@@ -37,12 +37,25 @@ public class RedisKey {
 	}
 
     /**
-     * 创建redis key
+     * 用户新缓存前缀
+     */
+	public static final String REGION_REDIS_PREFIX = "biz_";
+    /**
+     * 创建区域key
      * @param token
      * @return String
      */
     public static String buildReginKey(String userId, String token) {
-        return "biz_" + userId + "_" + token;
+        return REGION_REDIS_PREFIX + userId + "_" + token;
+    }
+
+    /**
+     * 模糊重新区域key
+     * @param token
+     * @return
+     */
+    public static String buildPatternKey(String token) {
+        return REGION_REDIS_PREFIX + "*" + "_" + token;
     }
     
     /**

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml

@@ -15,8 +15,8 @@
         select a.*,b.areas_expertise areasExpertise ,b.areas_expertise_code areasExpertiseCode from cb_firefighters a LEFT JOIN cb_firefighters_post b on
         a.sequence_nbr=b.firefighters_id where a.is_delete=0
         <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
-        <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}"</if>
-        <if test='par.name!=null'>and a.name= #{par.name}</if>
+        <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}</if>
+        <if test='par.name!=null'>and a.name like concat ('%',#{par.name},'%')</if>
         <if test='par.state!=null'>and a.state_code= #{par.state}</if>
         <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
         <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>
@@ -30,8 +30,8 @@
         cb_firefighters_post b on a.sequence_nbr=b.firefighters_id where
         a.is_delete=0
         <if test='par.postQualification!=null'>and b.post_qualification_code = #{par.postQualification}</if>
-        <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}"</if>
-        <if test='par.name!=null'>and a.name= #{par.name}</if>
+        <if test='par.areasExpertise!=null'>and b.areas_expertise_code= #{par.areasExpertise}</if>
+        <if test='par.name!=null'>and a.name like concat ('%',#{par.name},'%')</if>
         <if test='par.state!=null'>and a.state_code= #{par.state}</if>
         <if test='par.fireTeamId!=null'>and a.fire_team_id= #{par.fireTeamId}</if>
         <if test='par.jobTitle!=null'>and a.job_title_code =#{par.jobTitle}</if>

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -272,38 +272,102 @@ WHERE
 <select id="getCompanyAndCountDepartment" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrTreeDto">
 
 SELECT
-	company_sur.sequence_nbr as sequenceNbr,
-	company_sur.biz_org_name as bizOrgName ,
-	company_sur.parent_id as parentId,
-	CASE
-	WHEN keysite_sur.num IS NULL THEN
+	result_main.sequenceNbr AS sequenceNbr,
+	result_main.bizOrgName AS bizOrgName,
+	result_main.parentId AS parentId,
+	result_main.num1 + result_main.num2 AS num
+FROM
+	(
+		SELECT
+			CASE
+		WHEN result1.num IS NULL THEN
+			0
+		ELSE
+			result1.num
+		END AS num1,
+		CASE
+	WHEN result2.num IS NULL THEN
 		0
 	ELSE
-		keysite_sur.num
-	END AS num
+		result2.num
+	END AS num2,
+	result1.sequenceNbr,
+	result1.bizOrgName,
+	result1.parentId
 FROM
 	(
 		SELECT
-			company.sequence_nbr,
-			company.parent_id,
-			company.biz_org_name
+			company_sur.sequence_nbr AS sequenceNbr,
+			company_sur.biz_org_name AS bizOrgName,
+			company_sur.parent_id AS parentId,
+			CASE
+		WHEN keysite_sur.num IS NULL THEN
+			0
+		ELSE
+			keysite_sur.num
+		END AS num
 		FROM
-			cb_org_usr company
-		WHERE
-			company.biz_org_type = 'COMPANY'
-		AND company.is_delete = FALSE
-	) company_sur
+			(
+				SELECT
+					company.sequence_nbr,
+					company.parent_id,
+					company.biz_org_name
+				FROM
+					cb_org_usr company
+				WHERE
+					company.biz_org_type = 'COMPANY'
+				AND company.is_delete = FALSE
+			) company_sur
+		LEFT JOIN (
+			SELECT
+				keysite.belong_id,
+				COUNT(keysite.belong_id) AS num
+			FROM
+				cb_key_site keysite
+			WHERE
+				keysite.is_delete = FALSE
+			GROUP BY
+				keysite.belong_id
+		) keysite_sur ON company_sur.sequence_nbr = keysite_sur.belong_id
+	) result1
 LEFT JOIN (
 	SELECT
-		keysite.belong_id,
-    COUNT(keysite.belong_id) as num
-	FROM 
-		cb_key_site keysite
-	WHERE
-	 keysite.is_delete = FALSE
-	GROUP BY
-		keysite.belong_id
-) keysite_sur ON company_sur.sequence_nbr = keysite_sur.belong_id
+		company_sur.sequence_nbr AS sequenceNbr,
+		company_sur.biz_org_name AS bizOrgName,
+		company_sur.parent_id AS parentId,
+		CASE
+	WHEN keysite_sur.num IS NULL THEN
+		0
+	ELSE
+		keysite_sur.num
+	END AS num
+	FROM
+		(
+			SELECT
+				company.sequence_nbr,
+				company.parent_id,
+				company.biz_org_name
+			FROM
+				cb_org_usr company
+			WHERE
+				company.biz_org_type = 'COMPANY'
+			AND company.is_delete = FALSE
+		) company_sur
+	LEFT JOIN (
+		SELECT
+			keysite.belong_id,
+			COUNT(keysite.belong_id) AS num
+		FROM
+			cb_key_site keysite
+		WHERE
+			keysite.is_delete = FALSE
+		GROUP BY
+			keysite.belong_id
+	) keysite_sur ON company_sur.sequence_nbr = keysite_sur.belong_id
+) result2 ON result1.sequenceNbr = result2.parentId
+	) result_main
+GROUP BY
+	result_main.sequenceNbr
 </select>
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java

@@ -454,7 +454,7 @@ public class CheckServiceImpl implements ICheckService {
                 target.put("planTypeDesc", planTypeEnum != null ? planTypeEnum.getName() : "");
             }
             if (StringUtil.isNotEmpty(r.getIsOk())) {
-                CheckStatusEnum checkStatusEnum = CheckStatusEnum.getEnum(r.getPlanType());
+                CheckStatusEnum checkStatusEnum = CheckStatusEnum.getEnum(r.getIsOk());
                 target.put("isOkDesc", checkStatusEnum != null ? checkStatusEnum.getName() : "");
             }
             return target;

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/pom.xml

@@ -104,6 +104,10 @@
 			<artifactId>hutool-all</artifactId>
 			<version>5.5.1</version>
 		</dependency>
+		<dependency>
+			<groupId>org.liquibase</groupId>
+			<artifactId>liquibase-core</artifactId>
+		</dependency>
 	</dependencies>
 
 </project>

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -163,7 +163,11 @@
 	</changeSet>
 	<changeSet author="litengwei" id="2021-09-01-litengwei-1">
 		<preConditions onFail="MARK_RAN">
+
+			<tableExists tableName="cb_data_dictionary" />
+
 			<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
+
 		</preConditions>
 		<comment>add data cb_data_dictionary</comment>
 		<sql>
@@ -186,7 +190,11 @@
 	</changeSet>
 	<changeSet author="litengwei" id="2021-09-01-litengwei-2">
 		<preConditions onFail="MARK_RAN">
+
+			<tableExists tableName="jc_alert_form" />
+
 			<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
+
 		</preConditions>
 		<comment>add data jc_alert_form</comment>
 		<sql>
@@ -198,7 +206,11 @@
 	</changeSet>
 	<changeSet author="litengwei" id="2021-09-01-litengwei-3">
 		<preConditions onFail="MARK_RAN">
+
+			<tableExists tableName="jc_alert_form" />
+
 			<primaryKeyExists primaryKeyName="sequence_nbr" tableName="cb_data_dictionary"/>
+
 		</preConditions>
 		<comment>update data jc_alert_form</comment>
 		<sql>

amos-boot-system-maintenance/src/main/resources/db/changelog/mt-1.0.0.xml

@@ -190,6 +190,17 @@
             ALTER TABLE p_plan_task add COLUMN `company_name` varchar(255) DEFAULT NULL COMMENT '维保公司名称';
         </sql>
     </changeSet>
+    <changeSet author="suhuiguang" id="1630291249901-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="point_no"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN point_no '设备编号'</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN `point_no` bigint(20) DEFAULT NULL COMMENT '设备编号' after `point_name`;
+        </sql>
+    </changeSet>
     <changeSet author="suhuiguang" id="1630291249911-1">
         <preConditions onFail="MARK_RAN">
             <not>
@@ -201,6 +212,50 @@
             ALTER TABLE p_check add COLUMN `risk_and_manage` varchar(255) DEFAULT NULL COMMENT '风险辨识与管控措施' after `point_no`;
         </sql>
     </changeSet>
+    <changeSet author="suhuiguang" id="1630291249901-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="building_name"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN building_name '安装位置'</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN `building_name` varchar(255) DEFAULT NULL COMMENT '安装位置' after `risk_and_manage`;
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1630291249901-3">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="equipment_name"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN equipment_name '设备分类（装备定义名称）'</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN  `equipment_name` varchar(255) DEFAULT NULL COMMENT '设备分类（装备定义名称）' after `building_name`;
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1630291249901-4">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="owner_id"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN owner_id '业主单位'</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN  `owner_id` varchar(50) DEFAULT NULL COMMENT '业主单位' after `route_name`;
+        </sql>
+    </changeSet>
+    <changeSet author="suhuiguang" id="1630291249901-5">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="p_check" columnName="plan_type"/>
+            </not>
+        </preConditions>
+        <comment>p_check add COLUMN plan_type '计划类型：1-日，2-周，3-月，4-年'</comment>
+        <sql>
+            ALTER TABLE p_check add COLUMN `plan_type` varchar(255) DEFAULT NULL COMMENT '计划类型：1-日，2-周，3-月，4-年';
+        </sql>
+    </changeSet>
     <changeSet author="suhuiguang" id="1630291249911-2">
         <preConditions onFail="MARK_RAN">
             <not>

amos-boot-system-patrol/src/main/resources/db/changelog/patrol-sql-task.xml

@@ -544,12 +544,58 @@
 			END
 		</createProcedure>
 	</changeSet>
+	<changeSet author="gaojianqiang" id="1630567666-1" runAlways="true">
+		<comment>创建函数func_split_TotalLength</comment>
+		<sql  endDelimiter="#">
+			DROP function IF EXISTS `func_split_TotalLength`#
+			CREATE FUNCTION `func_split_TotalLength`(f_string varchar(1000),f_delimiter varchar(5)) RETURNS int(11)
+			BEGIN
+				return 1+(length(f_string) - length(replace(f_string,f_delimiter,'')));
+			END
+			#
+		</sql>
+	</changeSet>
+	<changeSet author="gaojianqiang" id="1630567666-2" runAlways="true">
+		<comment>创建函数func_split</comment>
+		<sql endDelimiter="#">
+			DROP function IF EXISTS `func_split`#
+			CREATE DEFINER=`root`@`%` FUNCTION `func_split`
+			(f_string varchar(1000),f_delimiter varchar(5),f_order int) RETURNS varchar(255) CHARSET utf8
+			BEGIN
+			declare result varchar(255) default '';
+			set result = reverse(substring_index(reverse(substring_index(f_string,f_delimiter,f_order)),f_delimiter,1));
+			return result;
+			END#
+		</sql>
+	</changeSet>
+	<changeSet author="gaojianqiang" id="1630567666-3" runAlways="true">
+		<createProcedure procedureName="splitString" >
+			DROP PROCEDURE IF EXISTS `splitString`;
+		</createProcedure>
+	</changeSet>
+	<changeSet author="gaojianqiang" id="1630567666-4" runAlways="true">
+		<createProcedure procedureName="splitString">
+			CREATE PROCEDURE `splitString` (IN f_string varchar(1000),IN f_delimiter varchar(5))
+			BEGIN
+			declare cnt int default 0;
+			declare i int default 0;
+			set cnt = func_split_TotalLength(f_string,f_delimiter);
+			DROP TABLE IF EXISTS `tmp_split`;
+			create table `tmp_split` (`status` varchar(128) not null) DEFAULT CHARSET=utf8;
+			while cnt > i
+					  do
+					  set i = i + 1;
+			insert into tmp_split(`status`) values (func_split(f_string,f_delimiter,i));
+			end while;
+			END
+		</createProcedure>
+	</changeSet>
 	<changeSet author="gaodongdong" id="1610421278000-24" runAlways="true">
 		<createProcedure procedureName="everyDayInitPlanTaskStatistics" >
 			DROP PROCEDURE IF EXISTS `everyDayInitPlanTaskStatistics`;
 		</createProcedure>
 	</changeSet>
-	<changeSet author="gaodongdong" id="1610421278000-25" runAlways="true">
+	<changeSet author="gaodongdong" id="1610421278000-26" runAlways="true">
 		<createProcedure procedureName="everyDayInitPlanTaskStatistics" >
 			CREATE PROCEDURE `everyDayInitPlanTaskStatistics`()
 			BEGIN
@@ -560,7 +606,7 @@
 			declare planTaskFinishNum BIGINT ;
 			declare personNum BIGINT ;
 			DECLARE done BOOLEAN DEFAULT 0;
-			DECLARE p_p_conf CURSOR FOR select id from s_user u where u.enabled = 1 AND u.is_delete = 0;
+			DECLARE p_p_conf CURSOR FOR select DISTINCT `status` AS id from tmp_split;
 			DECLARE CONTINUE HANDLER FOR NOT FOUND SET done=1;
 			set currentDate = SYSDATE();
 			open p_p_conf;
@@ -602,6 +648,29 @@
 			END
 		</createProcedure>
 	</changeSet>
+	<changeSet author="gaojianqiang" id="1630567666-5" runAlways="true">
+		<comment>创建事件planTaskStatisticsaEvent</comment>
+		<sql endDelimiter="#">
+			DROP EVENT IF EXISTS `planTaskStatisticsaEvent`#
+			CREATE EVENT `planTaskStatisticsaEvent`
+			ON SCHEDULE
+			EVERY '1' DAY STARTS '2021-04-14 00:02:00'
+			ON COMPLETION PRESERVE
+			DO CALL everyDayInitPlanTaskStatistics()
+			#
+		</sql>
+	</changeSet>
+	<changeSet author="gaojianqiang" id="1630567666-6" runAlways="true">
+		<comment>创建事件splitStringEvent</comment>
+		<sql endDelimiter="#">
+			DROP EVENT IF EXISTS `splitStringEvent`#
+			CREATE EVENT `splitStringEvent`
+			ON SCHEDULE
+			EVERY '1' DAY STARTS '2021-09-02 00:00:00'
+			DO CALL splitString((SELECT group_concat(distinct nullif(p.user_id, '')) AS id FROM p_plan_task p),",")
+			#
+		</sql>
+	</changeSet>
 	<changeSet author="gaodongdong" id="15640410855000-5" runAlways="true">
 		<sql>
 			CREATE EVENT IF NOT EXISTS `planTaskStatisticsaEvent` ON SCHEDULE EVERY 1 DAY STARTS date_add(