Commit 9439cba9 authored by lisong's avatar lisong

更新

parent 4a054b34
...@@ -39,8 +39,8 @@ public class EnterpriseStatisticController extends BaseController { ...@@ -39,8 +39,8 @@ public class EnterpriseStatisticController extends BaseController {
@ApiOperation(value = "根据搜索信息获取表格数据") @ApiOperation(value = "根据搜索信息获取表格数据")
@GetMapping(value = "/getTableInfoPage") @GetMapping(value = "/getTableInfoPage")
public ResponseModel<Page<CylinderTableDto>> cylinderTableInfoPage(String pageNumber, String pageSize, public ResponseModel<Page<CylinderTableDto>> cylinderTableInfoPage(String pageNumber, String pageSize,
@RequestParam(value = "regionName" ,required = false) String regionName, @RequestParam(value = "regionName", required = false) String regionName,
@RequestParam(value = "unitName" ,required = false) String unitName) { @RequestParam(value = "unitName", required = false) String unitName) {
Page<CylinderTableDto> cylinderTableDtoPage = cylinderDateInfoService.selectTodayDatePage(pageNumber, pageSize, regionName, unitName); Page<CylinderTableDto> cylinderTableDtoPage = cylinderDateInfoService.selectTodayDatePage(pageNumber, pageSize, regionName, unitName);
return ResponseHelper.buildResponse(cylinderTableDtoPage); return ResponseHelper.buildResponse(cylinderTableDtoPage);
} }
...@@ -55,7 +55,6 @@ public class EnterpriseStatisticController extends BaseController { ...@@ -55,7 +55,6 @@ public class EnterpriseStatisticController extends BaseController {
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(value = "初始化统计数据") @ApiOperation(value = "初始化统计数据")
@GetMapping(value = "/initializeData") @GetMapping(value = "/initializeData")
......
...@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
...@@ -105,17 +106,15 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto ...@@ -105,17 +106,15 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto
} }
public Page<CylinderTableDto> selectTodayDatePage(String pageNumber, String pageSize, String regionName, String unitName) {
public Page<CylinderTableDto> selectTodayDatePage(String pageNumber, String pageSize,String regionName, String unitName) {
Page<CylinderTableDto> page = new Page<>(); Page<CylinderTableDto> page = new Page<>();
List<CylinderTableDto> result = new ArrayList<>(); List<CylinderTableDto> result = new ArrayList<>();
Page<CylinderUnit> cylinderUnitPage = new Page<>(Long.parseLong(pageNumber), Long.parseLong(pageSize)); Page<CylinderUnit> cylinderUnitPage = new Page<>(Long.parseLong(pageNumber), Long.parseLong(pageSize));
LambdaQueryWrapper<CylinderUnit> lambda = new QueryWrapper<CylinderUnit>().lambda(); LambdaQueryWrapper<CylinderUnit> lambda = new QueryWrapper<CylinderUnit>().lambda();
if (!ObjectUtils.isEmpty(regionName)){ if (!ObjectUtils.isEmpty(regionName)) {
lambda.like(CylinderUnit::getRegionCode, regionName); lambda.like(CylinderUnit::getRegionCode, regionName);
} }
if (!ObjectUtils.isEmpty(unitName)){ if (!ObjectUtils.isEmpty(unitName)) {
lambda.like(CylinderUnit::getUnitName, unitName); lambda.like(CylinderUnit::getUnitName, unitName);
} }
IPage<CylinderUnit> cylinderUnitIPage = cylinderUnitMapper.selectPage(cylinderUnitPage, lambda); IPage<CylinderUnit> cylinderUnitIPage = cylinderUnitMapper.selectPage(cylinderUnitPage, lambda);
...@@ -163,22 +162,22 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto ...@@ -163,22 +162,22 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto
} }
@Scheduled(cron = "0 0 2 * * ?") //每天凌晨两点执行 @Scheduled(cron = "0 0 2 * * ?") //每天凌晨两点执行
public void fixedDelayJob(){ public void fixedDelayJob() {
// 每天更新或者添加昨天的数据 // 每天更新或者添加昨天的数据
Date date = new Date();//取时间 Date date = new Date();//取时间
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(date); calendar.setTime(date);
calendar.add(Calendar.DATE,-1); calendar.add(Calendar.DATE, -1);
//这个时间就是日期往后推一天的结果 //这个时间就是日期往后推一天的结果
date=calendar.getTime(); date = calendar.getTime();
LambdaQueryWrapper<CylinderUnit> lambda = new QueryWrapper<CylinderUnit>().lambda(); LambdaQueryWrapper<CylinderUnit> lambda = new QueryWrapper<CylinderUnit>().lambda();
List<CylinderUnit> cylinderUnits = cylinderUnitMapper.selectList(lambda); List<CylinderUnit> cylinderUnits = cylinderUnitMapper.selectList(lambda);
for(CylinderUnit token : cylinderUnits) { for (CylinderUnit token : cylinderUnits) {
try { try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String todayStr = sdf.format(date); String todayStr = sdf.format(date);
List<CylinderDateInfo> list = this.list(new LambdaQueryWrapper<CylinderDateInfo>().between(CylinderDateInfo::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59").eq(CylinderDateInfo::getAppId,token.getAppId())); List<CylinderDateInfo> list = this.list(new LambdaQueryWrapper<CylinderDateInfo>().between(CylinderDateInfo::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59").eq(CylinderDateInfo::getAppId, token.getAppId()));
if(ObjectUtils.isEmpty(list)) { if (ObjectUtils.isEmpty(list)) {
CylinderDateInfoDto temp = new CylinderDateInfoDto(); CylinderDateInfoDto temp = new CylinderDateInfoDto();
temp.setSyncDate(date); temp.setSyncDate(date);
String appid = token.getAppId(); String appid = token.getAppId();
...@@ -186,15 +185,15 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto ...@@ -186,15 +185,15 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto
temp.setAppId(appid); temp.setAppId(appid);
temp.setDeveloperAgency(token.getDeveloperAgency()); temp.setDeveloperAgency(token.getDeveloperAgency());
// 获取气瓶基本信息 // 获取气瓶基本信息
Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId,appid).between(CylinderInfo::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId, appid).between(CylinderInfo::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId,appid).between(CylinderUnit::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId, appid).between(CylinderUnit::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<CylinderTags>().eq(CylinderTags::getAppId,appid).between(CylinderTags::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<CylinderTags>().eq(CylinderTags::getAppId, appid).between(CylinderTags::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<CylinderInspection>().eq(CylinderInspection::getAppId,appid).between(CylinderInspection::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<CylinderInspection>().eq(CylinderInspection::getAppId, appid).between(CylinderInspection::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<CylinderFilling>().eq(CylinderFilling::getAppId,appid).between(CylinderFilling::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<CylinderFilling>().eq(CylinderFilling::getAppId, appid).between(CylinderFilling::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<CylinderFillingRecord>().eq(CylinderFillingRecord::getAppId,appid).between(CylinderFillingRecord::getSyncDate,todayStr+ " 00:00:00",todayStr + " 23:59:59")); Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<CylinderFillingRecord>().eq(CylinderFillingRecord::getAppId, appid).between(CylinderFillingRecord::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<CylinderFillingCheck>().eq(CylinderFillingCheck::getAppId,appid).between(CylinderFillingCheck::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<CylinderFillingCheck>().eq(CylinderFillingCheck::getAppId, appid).between(CylinderFillingCheck::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<CylinderFillingExamine>().eq(CylinderFillingExamine::getAppId,appid).between(CylinderFillingExamine::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<CylinderFillingExamine>().eq(CylinderFillingExamine::getAppId, appid).between(CylinderFillingExamine::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer total = cylinder + cylinderUnit + tags + inspection+filling+fillingRecord+fillingCheck+examine; Integer total = cylinder + cylinderUnit + tags + inspection + filling + fillingRecord + fillingCheck + examine;
temp.setCylinderExamineInfo(examine); temp.setCylinderExamineInfo(examine);
temp.setCylinderUnit(cylinderUnit); temp.setCylinderUnit(cylinderUnit);
temp.setCylinderFillingCheckInfo(fillingCheck); temp.setCylinderFillingCheckInfo(fillingCheck);
...@@ -206,18 +205,18 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto ...@@ -206,18 +205,18 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto
temp.setCylinderTotal(total); temp.setCylinderTotal(total);
this.createWithModel(temp); this.createWithModel(temp);
} else { } else {
list.forEach( info -> { list.forEach(info -> {
String appId = token.getAppId(); String appId = token.getAppId();
// 获取气瓶基本信息 // 获取气瓶基本信息
Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId,appId).between(CylinderInfo::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId, appId).between(CylinderInfo::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId,appId).between(CylinderUnit::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId, appId).between(CylinderUnit::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<CylinderTags>().eq(CylinderTags::getAppId,appId).between(CylinderTags::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<CylinderTags>().eq(CylinderTags::getAppId, appId).between(CylinderTags::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<CylinderInspection>().eq(CylinderInspection::getAppId,appId).between(CylinderInspection::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<CylinderInspection>().eq(CylinderInspection::getAppId, appId).between(CylinderInspection::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<CylinderFilling>().eq(CylinderFilling::getAppId,appId).between(CylinderFilling::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<CylinderFilling>().eq(CylinderFilling::getAppId, appId).between(CylinderFilling::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<CylinderFillingRecord>().eq(CylinderFillingRecord::getAppId,appId).between(CylinderFillingRecord::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<CylinderFillingRecord>().eq(CylinderFillingRecord::getAppId, appId).between(CylinderFillingRecord::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<CylinderFillingCheck>().eq(CylinderFillingCheck::getAppId,appId).between(CylinderFillingCheck::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<CylinderFillingCheck>().eq(CylinderFillingCheck::getAppId, appId).between(CylinderFillingCheck::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<CylinderFillingExamine>().eq(CylinderFillingExamine::getAppId,appId).between(CylinderFillingExamine::getSyncDate,todayStr + " 00:00:00",todayStr + " 23:59:59")); Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<CylinderFillingExamine>().eq(CylinderFillingExamine::getAppId, appId).between(CylinderFillingExamine::getSyncDate, todayStr + " 00:00:00", todayStr + " 23:59:59"));
Integer total = cylinder + cylinderUnit + tags + inspection+filling+fillingRecord+fillingCheck+examine; Integer total = cylinder + cylinderUnit + tags + inspection + filling + fillingRecord + fillingCheck + examine;
info.setCylinderExamineInfo(examine); info.setCylinderExamineInfo(examine);
info.setCylinderUnit(cylinderUnit); info.setCylinderUnit(cylinderUnit);
info.setCylinderFillingCheckInfo(fillingCheck); info.setCylinderFillingCheckInfo(fillingCheck);
...@@ -238,18 +237,18 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto ...@@ -238,18 +237,18 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto
} }
public void initializeData(){ public void initializeData() {
// 每天更新或者添加昨天的数据 // 每天更新或者添加昨天的数据
Date date = new Date();//取时间 Date date = new Date();//取时间
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(date); calendar.setTime(date);
//这个时间就是日期往后推一天的结果 //这个时间就是日期往后推一天的结果
date=calendar.getTime(); date = calendar.getTime();
LambdaQueryWrapper<CylinderUnit> lambda = new QueryWrapper<CylinderUnit>().lambda(); LambdaQueryWrapper<CylinderUnit> lambda = new QueryWrapper<CylinderUnit>().lambda();
List<CylinderUnit> cylinderUnits = cylinderUnitMapper.selectList(lambda); List<CylinderUnit> cylinderUnits = cylinderUnitMapper.selectList(lambda);
logger.info("清除cylinder_date_info表已有数据"); logger.info("清除cylinder_date_info表已有数据");
this.baseMapper.delete(null); this.baseMapper.delete(null);
for(CylinderUnit token : cylinderUnits) { for (CylinderUnit token : cylinderUnits) {
try { try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String todayStr = sdf.format(date); String todayStr = sdf.format(date);
...@@ -262,15 +261,15 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto ...@@ -262,15 +261,15 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto
logger.info("初始化数据时间{}", todayStr); logger.info("初始化数据时间{}", todayStr);
// 获取气瓶基本信息 // 获取气瓶基本信息
Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId,appid).notLike(CylinderInfo::getSyncDate, todayStr)); Integer cylinder = cylinderInfoService.count(new LambdaQueryWrapper<CylinderInfo>().eq(CylinderInfo::getAppId, appid).notLike(CylinderInfo::getSyncDate, todayStr));
Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId,appid).notLike(CylinderUnit::getSyncDate, todayStr)); Integer cylinderUnit = cylinderUnitService.count(new LambdaQueryWrapper<CylinderUnit>().eq(CylinderUnit::getAppId, appid).notLike(CylinderUnit::getSyncDate, todayStr));
Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<CylinderTags>().eq(CylinderTags::getAppId,appid).notLike(CylinderTags::getSyncDate, todayStr)); Integer tags = cylinderTagsService.count(new LambdaQueryWrapper<CylinderTags>().eq(CylinderTags::getAppId, appid).notLike(CylinderTags::getSyncDate, todayStr));
Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<CylinderInspection>().eq(CylinderInspection::getAppId,appid).notLike(CylinderInspection::getSyncDate, todayStr)); Integer inspection = cylinderInspectionService.count(new LambdaQueryWrapper<CylinderInspection>().eq(CylinderInspection::getAppId, appid).notLike(CylinderInspection::getSyncDate, todayStr));
Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<CylinderFilling>().eq(CylinderFilling::getAppId,appid).notLike(CylinderFilling::getSyncDate, todayStr)); Integer filling = cylinderFillingService.count(new LambdaQueryWrapper<CylinderFilling>().eq(CylinderFilling::getAppId, appid).notLike(CylinderFilling::getSyncDate, todayStr));
Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<CylinderFillingRecord>().eq(CylinderFillingRecord::getAppId,appid).notLike(CylinderFillingRecord::getSyncDate, todayStr)); Integer fillingRecord = cylinderFillingRecordService.count(new LambdaQueryWrapper<CylinderFillingRecord>().eq(CylinderFillingRecord::getAppId, appid).notLike(CylinderFillingRecord::getSyncDate, todayStr));
Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<CylinderFillingCheck>().eq(CylinderFillingCheck::getAppId,appid).notLike(CylinderFillingCheck::getSyncDate, todayStr)); Integer fillingCheck = cylinderFillingCheckService.count(new LambdaQueryWrapper<CylinderFillingCheck>().eq(CylinderFillingCheck::getAppId, appid).notLike(CylinderFillingCheck::getSyncDate, todayStr));
Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<CylinderFillingExamine>().eq(CylinderFillingExamine::getAppId,appid).notLike(CylinderFillingExamine::getSyncDate, todayStr)); Integer examine = cylinderFillingExamineService.count(new LambdaQueryWrapper<CylinderFillingExamine>().eq(CylinderFillingExamine::getAppId, appid).notLike(CylinderFillingExamine::getSyncDate, todayStr));
Integer total = cylinder + cylinderUnit + tags + inspection+filling+fillingRecord+fillingCheck+examine; Integer total = cylinder + cylinderUnit + tags + inspection + filling + fillingRecord + fillingCheck + examine;
temp.setCylinderExamineInfo(examine); temp.setCylinderExamineInfo(examine);
temp.setCylinderUnit(cylinderUnit); temp.setCylinderUnit(cylinderUnit);
temp.setCylinderFillingCheckInfo(fillingCheck); temp.setCylinderFillingCheckInfo(fillingCheck);
...@@ -289,5 +288,4 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto ...@@ -289,5 +288,4 @@ public class CylinderDateInfoServiceImpl extends BaseService<CylinderDateInfoDto
} }
} }
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