From 3f10cef01e37254b8d29789955af0cbbfdad4b9b Mon Sep 17 00:00:00 2001 From: bobol Date: Thu, 18 Apr 2024 09:27:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8E=A5=E5=8F=A3=E8=B0=83=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=89=A7=E8=A1=8C=202=E3=80=81?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83mysql=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lzbi/RuoYiApplication.java | 2 + .../src/main/resources/application-test.yml | 2 +- .../service/DcBusiParamBillMasterService.java | 5 +- .../com/lzbi/task/TaskParamDfratProcess.java | 113 +++++++++--------- .../java/com/lzbi/task/TaskWorkParamRead.java | 19 +-- .../mapper/asset/WorkParamReadMapper.xml | 6 +- .../quartz/controller/BizJobController.java | 38 ++++++ .../lzbi/quartz/service/IBizJobService.java | 16 +++ .../service/impl/BizJobServiceImpl.java | 39 ++++++ .../lzbi/quartz/task/SyncIotSystemTask.java | 4 +- 10 files changed, 176 insertions(+), 68 deletions(-) create mode 100644 lzbi-quartz/src/main/java/com/lzbi/quartz/controller/BizJobController.java create mode 100644 lzbi-quartz/src/main/java/com/lzbi/quartz/service/IBizJobService.java create mode 100644 lzbi-quartz/src/main/java/com/lzbi/quartz/service/impl/BizJobServiceImpl.java diff --git a/lzbi-admin/src/main/java/com/lzbi/RuoYiApplication.java b/lzbi-admin/src/main/java/com/lzbi/RuoYiApplication.java index 9bb8545..9938da3 100644 --- a/lzbi-admin/src/main/java/com/lzbi/RuoYiApplication.java +++ b/lzbi-admin/src/main/java/com/lzbi/RuoYiApplication.java @@ -5,12 +5,14 @@ import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.scheduling.annotation.EnableAsync; /** * 启动程序 * * @author ruoyi */ +@EnableAsync @EnableKnife4j @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, DruidDataSourceAutoConfigure.class }) public class RuoYiApplication diff --git a/lzbi-admin/src/main/resources/application-test.yml b/lzbi-admin/src/main/resources/application-test.yml index 83b0d79..2220e8e 100644 --- a/lzbi-admin/src/main/resources/application-test.yml +++ b/lzbi-admin/src/main/resources/application-test.yml @@ -76,7 +76,7 @@ spring: datasource: # 主库数据源 master: - url: jdbc:mysql://10.10.10.56:13306/lzdc_bi_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true + url: jdbc:mysql://10.10.10.56:13306/lzdc_bi_db?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&keepAlive=true&autoReconnect=true&autoReconnectForPools=true&connectTimeout=30000&socketTimeout=60000 username: luenmei password: 123456 # # 计费数据库 diff --git a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamBillMasterService.java b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamBillMasterService.java index 86b616d..d29216c 100644 --- a/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamBillMasterService.java +++ b/lzbi-module/src/main/java/com/lzbi/draft/service/DcBusiParamBillMasterService.java @@ -5,6 +5,7 @@ import java.util.List; import com.lzbi.draft.domain.DcBusiParamBillMaster; import com.lzbi.draft.domain.DcBusiParamBillSub; import com.lzbi.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import com.lzbi.common.utils.DateUtils; @@ -21,6 +22,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class DcBusiParamBillMasterService extends ServiceImpl implements IService { + @Autowired + private DcBusiParamBillSubService dcBusiParamBillSubService; /** * 查询参数采集（录入）单据主 @@ -123,7 +126,7 @@ public class DcBusiParamBillMasterService extends ServiceImpl 0) { - baseMapper.batchDcBusiParamBillSubDao(list); + dcBusiParamBillSubService.saveBatch(list); } } } diff --git a/lzbi-module/src/main/java/com/lzbi/task/TaskParamDfratProcess.java b/lzbi-module/src/main/java/com/lzbi/task/TaskParamDfratProcess.java index 3ad5e7a..0bfcdff 100644 --- a/lzbi-module/src/main/java/com/lzbi/task/TaskParamDfratProcess.java +++ b/lzbi-module/src/main/java/com/lzbi/task/TaskParamDfratProcess.java @@ -46,73 +46,78 @@ public class TaskParamDfratProcess { List dcBusiParamBillSubs = dcBusiParamBillSubService.selectByVo(billSub); if (CollectionUtils.isEmpty(dcBusiParamBillSubs)) { log.error("单据无数据"); - return; - } - List assetCodeList = dcBusiParamBillSubs.stream().map(DcBusiParamBillSub::getAssetCode).collect(Collectors.toList()); - List paramCodeList = dcBusiParamBillSubs.stream().map(DcBusiParamBillSub::getParamCode).collect(Collectors.toList()); - List paramFieldCodeList = dcBusiParamBillSubs.stream().map(DcBusiParamBillSub::getFieldCode).collect(Collectors.toList()); - List countDateList = dcBusiParamBillSubs.stream().map(DcBusiParamBillSub::getCountDate).collect(Collectors.toList()); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("param_code", paramCodeList); - queryWrapper.in("asset_code", assetCodeList); - queryWrapper.in("param_field_code", paramFieldCodeList); - queryWrapper.in("count_date", countDateList); - List paramDraftDayList = dBusiParamDraftDayService.list(queryWrapper); - Map paramDraftDayMap; - if (CollectionUtils.isEmpty(paramDraftDayList)) { - log.info("底稿表无数据"); - paramDraftDayMap = new HashMap<>(); } else { - paramDraftDayMap = paramDraftDayList.stream().collect(Collectors.toMap(gp -> gp.getAssetCode() + ":" + gp.getParamCode() + ":" + gp.getParamFieldCode() + ":" + gp.getCountDate(), gp -> gp)); - } - Map> paramBillSubMap = dcBusiParamBillSubs.stream().collect(Collectors.groupingBy(gp -> gp.getAssetCode() + ":" + gp.getParamCode() + ":" + gp.getFieldCode() + ":" + gp.getCountDate())); - List insertDataList = new ArrayList<>(); - List updateDataList = new ArrayList<>(); - paramBillSubMap.forEach((key, value) -> { - DcBusiParamDraftDay dcBusiParamDraftDay = Optional.ofNullable(paramDraftDayMap.get(key)).orElse(new DcBusiParamDraftDay()); - if (null == dcBusiParamDraftDay.getId()) { - insertDataList.add(dcBusiParamDraftDay); + List assetCodeList = dcBusiParamBillSubs.stream().map(DcBusiParamBillSub::getAssetCode).collect(Collectors.toList()); + List paramCodeList = dcBusiParamBillSubs.stream().map(DcBusiParamBillSub::getParamCode).collect(Collectors.toList()); + List paramFieldCodeList = dcBusiParamBillSubs.stream().map(DcBusiParamBillSub::getFieldCode).collect(Collectors.toList()); + List countDateList = dcBusiParamBillSubs.stream().map(DcBusiParamBillSub::getCountDate).collect(Collectors.toList()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("param_code", paramCodeList); + queryWrapper.in("asset_code", assetCodeList); + queryWrapper.in("param_field_code", paramFieldCodeList); + queryWrapper.in("count_date", countDateList); + List paramDraftDayList = dBusiParamDraftDayService.list(queryWrapper); + Map paramDraftDayMap; + if (CollectionUtils.isEmpty(paramDraftDayList)) { + log.info("底稿表无数据，日期为：【{}】", billMasterDao.getBillIncomeDate()); + paramDraftDayMap = new HashMap<>(); } else { - updateDataList.add(dcBusiParamDraftDay); + paramDraftDayMap = paramDraftDayList.stream().collect(Collectors.toMap(gp -> gp.getAssetCode() + ":" + gp.getParamCode() + ":" + gp.getParamFieldCode() + ":" + gp.getCountDate(), gp -> gp)); } - List subs = value.stream().sorted(Comparator.comparing(DcBusiParamBillSub::getCountHour)).collect(Collectors.toList()); - subs.forEach(val -> { + Map> paramBillSubMap = dcBusiParamBillSubs.stream().collect(Collectors.groupingBy(gp -> gp.getAssetCode() + ":" + gp.getParamCode() + ":" + gp.getFieldCode() + ":" + gp.getCountDate())); + List insertDataList = new ArrayList<>(); + List updateDataList = new ArrayList<>(); + paramBillSubMap.forEach((key, value) -> { + DcBusiParamDraftDay dcBusiParamDraftDay = Optional.ofNullable(paramDraftDayMap.get(key)).orElse(new DcBusiParamDraftDay()); if (null == dcBusiParamDraftDay.getId()) { - dcBusiParamDraftDay.setParamFieldCode(val.getFieldCode()); - dcBusiParamDraftDay.setParamCode(val.getParamCode()); - dcBusiParamDraftDay.setCountDate(val.getCountDate()); - dcBusiParamDraftDay.setAssetCode(val.getAssetCode()); - //------------设置 统计单元的其他信息 - dcBusiParamDraftDay.setOrganizeId(billMasterDao.getOragnizeId()); - dcBusiParamDraftDay.setOrganizeName(billMasterDao.getOrganizeName()); - dcBusiParamDraftDay.setParamName(val.getParamName()); - dcBusiParamDraftDay.setTargetUint(val.getParamUint()); - dcBusiParamDraftDay.setAssetName(val.getAssetName()); - dcBusiParamDraftDay.setCompanyId(billMasterDao.getCompanyId()); - dcBusiParamDraftDay.setCompanyName(billMasterDao.getCompanyName()); - dcBusiParamDraftDay.setCreatedBy("task"); - dcBusiParamDraftDay.setCreatedTime(date); + insertDataList.add(dcBusiParamDraftDay); + } else { + updateDataList.add(dcBusiParamDraftDay); } - dcBusiParamDraftDay.setValForSeq(val.getCountHour(), val.getParamValue()); - dcBusiParamDraftDay.setUpdatedBy("task"); - dcBusiParamDraftDay.setUpdatedTime(date); + List subs = value.stream().sorted(Comparator.comparing(DcBusiParamBillSub::getCountHour)).collect(Collectors.toList()); + subs.forEach(val -> { + if (null == dcBusiParamDraftDay.getId()) { + dcBusiParamDraftDay.setParamFieldCode(val.getFieldCode()); + dcBusiParamDraftDay.setParamCode(val.getParamCode()); + dcBusiParamDraftDay.setCountDate(val.getCountDate()); + dcBusiParamDraftDay.setAssetCode(val.getAssetCode()); + //------------设置 统计单元的其他信息 + dcBusiParamDraftDay.setOrganizeId(billMasterDao.getOragnizeId()); + dcBusiParamDraftDay.setOrganizeName(billMasterDao.getOrganizeName()); + dcBusiParamDraftDay.setParamName(val.getParamName()); + dcBusiParamDraftDay.setTargetUint(val.getParamUint()); + dcBusiParamDraftDay.setAssetName(val.getAssetName()); + dcBusiParamDraftDay.setCompanyId(billMasterDao.getCompanyId()); + dcBusiParamDraftDay.setCompanyName(billMasterDao.getCompanyName()); + dcBusiParamDraftDay.setCreatedBy("task"); + dcBusiParamDraftDay.setCreatedTime(date); + } + dcBusiParamDraftDay.setValForSeq(val.getCountHour(), val.getParamValue()); + dcBusiParamDraftDay.setUpdatedBy("task"); + dcBusiParamDraftDay.setUpdatedTime(date); + }); + dcBusiParamDraftDay.calculate(); }); - dcBusiParamDraftDay.calculate(); - }); - if (!CollectionUtils.isEmpty(insertDataList)) { - dBusiParamDraftDayService.saveBatch(insertDataList); - } - if (!CollectionUtils.isEmpty(updateDataList)) { - dBusiParamDraftDayService.updateBatchById(updateDataList); + if (!CollectionUtils.isEmpty(insertDataList)) { + dBusiParamDraftDayService.saveBatch(insertDataList); + } + if (!CollectionUtils.isEmpty(updateDataList)) { + dBusiParamDraftDayService.updateBatchById(updateDataList); + } } + billMasterDao.setCheckStatus("1"); + dcBusiParamBillMasterService.updateById(billMasterDao); } public void doBills() { DcBusiParamBillMaster dcBusiParamBillMasterDao = new DcBusiParamBillMaster(); dcBusiParamBillMasterDao.setCheckStatus("0"); List dcBusiParamBillMasterDaos = dcBusiParamBillMasterService.selectDcBusiParamBillMasterDaoList(dcBusiParamBillMasterDao); - dcBusiParamBillMasterDaos.forEach(item -> { + log.info("一共有【{}】个单据需要审核", dcBusiParamBillMasterDaos.size()); + for (int i = 0, len = dcBusiParamBillMasterDaos.size(); i < len; i++) { + DcBusiParamBillMaster item = dcBusiParamBillMasterDaos.get(i); + log.info("正在处理日期为：【{}】的单据", item.getBillIncomeDate()); doBill(item); - }); + } } } diff --git a/lzbi-module/src/main/java/com/lzbi/task/TaskWorkParamRead.java b/lzbi-module/src/main/java/com/lzbi/task/TaskWorkParamRead.java index 050657d..bab7541 100644 --- a/lzbi-module/src/main/java/com/lzbi/task/TaskWorkParamRead.java +++ b/lzbi-module/src/main/java/com/lzbi/task/TaskWorkParamRead.java @@ -20,6 +20,7 @@ import com.lzbi.task.service.DcBusiWorkReadLogService; import com.lzbi.task.service.WorkParamReadService; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; import java.util.*; import java.util.stream.Collectors; @@ -112,6 +113,17 @@ public class TaskWorkParamRead { private final String SOURCE = "work"; public int createParamBill(String inComeDate) { + + List billSub = new ArrayList<>(); + DcBusiWorkReadConfig dwrc = new DcBusiWorkReadConfig(); + dwrc.setGoalSource(SOURCE); + List dcBusiWorkReadConfigs = dcBusiWorkReadConfigService.selectDcBusiWorkReadConfigList(dwrc); + Set pcl = dcBusiWorkReadConfigs.parallelStream().filter(o -> StringUtils.isNotEmpty(o.getGoalParamCode())).map(DcBusiWorkReadConfig::getGoalParamCode).collect(Collectors.toSet()); +// Set dcl = dcBusiWorkReadConfigs.parallelStream().filter(o -> StringUtils.isNotEmpty(o.getGoalParamExt1())).map(DcBusiWorkReadConfig::getGoalParamExt1).collect(Collectors.toSet()); + List listRow = getWorkReadVo(inComeDate, pcl); + if (CollectionUtils.isEmpty(listRow)) { + return 0; + } DcBusiCoderuleConfigDao ruleIdByBusicode = dcBaseCoderuleDefineService.getRuleIdByBusicode(BUSICODE); DcBaseCoderuleDefineDao ruleDao = dcBaseCoderuleDefineService.selectDcBaseCoderuleDefineDaoById(ruleIdByBusicode.getRuleId()); DcBusiParamBillMaster billm = new DcBusiParamBillMaster(); @@ -126,13 +138,6 @@ public class TaskWorkParamRead { billm.setBillType("2"); billm.setCheckType("1"); billm.setCheckStatus("0"); - List billSub = new ArrayList<>(); - DcBusiWorkReadConfig dwrc = new DcBusiWorkReadConfig(); - dwrc.setGoalSource(SOURCE); - List dcBusiWorkReadConfigs = dcBusiWorkReadConfigService.selectDcBusiWorkReadConfigList(dwrc); - Set pcl = dcBusiWorkReadConfigs.parallelStream().filter(o -> StringUtils.isNotEmpty(o.getGoalParamCode())).map(DcBusiWorkReadConfig::getGoalParamCode).collect(Collectors.toSet()); -// Set dcl = dcBusiWorkReadConfigs.parallelStream().filter(o -> StringUtils.isNotEmpty(o.getGoalParamExt1())).map(DcBusiWorkReadConfig::getGoalParamExt1).collect(Collectors.toSet()); - List listRow = getWorkReadVo(inComeDate, pcl); final String billNo_c = billNo; listRow.forEach(item -> { Optional find = dcBusiWorkReadConfigs.parallelStream().filter(info -> { diff --git a/lzbi-module/src/main/resources/mapper/asset/WorkParamReadMapper.xml b/lzbi-module/src/main/resources/mapper/asset/WorkParamReadMapper.xml index 9e497f1..407dd09 100644 --- a/lzbi-module/src/main/resources/mapper/asset/WorkParamReadMapper.xml +++ b/lzbi-module/src/main/resources/mapper/asset/WorkParamReadMapper.xml @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" first(param_value_num, timestamp_key) AS firstVal, last(param_value_num,timestamp_key) AS lastVal, min(param_value_num) AS minVal - FROM dc_base_log_history_level1 AS his + FROM dc_base_log_history_level3 AS his timestamp_key BETWEEN to_timestamp(#{beginTime},'yyyy-MM-dd hh24:mi:ss') and to_timestamp(#{endTime},'yyyy-MM-dd hh24:mi:ss') @@ -75,7 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SUM ( CASE WHEN t1.param_value_num > 0.00 THEN 1 ELSE 0 END ) AS countsz, LAST ( t1.param_value_num, timestamp_key ) AS lastVal FROM - dc_base_log_history_level1 t1 + dc_base_log_history_level3 t1 INNER JOIN dc_base_device_param t2 ON t1.param_code = t2.param_code AND t2.param_model_id IN @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SUM ( CASE WHEN t1.param_value_num > 0.00 THEN 1 ELSE 0 END ) AS countsz, LAST ( t1.param_value_num, timestamp_key ) AS lastVal FROM - dc_base_log_history_level1 t1 + dc_base_log_history_level3 t1 INNER JOIN dc_base_device_param t2 ON t1.param_code = t2.param_code AND t2.param_model_id IN diff --git a/lzbi-quartz/src/main/java/com/lzbi/quartz/controller/BizJobController.java b/lzbi-quartz/src/main/java/com/lzbi/quartz/controller/BizJobController.java new file mode 100644 index 0000000..0ea1ebc --- /dev/null +++ b/lzbi-quartz/src/main/java/com/lzbi/quartz/controller/BizJobController.java @@ -0,0 +1,38 @@ +package com.lzbi.quartz.controller; + +import com.lzbi.common.core.domain.AjaxResult; +import com.lzbi.quartz.service.IBizJobService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/bizJob") +public class BizJobController { + + @Autowired + private IBizJobService bizJobService; + + /** + * 执行同步iot数据任务 + * @param startDate + * @param endDate + * @return + */ + @GetMapping("/syncIotSystemTask") + public AjaxResult syncIotSystemTask(String startDate, String endDate) { + bizJobService.syncIotSystemTask(startDate, endDate); + return AjaxResult.success(); + } + + /** + * 执行自动审核任务 + * @return + */ + @GetMapping("/autoAuditTask") + public AjaxResult autoAuditTask() { + bizJobService.autoAuditTask(); + return AjaxResult.success(); + } +} diff --git a/lzbi-quartz/src/main/java/com/lzbi/quartz/service/IBizJobService.java b/lzbi-quartz/src/main/java/com/lzbi/quartz/service/IBizJobService.java new file mode 100644 index 0000000..27f4488 --- /dev/null +++ b/lzbi-quartz/src/main/java/com/lzbi/quartz/service/IBizJobService.java @@ -0,0 +1,16 @@ +package com.lzbi.quartz.service; + +public interface IBizJobService { + + /** + * 执行同步iot数据 + * @param startDateStr + * @param endDateStr + */ + void syncIotSystemTask(String startDateStr, String endDateStr); + + /** + * 执行自动审核任务 + */ + void autoAuditTask(); +} diff --git a/lzbi-quartz/src/main/java/com/lzbi/quartz/service/impl/BizJobServiceImpl.java b/lzbi-quartz/src/main/java/com/lzbi/quartz/service/impl/BizJobServiceImpl.java new file mode 100644 index 0000000..09ccbd9 --- /dev/null +++ b/lzbi-quartz/src/main/java/com/lzbi/quartz/service/impl/BizJobServiceImpl.java @@ -0,0 +1,39 @@ +package com.lzbi.quartz.service.impl; + +import com.lzbi.quartz.service.IBizJobService; +import com.lzbi.quartz.task.AutoAuditTask; +import com.lzbi.quartz.task.SyncIotSystemTask; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; + +@Service +public class BizJobServiceImpl implements IBizJobService { + + private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + + @Autowired + private SyncIotSystemTask syncIotSystemTask; + + @Autowired + private AutoAuditTask autoAuditTask; + + @Async + @Override + public void syncIotSystemTask(String startDateStr, String endDateStr) { + LocalDate endDate = LocalDate.parse(endDateStr, DATE_FORMATTER); + for (LocalDate startDate = LocalDate.parse(startDateStr, DATE_FORMATTER); startDate.isBefore(endDate) ; startDate = startDate.plusDays(1)) { + syncIotSystemTask.syncIotParams(false, startDate.format(DATE_FORMATTER)); + } + } + + @Async + @Override + public void autoAuditTask() { + autoAuditTask.auditParamsBill(); + } + +} diff --git a/lzbi-quartz/src/main/java/com/lzbi/quartz/task/SyncIotSystemTask.java b/lzbi-quartz/src/main/java/com/lzbi/quartz/task/SyncIotSystemTask.java index 53b9f12..5248384 100644 --- a/lzbi-quartz/src/main/java/com/lzbi/quartz/task/SyncIotSystemTask.java +++ b/lzbi-quartz/src/main/java/com/lzbi/quartz/task/SyncIotSystemTask.java @@ -21,8 +21,8 @@ public class SyncIotSystemTask { * @param dateStr 同步数据的日期字符串 */ public void syncIotParams(Boolean ifLog, String dateStr) { - log.info("===========同步IOT参数开始，是否存入日志：{}============", ifLog); + log.info("===========同步IOT参数开始，是否存入日志：{}，日期：{}============", ifLog, dateStr); taskWorkParamRead.runTask(ifLog, dateStr); - log.info("===========同步IOT参数结束，是否存入日志：{}============", ifLog); + log.info("===========同步IOT参数结束，是否存入日志：{}，日期：{}============", ifLog, dateStr); } }