Browse Source

cim大屏-定时任务改造

dev-V1.10.0
niujiyi 1 hour ago
parent
commit
d8da42edc6
  1. 95
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewJobController.java
  2. 93
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CimDashboardOvervieMonthlyDataJob.java
  3. 66
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CimDashboardOvervieQuarterlyDataJob.java
  4. 268
      zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java

95
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/cim/CimDashboardOverviewJobController.java

@ -4,6 +4,7 @@ package com.zdxt.enforcementcode.controller.cim;
import cn.dev33.satoken.annotation.SaIgnore;
import com.zdxt.enforcementcode.service.ICimDashboardOverviewDataSumService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
* @author niujiyi
* @date 2023-08-07
*/
@Slf4j
@SaIgnore
@Validated
@RequiredArgsConstructor
@ -133,4 +135,97 @@ public class CimDashboardOverviewJobController {
cimDashboardOverviewDataSumService.getTrendFieldMonthDataSum();
return R.ok();
}
//合并调用方法
@GetMapping("/getMonthData")
public R<Void> getMonthData(){
long startTime = System.currentTimeMillis();
log.info("【Cim月度定时任务】开始执行");
int total = 7;
int failCount = 0;
//Cim大屏-大屏总览月度数据
if (!invoke("Cim大屏-大屏总览月度数据", cimDashboardOverviewDataSumService::getMonthDataSum)) {
failCount++;
}
//Cim大屏-执法人员-执法单位-企业数量
if (!invoke("Cim大屏-执法人员-执法单位-企业数量", cimDashboardOverviewDataSumService::getAreaMonthDataSum)) {
failCount++;
}
//Cim大屏-监测预警-检查登记检测分析-区域月数据汇总-总体概览-行政执法数VS行政执法案件数-各区行政执法数及案件数明细
if (!invoke("Cim大屏-检查登记检测分析-区域月数据汇总", cimDashboardOverviewDataSumService::getCheckRegisterAreaMonthDataSum)) {
failCount++;
}
// Cim大屏-监测预警-检查登记检测分析-领域月数据汇总-总体概览-行政执法数VS行政执法案件数-各领域行政执法数及案件数明细
if (!invoke("Cim大屏-检查登记检测分析-领域月数据汇总", cimDashboardOverviewDataSumService::getCheckRegisterFieldMonthDataSum)) {
failCount++;
}
//Cim-大屏-检测预警-高频检查预警分析-区域月数据
if (!invoke("Cim大屏-高频检查预警分析-区域月数据", cimDashboardOverviewDataSumService::getHighCheckAreaMonthDataSum)) {
failCount++;
}
//Cim-大屏-检测预警-高频检查预警分析-领域月数据
if (!invoke("Cim大屏-高频检查预警分析-领域月数据", cimDashboardOverviewDataSumService::getHighCheckFieldMonthDataSum)) {
failCount++;
}
//Cim大屏-监测预警-重点企业月数据汇总-重点企业-总体概览-涉企登记趋势-行政执法明细
if (!invoke("Cim大屏-重点企业月数据汇总", cimDashboardOverviewDataSumService::getKeyEnterprisesMonthDataSum)) {
failCount++;
}
log.info("【Cim月度定时任务】执行结束,共 {} 个子任务,失败 {} 个,总耗时 {} ms",
total, failCount, System.currentTimeMillis() - startTime);
return R.ok();
}
/**
* 执行单个子任务:捕获异常并记录日志,保证不影响其他子任务执行
*
* @param taskName 子任务名称,用于日志定位出错的方法
* @param task 子任务逻辑
* @return true 执行成功;false 执行失败
*/
private boolean invoke(String taskName, Runnable task) {
long startTime = System.currentTimeMillis();
try {
task.run();
log.info("【Cim月度定时任务】{} 执行成功,耗时 {} ms", taskName, System.currentTimeMillis() - startTime);
return true;
} catch (Exception e) {
log.error("【Cim月度定时任务】{} 执行失败,耗时 {} ms", taskName, System.currentTimeMillis() - startTime, e);
return false;
}
}
//合并调用方法
@GetMapping("/getQuarterlyData")
public R<Void> getQuarterlyData() {
long startTime = System.currentTimeMillis();
log.info("【Cim月度定时任务】开始执行");
int total = 2;
int failCount = 0;
//Cim大屏-大屏总览月度数据
if (!invoke("Cim大屏-态势感知-区域月数据汇总-趋势行为分析", cimDashboardOverviewDataSumService::getTrendAreaMonthDataSum)) {
failCount++;
}
//Cim大屏-大屏总览月度数据
if (!invoke("Cim大屏-态势感知-领域月数据汇总-趋势行为分析", cimDashboardOverviewDataSumService::getTrendFieldMonthDataSum)) {
failCount++;
}
log.info("【Cim月度定时任务】执行结束,共 {} 个子任务,失败 {} 个,总耗时 {} ms",
total, failCount, System.currentTimeMillis() - startTime);
return R.ok();
}
}

93
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CimDashboardOvervieMonthlyDataJob.java

@ -0,0 +1,93 @@
package com.zdxt.enforcementcode.quartz.job;
import com.zdxt.enforcementcode.service.ICimDashboardOverviewDataSumService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
* Cim-大屏月度定时任务调用方法
* 月度数据调用
*
* @author zrb
*/
@Slf4j
@Component
@RequiredArgsConstructor
public class CimDashboardOvervieMonthlyDataJob {
private final ICimDashboardOverviewDataSumService cimDashboardOverviewDataSumService;
/**
* 任务执行入口(public,供 JobInvokeUtil 通过反射调用)
* <p>各子任务相互独立,单个任务异常只记录日志,不影响后续任务继续执行。
*/
public void execute() {
long startTime = System.currentTimeMillis();
log.info("【Cim月度定时任务】开始执行");
int total = 7;
int failCount = 0;
//Cim大屏-大屏总览月度数据
if (!invoke("Cim大屏-大屏总览月度数据", cimDashboardOverviewDataSumService::getMonthDataSum)) {
failCount++;
}
//Cim大屏-执法人员-执法单位-企业数量
if (!invoke("Cim大屏-执法人员-执法单位-企业数量", cimDashboardOverviewDataSumService::getAreaMonthDataSum)) {
failCount++;
}
//Cim大屏-监测预警-检查登记检测分析-区域月数据汇总-总体概览-行政执法数VS行政执法案件数-各区行政执法数及案件数明细
if (!invoke("Cim大屏-检查登记检测分析-区域月数据汇总", cimDashboardOverviewDataSumService::getCheckRegisterAreaMonthDataSum)) {
failCount++;
}
// Cim大屏-监测预警-检查登记检测分析-领域月数据汇总-总体概览-行政执法数VS行政执法案件数-各领域行政执法数及案件数明细
if (!invoke("Cim大屏-检查登记检测分析-领域月数据汇总", cimDashboardOverviewDataSumService::getCheckRegisterFieldMonthDataSum)) {
failCount++;
}
//Cim-大屏-检测预警-高频检查预警分析-区域月数据
if (!invoke("Cim大屏-高频检查预警分析-区域月数据", cimDashboardOverviewDataSumService::getHighCheckAreaMonthDataSum)) {
failCount++;
}
//Cim-大屏-检测预警-高频检查预警分析-领域月数据
if (!invoke("Cim大屏-高频检查预警分析-领域月数据", cimDashboardOverviewDataSumService::getHighCheckFieldMonthDataSum)) {
failCount++;
}
//Cim大屏-监测预警-重点企业月数据汇总-重点企业-总体概览-涉企登记趋势-行政执法明细
if (!invoke("Cim大屏-重点企业月数据汇总", cimDashboardOverviewDataSumService::getKeyEnterprisesMonthDataSum)) {
failCount++;
}
log.info("【Cim月度定时任务】执行结束,共 {} 个子任务,失败 {} 个,总耗时 {} ms",
total, failCount, System.currentTimeMillis() - startTime);
}
/**
* 执行单个子任务:捕获异常并记录日志,保证不影响其他子任务执行
*
* @param taskName 子任务名称,用于日志定位出错的方法
* @param task 子任务逻辑
* @return true 执行成功;false 执行失败
*/
private boolean invoke(String taskName, Runnable task) {
long startTime = System.currentTimeMillis();
try {
task.run();
log.info("【Cim月度定时任务】{} 执行成功,耗时 {} ms", taskName, System.currentTimeMillis() - startTime);
return true;
} catch (Exception e) {
log.error("【Cim月度定时任务】{} 执行失败,耗时 {} ms", taskName, System.currentTimeMillis() - startTime, e);
return false;
}
}
}

66
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/quartz/job/CimDashboardOvervieQuarterlyDataJob.java

@ -0,0 +1,66 @@
package com.zdxt.enforcementcode.quartz.job;
import com.zdxt.enforcementcode.service.ICimDashboardOverviewDataSumService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
* Cim-大屏季度定时任务调用方法
*季度数据调用
* @author zrb
*/
@Slf4j
@Component
@RequiredArgsConstructor
public class CimDashboardOvervieQuarterlyDataJob {
private final ICimDashboardOverviewDataSumService cimDashboardOverviewDataSumService;
/**
* 任务执行入口(public,供 JobInvokeUtil 通过反射调用)
*/
public void execute() {
long startTime = System.currentTimeMillis();
log.info("【Cim月度定时任务】开始执行");
int total = 2;
int failCount = 0;
//Cim大屏-大屏总览月度数据
if (!invoke("Cim大屏-态势感知-区域月数据汇总-趋势行为分析", cimDashboardOverviewDataSumService::getTrendAreaMonthDataSum)) {
failCount++;
}
//Cim大屏-大屏总览月度数据
if (!invoke("Cim大屏-态势感知-领域月数据汇总-趋势行为分析", cimDashboardOverviewDataSumService::getTrendFieldMonthDataSum)) {
failCount++;
}
log.info("【Cim月度定时任务】执行结束,共 {} 个子任务,失败 {} 个,总耗时 {} ms",
total, failCount, System.currentTimeMillis() - startTime);
}
/**
* 执行单个子任务:捕获异常并记录日志,保证不影响其他子任务执行
*
* @param taskName 子任务名称,用于日志定位出错的方法
* @param task 子任务逻辑
* @return true 执行成功;false 执行失败
*/
private boolean invoke(String taskName, Runnable task) {
long startTime = System.currentTimeMillis();
try {
task.run();
log.info("【Cim季度定时任务】{} 执行成功,耗时 {} ms", taskName, System.currentTimeMillis() - startTime);
return true;
} catch (Exception e) {
log.error("【Cim季度定时任务】{} 执行失败,耗时 {} ms", taskName, System.currentTimeMillis() - startTime, e);
return false;
}
}
}

268
zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/CimDashboardOverviewDataSumSserviceImpl.java

@ -79,10 +79,25 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean getMonthDataSum() {
CimDashboardOverviewVo vo=new CimDashboardOverviewVo();
CimDashboardOverviewQueryBo bo= getDateTime();
//查询是否存在当前月数据,存在则删除
LambdaQueryWrapper<DashboardOverview> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DashboardOverview::getYear, bo.getYear());
queryWrapper.eq(DashboardOverview::getMonth, bo.getMonth());
queryWrapper.eq(DashboardOverview::getIsDelete, "0");
DashboardOverview dashboardOverview = cimDashboardOverviewMapper.selectOne(queryWrapper);
if (dashboardOverview != null){
LambdaUpdateWrapper<DashboardOverview> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(DashboardOverview::getYear,bo.getYear());
updateWrapper.eq(DashboardOverview::getMonth, bo.getMonth());
updateWrapper.eq(DashboardOverview::getId, dashboardOverview.getId());
updateWrapper.set(DashboardOverview::getIsDelete, "1");
cimDashboardOverviewMapper.update(updateWrapper);
}
//计划总数
vo.setJhzs(cimDashboardOverviewMapper.getPlanCount(bo));
//预告总数
@ -139,15 +154,46 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean getAreaMonthDataSum(){
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardOverviewPersonnel> queryWrapperPersonnel = new LambdaQueryWrapper<>();
queryWrapperPersonnel.eq(DashboardOverviewPersonnel::getIsDelete, "0")
.eq(DashboardOverviewPersonnel::getYear, getDateTime().getYear())
.eq(DashboardOverviewPersonnel::getMonth, getDateTime().getMonth());
List<DashboardOverviewPersonnel> perList = dashboardOverviewPersonnelMapper.selectList(queryWrapperPersonnel);
if(perList.size()>0){
//更新数据的isDelete字段为1
for (DashboardOverviewPersonnel personnel : perList){
personnel.setIsDelete("1");
}
dashboardOverviewPersonnelMapper.updateBatchById(perList);
}
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardOverviewUnit> queryWrapperUnit = new LambdaQueryWrapper<>();
queryWrapperUnit.eq(DashboardOverviewUnit::getIsDelete, "0")
.eq(DashboardOverviewUnit::getYear, getDateTime().getYear())
.eq(DashboardOverviewUnit::getMonth, getDateTime().getMonth());
List<DashboardOverviewUnit> unitList = dashboardOverviewUnitMapper.selectList(queryWrapperUnit);
if(unitList.size()>0){
//更新数据的isDelete字段为1
for (DashboardOverviewUnit unit : unitList){
unit.setIsDelete("1");
}
dashboardOverviewUnitMapper.updateBatchById(unitList);
}
CimDashboardOverviewQueryBo bo= getDateTime();
bo.setMonthTime(getDateTime().getMonthTime());
//bo.setMonthTime(getDateTime().getMonthTime());
List<CimDashboardOverviewVo> list=cimDashboardOverviewMapper.getLawPersonnelCount(bo);
List<CimDashboardOverviewVo> list1=cimDashboardOverviewMapper.getLawUnitCount(bo);
// 1. 高频检查区域:VO(code/name/number) → 实体(areaCode/areaName/gpjcqy)
List<DashboardOverviewPersonnel> areaPersonnelList = new ArrayList<>();
if (list != null) {
for (CimDashboardOverviewVo vo : list) {
@ -165,7 +211,6 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
}
}
// 2. 高频检查区域执法单位联合执法数:VO(bueauDeptId/bureauDeptName/number) → 实体(bureauDeptId/bureauDeptName/lhzfcs)
List<DashboardOverviewUnit> areaUnionList = new ArrayList<>();
if (list1 != null) {
for (CimDashboardOverviewVo vo : list1) {
@ -337,9 +382,70 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
* @return
*/
@Override
@Transactional
@Transactional(rollbackFor = Exception.class)
public Boolean getHighCheckAreaMonthDataSum() {
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardHighCheckArea> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DashboardHighCheckArea::getIsDelete, "0")
.eq(DashboardHighCheckArea::getYear, getDateTime().getYear())
.eq(DashboardHighCheckArea::getMonth, getDateTime().getMonth());
List<DashboardHighCheckArea> highAreaList = dashboardHighCheckAreaMapper.selectList(queryWrapper);
if(highAreaList.size()>0){
//更新数据的isDelete字段为1
for (DashboardHighCheckArea highlight : highAreaList){
highlight.setIsDelete("1");
}
dashboardHighCheckAreaMapper.updateBatchById(highAreaList);
}
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardHighCheckUnionArea> queryWrapperUnion = new LambdaQueryWrapper<>();
queryWrapperUnion.eq(DashboardHighCheckUnionArea::getIsDelete, "0")
.eq(DashboardHighCheckUnionArea::getYear, getDateTime().getYear())
.eq(DashboardHighCheckUnionArea::getMonth, getDateTime().getMonth());
List<DashboardHighCheckUnionArea> highUnionList = dashboardhighcheckunionMapper.selectList(queryWrapperUnion);
if(highUnionList.size()>0){
//更新数据的isDelete字段为1
for (DashboardHighCheckUnionArea highUnion : highUnionList){
highUnion.setIsDelete("1");
}
dashboardhighcheckunionMapper.updateBatchById(highUnionList);
}
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardHighCheckFrequencyArea> queryWrapperFrequency = new LambdaQueryWrapper<>();
queryWrapperFrequency.eq(DashboardHighCheckFrequencyArea::getIsDelete, "0")
.eq(DashboardHighCheckFrequencyArea::getYear, getDateTime().getYear())
.eq(DashboardHighCheckFrequencyArea::getMonth, getDateTime().getMonth());
List<DashboardHighCheckFrequencyArea> highFrequencyList = dashboardHighCheckFrequencyAreaMapper.selectList(queryWrapperFrequency);
if(highFrequencyList.size()>0){
//更新数据的isDelete字段为1
for (DashboardHighCheckFrequencyArea highFrequency : highFrequencyList){
highFrequency.setIsDelete("1");
}
dashboardHighCheckFrequencyAreaMapper.updateBatchById(highFrequencyList);
}
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardHighCheckEnterprise> queryWrapperEnterprise = new LambdaQueryWrapper<>();
queryWrapperEnterprise.eq(DashboardHighCheckEnterprise::getIsDelete, "0")
.eq(DashboardHighCheckEnterprise::getYear, getDateTime().getYear())
.eq(DashboardHighCheckEnterprise::getMonth, getDateTime().getMonth());
List<DashboardHighCheckEnterprise> enterpriseList = dashboardHighCheckEnterpriseMapper.selectList(queryWrapperEnterprise);
if(enterpriseList.size()>0){
//更新数据的isDelete字段为1
for (DashboardHighCheckEnterprise highEnterprise : enterpriseList){
highEnterprise.setIsDelete("1");
}
dashboardHighCheckEnterpriseMapper.updateBatchById(enterpriseList);
}
CimDashboardOverviewQueryBo bo= getDateTime();
List<CimDashboardOverviewVo> list=cimDashboardOverviewMapper.getHighCheckArea(bo);
List<CimDashboardOverviewVo> list1=cimDashboardOverviewMapper.getHighCheckAreaUnionNoRanking(bo);
@ -487,8 +593,54 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean getHighCheckFieldMonthDataSum() {
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardHighCheckFrequencyDomain> queryWrapperHighFrequencyDomain = new LambdaQueryWrapper<>();
queryWrapperHighFrequencyDomain.eq(DashboardHighCheckFrequencyDomain::getIsDelete, "0")
.eq(DashboardHighCheckFrequencyDomain::getYear, getDateTime().getYear())
.eq(DashboardHighCheckFrequencyDomain::getMonth, getDateTime().getMonth());
List<DashboardHighCheckFrequencyDomain> highDomainList = dashboardHighCheckDomainMapper.selectList(queryWrapperHighFrequencyDomain);
if(highDomainList.size()>0){
//更新数据的isDelete字段为1
for (DashboardHighCheckFrequencyDomain highDomain : highDomainList){
highDomain.setIsDelete("1");
}
dashboardHighCheckDomainMapper.updateBatchById(highDomainList);
}
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardHighCheckUnionDomain> queryWrapperunionDomain = new LambdaQueryWrapper<>();
queryWrapperunionDomain.eq(DashboardHighCheckUnionDomain::getIsDelete, "0")
.eq(DashboardHighCheckUnionDomain::getYear, getDateTime().getYear())
.eq(DashboardHighCheckUnionDomain::getMonth, getDateTime().getMonth());
List<DashboardHighCheckUnionDomain> highUnionDomainList = dashboardHighCheckUnionDomainMapper.selectList(queryWrapperunionDomain);
if(highUnionDomainList.size()>0){
//更新数据的isDelete字段为1
for (DashboardHighCheckUnionDomain highUnionDomian : highUnionDomainList){
highUnionDomian.setIsDelete("1");
}
dashboardHighCheckUnionDomainMapper.updateBatchById(highUnionDomainList);
}
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardHighCheckEntdetailsDomain> queryWrapperEntDomain = new LambdaQueryWrapper<>();
queryWrapperEntDomain.eq(DashboardHighCheckEntdetailsDomain::getIsDelete, "0")
.eq(DashboardHighCheckEntdetailsDomain::getYear, getDateTime().getYear())
.eq(DashboardHighCheckEntdetailsDomain::getMonth, getDateTime().getMonth());
List<DashboardHighCheckEntdetailsDomain> highEntDomainList = dashboardHighCheckEntdetailsDomainMapper.selectList(queryWrapperEntDomain);
if(highEntDomainList.size()>0){
//更新数据的isDelete字段为1
for (DashboardHighCheckEntdetailsDomain highEntDomain : highEntDomainList){
highEntDomain.setIsDelete("1");
}
dashboardHighCheckEntdetailsDomainMapper.updateBatchById(highEntDomainList);
}
CimDashboardOverviewQueryBo bo= getDateTime();
List<CimDashboardOverviewVo> list = cimDashboardOverviewMapper.getHighCheckFieldRanking(bo);
List<CimDashboardOverviewVo> list1 = cimDashboardOverviewMapper.getHighCheckFieldUnionNoCount(bo);
@ -604,6 +756,7 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean getCheckRegisterAreaMonthDataSum() {
CimDashboardOverviewVo vo = new CimDashboardOverviewVo();
// 获取当前系统时间
@ -674,6 +827,36 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
* @return
*/
public Boolean getCheckRegisterAreaMonthDataSumList() {
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardCheckRegisterZfajArea> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DashboardCheckRegisterZfajArea::getIsDelete, "0");
queryWrapper.eq(DashboardCheckRegisterZfajArea::getYear, getDateTime().getYear());
queryWrapper.eq(DashboardCheckRegisterZfajArea::getMonth, getDateTime().getMonth());
List<DashboardCheckRegisterZfajArea> monthAreaList = dashboardCheckRegisterZfajAreaMapper.selectList(queryWrapper);
if (monthAreaList.size() > 0) {
//更新数据的isDelete字段为1
for (DashboardCheckRegisterZfajArea entity : monthAreaList) {
entity.setIsDelete("1");
}
dashboardCheckRegisterZfajAreaMapper.updateBatchById(monthAreaList);
}
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardCheckRegisterZfajdetailsArea> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(DashboardCheckRegisterZfajdetailsArea::getIsDelete, "0");
queryWrapper1.eq(DashboardCheckRegisterZfajdetailsArea::getYear, getDateTime().getYear());
queryWrapper1.eq(DashboardCheckRegisterZfajdetailsArea::getMonth, getDateTime().getMonth());
List<DashboardCheckRegisterZfajdetailsArea> monthAreaDetailsList = dashboardCheckRegisterZfajdetailsAreaMapper.selectList(queryWrapper1);
if (monthAreaDetailsList.size() > 0) {
//更新数据的isDelete字段为1
for (DashboardCheckRegisterZfajdetailsArea entity : monthAreaDetailsList) {
entity.setIsDelete("1");
}
dashboardCheckRegisterZfajdetailsAreaMapper.updateBatchById(monthAreaDetailsList);
}
// 获取当前系统时间
CimDashboardOverviewQueryBo bo=getDateTime() ;
List<CimDashboardOverviewVo> list =cimDashboardOverviewMapper.getAreaEnfRegistrationAndCaseCount(bo);
@ -735,6 +918,22 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
*/
public Boolean insertCheckRegiserData(CimDashboardOverviewVo vo){
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardCheckRegisterArea> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DashboardCheckRegisterArea::getIsDelete, "0");
queryWrapper.eq(DashboardCheckRegisterArea::getYear, getDateTime().getYear());
queryWrapper.eq(DashboardCheckRegisterArea::getMonth, getDateTime().getMonth());
DashboardCheckRegisterArea entity =dashboardCheckRegisterAreaMapper.selectOne(queryWrapper);
if ( entity!= null) {
//更新数据的isDelete字段为1
LambdaUpdateWrapper<DashboardCheckRegisterArea> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(DashboardCheckRegisterArea::getYear, getDateTime().getYear());
updateWrapper.eq(DashboardCheckRegisterArea::getMonth, getDateTime().getMonth());
updateWrapper.eq(DashboardCheckRegisterArea::getId, entity.getId());
updateWrapper.set(DashboardCheckRegisterArea::getIsDelete, "1");
dashboardCheckRegisterAreaMapper.update(updateWrapper);
}
//添加数据到大屏总览数据汇总表
DashboardCheckRegisterArea add = new DashboardCheckRegisterArea();
add.setCityCode("440300");
@ -807,6 +1006,7 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean getCheckRegisterFieldMonthDataSum() {
CimDashboardOverviewVo vo = new CimDashboardOverviewVo();
@ -880,6 +1080,37 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
*/
public Boolean getCheckRegisterFieldMonthDataSumList() {
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardCheckRegisterZfajDomain> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DashboardCheckRegisterZfajDomain::getIsDelete, "0")
.eq(DashboardCheckRegisterZfajDomain::getYear, getDateTime().getYear())
.eq(DashboardCheckRegisterZfajDomain::getMonth, getDateTime().getMonth());
List<DashboardCheckRegisterZfajDomain> domainList = dashboardCheckRegisterZfajDomainMapper.selectList(queryWrapper);
if(domainList.size()>0){
//更新数据的isDelete字段为1
for (DashboardCheckRegisterZfajDomain domain : domainList){
domain.setIsDelete("1");
}
dashboardCheckRegisterZfajDomainMapper.updateBatchById(domainList);
}
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardCheckRegisterZfajdetailsDomain> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(DashboardCheckRegisterZfajdetailsDomain::getIsDelete, "0")
.eq(DashboardCheckRegisterZfajdetailsDomain::getYear, getDateTime().getYear())
.eq(DashboardCheckRegisterZfajdetailsDomain::getMonth, getDateTime().getMonth());
List<DashboardCheckRegisterZfajdetailsDomain> domainDetailsList = dashboardCheckRegisterZfajdetailsDomainMapper.selectList(queryWrapper1);
if(domainDetailsList.size()>0){
//更新数据的isDelete字段为1
for (DashboardCheckRegisterZfajdetailsDomain domainDetail : domainDetailsList){
domainDetail.setIsDelete("1");
}
dashboardCheckRegisterZfajdetailsDomainMapper.updateBatchById(domainDetailsList);
}
// 获取当前系统时间
CimDashboardOverviewQueryBo bo=getDateTime() ;
List<CimDashboardOverviewVo> list =cimDashboardOverviewMapper.getFieldEnfRegistrationAndCaseCount(bo);
@ -936,6 +1167,23 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
*/
public Boolean insertFieldCheckRegiserData(CimDashboardOverviewVo vo){
//查询是否有月度已经执行过的数据
LambdaQueryWrapper<DashboardCheckRegisterDomain> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(DashboardCheckRegisterDomain::getYear, getDateTime().getYear());
queryWrapper.eq(DashboardCheckRegisterDomain::getMonth, getDateTime().getMonth());
queryWrapper.eq(DashboardCheckRegisterDomain::getIsDelete, "0");
DashboardCheckRegisterDomain domain= dashboardCheckRegisterDomainMapper.selectOne(queryWrapper);
if ( domain!= null) {
//更新数据的isDelete字段为1
LambdaUpdateWrapper<DashboardCheckRegisterDomain> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(DashboardCheckRegisterDomain::getYear, getDateTime().getYear());
updateWrapper.eq(DashboardCheckRegisterDomain::getMonth, getDateTime().getMonth());
updateWrapper.eq(DashboardCheckRegisterDomain::getId, domain.getId());
updateWrapper.set(DashboardCheckRegisterDomain::getIsDelete, "1");
dashboardCheckRegisterDomainMapper.update(updateWrapper);
}
//添加数据到大屏总览数据汇总表
DashboardCheckRegisterDomain add = new DashboardCheckRegisterDomain();
add.setLyid(vo.getDomainId());
@ -1003,8 +1251,15 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean getKeyEnterprisesMonthDataSum() {
// 月度数据为整月重算快照:先物理删除当月数据(含历史逻辑删除记录)。
LambdaQueryWrapper<DashboardEnterpriseCheck> deleteWrapper = new LambdaQueryWrapper<>();
deleteWrapper.eq(DashboardEnterpriseCheck::getStatYear, getDateTime().getYear())
.eq(DashboardEnterpriseCheck::getStatMonth, getDateTime().getMonth());
dashboardEnterpriseCheckMapper.delete(deleteWrapper);
CimDashboardOverviewQueryBo bo=getDateTime() ;
List<CimDashboardOverviewVo> list = cimDashboardOverviewMapper.getKeyEnterprises(bo);
@ -1138,8 +1393,12 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean getTrendAreaMonthDataSum() {
//查询是否有月度已经执行过的数据
//更新数据的isDelete字段为1
CimDashboardOverviewQueryBo bo=getDateTime() ;
List<CimDashboardOverviewVo> list= cimDashboardOverviewMapper.getQuarterlyRegionList(bo);
@ -1289,6 +1548,7 @@ public class CimDashboardOverviewDataSumSserviceImpl implements ICimDashboardOve
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean getTrendFieldMonthDataSum() {
CimDashboardOverviewQueryBo bo=getDateTime() ;

Loading…
Cancel
Save