Skip to content

A
amos-boot-biz
Commit 18cf3325 authored by kongfm's avatar kongfm
Browse files
Options

Merge remote-tracking branch 'origin/developer' into developer

parents 62b414f9 4a98b776
Hide whitespace changes
Inline Side-by-side
Showing with 329 additions and 61 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @ 18cf3325
......@@ -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
View file @ 18cf3325
......@@ -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/java/com/yeejoin/amos/boot/module/common/api/dto/FirefightersContractDto.java
View file @ 18cf3325
package com.yeejoin.amos.boot.module.common.api.dto;
import java.util.Date;
import java.util.List;
import java.util.Map;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 消防员合同
*
......@@ -62,4 +61,7 @@ public class FirefightersContractDto extends BaseDto {
@ApiModelProperty(value = "附件")
private Map<String, List<AttachmentDto>> attachments;
@ApiModelProperty(value = "合同类型字典code")
private String contractTypeCode;
}
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FirefightersMapper.xml
View file @ 18cf3325
......@@ -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
View file @ 18cf3325
......@@ -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-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FirefightersContractController.java
View file @ 18cf3325
......@@ -164,7 +164,7 @@ public class FirefightersContractController extends BaseController {
} else if (type.equals(String.class)) {
String fileValue = (String) field.get(firefightersContract);
/* BUG 2193 合同名称模糊匹配 start*/
if ("name".equals(name)) {
if ("NAME".equals(name)) {
firefightersContractQueryWrapper.like(name, fileValue);
} else {
firefightersContractQueryWrapper.eq(name, fileValue);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FirefightersContractServiceImpl.java
View file @ 18cf3325
package com.yeejoin.amos.boot.module.common.biz.service.impl;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import com.baomidou.mybatisplus.core.toolkit.Sequence;
import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.module.common.api.dto.AttachmentDto;
import com.yeejoin.amos.boot.module.common.api.dto.FirefightersContractDto;
import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
......@@ -21,6 +11,17 @@ import com.yeejoin.amos.boot.module.common.api.entity.SourceFile;
import com.yeejoin.amos.boot.module.common.api.mapper.FirefightersContractMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFirefightersContractService;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
* 消防员合同 服务实现类
......@@ -36,12 +37,22 @@ public class FirefightersContractServiceImpl extends BaseService<FirefightersCon
SourceFileServiceImpl sourceFileService;
@Autowired
private Sequence sequence;
@Autowired
DataDictionaryServiceImpl iDataDictionaryService;
@Override
@Transactional(rollbackFor = Exception.class)
public FirefightersContractDto save(FirefightersContractDto firefightersContract) {
long sequenceId = sequence.nextId();
FirefightersContract detail=new FirefightersContract();
/* BUG 2193 LITW start*/
DataDictionary dataDictionary = iDataDictionaryService.getById(firefightersContract.getContractTypeCode());
if(null !=dataDictionary ) {
detail.setContractType(dataDictionary.getName());
}
/* BUG 2193 LITW end*/
Bean.copyExistPropertis(firefightersContract, detail);
firefightersContract.setSequenceNbr(sequenceId);
detail.setSequenceNbr(sequenceId);
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ESAlertCalledService.java
View file @ 18cf3325
......@@ -208,7 +208,7 @@ public class ESAlertCalledService {
/**
* 通用匹配规则，条件构建
*/
BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
BoolQueryBuilder boolMustAll = QueryBuilders.boolQuery();
//警情状态
BoolQueryBuilder qb0 = QueryBuilders.boolQuery();
for (String status : alertStatus)
......@@ -219,7 +219,9 @@ public class ESAlertCalledService {
qb0.should(QueryBuilders.termQuery("alertStatusStr.keyword", alertStatusEnum.getCode()));
}
}
boolMust.must(qb0);
boolMustAll.must(qb0);
BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
//接警时间，距离当前时间不超过半小时的
long currentTime = System.currentTimeMillis() ;
currentTime = currentTime - 30*60*1000;
......@@ -258,7 +260,8 @@ public class ESAlertCalledService {
*/
boolMust.minimumShouldMatch(1);//至少满足一个
boolMustAll.must(boolMust);
// 创建查询构造器
NativeSearchQueryBuilder queryBuilder = new NativeSearchQueryBuilder()
// 分页
......@@ -266,7 +269,7 @@ public class ESAlertCalledService {
// 排序
// .withSort(SortBuilders.fieldSort("callTimeLong").order(SortOrder.DESC))
//过滤条件
.withQuery(boolMust);
.withQuery(boolMustAll);
List<ESAlertCalledDto> list = new LinkedList<>();
long totle = 0;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/FireTeamServiceImpl.java
View file @ 18cf3325
package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.yeejoin.amos.boot.biz.common.constants.BizConstant;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.Menu;
......@@ -24,6 +27,7 @@ import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper;
import com.yeejoin.amos.boot.module.common.api.service.IFireTeamService;
import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
import com.yeejoin.amos.boot.module.common.biz.service.impl.WaterResourceServiceImpl;
import io.swagger.models.auth.In;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -32,7 +36,7 @@ import org.typroject.tyboot.core.foundation.exception.BaseException;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import org.apache.commons.lang3.StringUtils;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
......@@ -191,6 +195,14 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
}
public FireTeam saveFireTeam(FireTeam fireTeam) {
if(fireTeam.getAddress()!=null){
JSONObject address = WaterResourceServiceImpl.getLongLatFromAddress(fireTeam.getAddress());
fireTeam.setAddress(address.getString(BizConstant.ADDRESS));
fireTeam.setLongitude(Double.valueOf(address.getString(BizConstant.LONGITUDE)));
fireTeam.setLatitude(Double.valueOf(address.getString(BizConstant.LATITUDE)));
}
if (ValidationUtil.isEmpty(fireTeam.getParent())) {
fireTeam.setTreeCode(TreeParser.genTreeCode());
} else {
......@@ -210,6 +222,33 @@ public class FireTeamServiceImpl extends BaseService<FireTeamDto, FireTeam, Fire
return fireTeam;
}
public static JSONObject getLongLatFromAddress(String address) {
JSONObject result = new JSONObject();
result.put(BizConstant.ADDRESS, "");
result.put(BizConstant.LONGITUDE, "0");
result.put(BizConstant.LATITUDE, "0");
if (StringUtils.isNotEmpty(address)) {
String[] addressData = address.split("@address@");
if (addressData.length > 1) {
result.put(BizConstant.ADDRESS, addressData[0]);
JSONObject langLatObj = JSON.parseObject(addressData[1]);
if (StringUtils.isNotEmpty(langLatObj.getString(BizConstant.LONGITUDE))) {
result.put(BizConstant.LONGITUDE, langLatObj.getString(BizConstant.LONGITUDE));
} else {
result.put(BizConstant.LONGITUDE, "0");
}
if (StringUtils.isNotEmpty(langLatObj.getString(BizConstant.LATITUDE))) {
result.put(BizConstant.LATITUDE, langLatObj.getString(BizConstant.LATITUDE));
} else {
result.put(BizConstant.LATITUDE, "0");
}
} else {
result.put(BizConstant.ADDRESS, addressData[0]);
}
}
return result;
}
/**
* 根据id删除队伍
*
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/CheckServiceImpl.java
View file @ 18cf3325
......@@ -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
View file @ 18cf3325
......@@ -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
View file @ 18cf3325
......@@ -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
View file @ 18cf3325
......@@ -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
View file @ 18cf3325
......@@ -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(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment