diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/HeatingSyncXzHistoryJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/HeatingSyncXzHistoryJob.java new file mode 100644 index 0000000..d314618 --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/HeatingSyncXzHistoryJob.java @@ -0,0 +1,50 @@ +package org.jeecg.modules.heating.job; + +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.util.DateUtils; +import org.jeecg.modules.heating.entity.HeatanalysisHistory; +import org.jeecg.modules.heating.service.HeatanalysisHistoryService; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +/** + * 同步乡镇历史数据 定时每2分钟 + * @author: jeecg-boot + */ + +@Slf4j +public class HeatingSyncXzHistoryJob implements Job { + + @Autowired + private HeatanalysisHistoryService service; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + log.info(String.format("同步乡镇历史数据 HeatingSyncXzHistoryJob ! 时间:" + DateUtils.getTimestamp())); + SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + HeatanalysisHistory entity = new HeatanalysisHistory(); + entity.setRegionType("乡镇"); + Calendar c = Calendar.getInstance(); + entity.setEDate(c.getTime()); + String eDateStr = timeFormat.format(c.getTime()); + String suffix = eDateStr.substring(2, 4)+eDateStr.substring(5, 7); + String tableName = "bl_heatanalysis_"+suffix; + entity.setTableName(tableName); + c.add(Calendar.MINUTE,-5); + entity.setSDate(c.getTime()); + List list = service.findSyncXzHistoryList(entity); + for (HeatanalysisHistory heat : list) + { + log.info(String.format("code:"+heat.getCode()+" sim:" + heat.getSim())); + service.syncXzHistory(heat); + } + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/HeatingSyncXzJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/HeatingSyncXzJob.java new file mode 100644 index 0000000..a8609ef --- /dev/null +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/job/HeatingSyncXzJob.java @@ -0,0 +1,38 @@ +package org.jeecg.modules.heating.job; + +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.util.DateUtils; +import org.jeecg.modules.heating.entity.Heatanalysis; +import org.jeecg.modules.heating.service.HeatanalysisService; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +/** + * 同步乡镇数据 定时每2分钟 + * @author: jeecg-boot + */ + +@Slf4j +public class HeatingSyncXzJob implements Job { + + @Autowired + private HeatanalysisService service; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + log.info(String.format("同步乡镇数据 HeatingSyncXzJob ! 时间:" + DateUtils.getTimestamp())); + Heatanalysis entity = new Heatanalysis(); + entity.setRegionType("乡镇"); + List list = service.findList(entity); + for (Heatanalysis heat : list) + { + log.info(String.format("code:"+heat.getCode()+" sim:" + heat.getSim())); + service.syncXz(heat); + } + } + +} diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisHistoryMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisHistoryMapper.java index 9721371..17d48ff 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisHistoryMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisHistoryMapper.java @@ -12,4 +12,6 @@ public interface HeatanalysisHistoryMapper extends BaseMapper findJxPage(Page page, @Param("params") HeatanalysisHistory heatanalysisHistory); List findHistoryList(HeatanalysisHistory heatanalysisHistory); List getJxHistoryList(HeatanalysisHistory heatanalysisHistory); + void syncXzHistory(HeatanalysisHistory heatanalysisHistory); + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java index 8b8e58c..bcc9a42 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/HeatanalysisMapper.java @@ -31,4 +31,6 @@ public interface HeatanalysisMapper extends BaseMapper { Page yunweiPage(Page page, @Param("params") Heatanalysis heatanalysis); List getStaticNowList(@Param("params") HomeApiEntity dto); + + void syncXz(Heatanalysis heatanalysis); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisHistoryMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisHistoryMapper.xml index 2bb4806..2579570 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisHistoryMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisHistoryMapper.xml @@ -402,4 +402,50 @@ ORDER BY view001 asc ,view002 asc,view004 asc, view032 ASC + + CALL P_Q_D_HEATANALYSIS_SYNC_HISTORY( + #{id}, + #{view001}, + #{view002}, + #{view004}, + #{datatime}, + #{caveat}, + #{view005}, + #{view006}, + #{view007}, + #{view008}, + #{view009}, + #{view010}, + #{view011}, + #{view012}, + #{view001Name}, + #{view002Name}, + #{view004Name}, + #{sim}, + #{delFlag}, + #{code}, + #{reportType}, + #{isExtract}, + #{regionType}, + #{fromFlow}, + #{view031}, + #{view032}, + #{view033}, + #{view034}, + #{view035}, + #{view036}, + #{view037}, + #{view038}, + #{view039}, + #{view040}, + #{view041}, + #{view042}, + #{view043}, + #{view044}, + #{view045}, + #{view046}, + #{view047} + ) + + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml index 300bb1b..8e41f46 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml @@ -241,6 +241,7 @@ a.view046 AS "view046", a.view047 AS "view047", a.sim AS "sim", + a.code AS "code", a.create_by AS "createBy.id", a.create_date AS "createDate", a.update_by AS "updateBy.id", @@ -289,6 +290,9 @@ AND a.caveat = #{caveat} + + AND a.region_type = #{regionType} + ORDER BY a.view001 asc ,a.view002 asc,a.view004 asc,A.DATATIME DESC @@ -656,5 +660,49 @@ ORDER BY view001 asc ,view002 asc,view004 asc + + CALL P_Q_D_HEATANALYSIS_SYNC( + #{view001}, + #{view002}, + #{view004}, + #{datatime}, + #{caveat}, + #{view005}, + #{view006}, + #{view007}, + #{view008}, + #{view009}, + #{view010}, + #{view011}, + #{view012}, + #{view001Name}, + #{view002Name}, + #{view004Name}, + #{sim}, + #{delFlag}, + #{code}, + #{reportType}, + #{isExtract}, + #{regionType}, + #{fromFlow}, + #{view031}, + #{view032}, + #{view033}, + #{view034}, + #{view035}, + #{view036}, + #{view037}, + #{view038}, + #{view039}, + #{view040}, + #{view041}, + #{view042}, + #{view043}, + #{view044}, + #{view045}, + #{view046}, + #{view047} + ) + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisHistoryService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisHistoryService.java index 2589a17..682c69c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisHistoryService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisHistoryService.java @@ -13,4 +13,6 @@ public interface HeatanalysisHistoryService extends JeecgService findHistoryList(HeatanalysisHistory heatanalysisHistory); Result getHistoryList(HeatanalysisHistory heatanalysisHistory); Result getJxHistoryList(HeatanalysisHistory heatanalysisHistory); + List findSyncXzHistoryList(HeatanalysisHistory heatanalysisHistory); + void syncXzHistory(HeatanalysisHistory heatanalysisHistory); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java index a651dc4..0cffcc6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/HeatanalysisService.java @@ -18,6 +18,7 @@ public interface HeatanalysisService extends JeecgService { List findStaticList(Heatanalysis heatanalysis); List findSimulateList(Heatanalysis heatanalysis); void exeProc(Heatanalysis heatanalysis); + List lowest(Heatanalysis heatanalysis); IPage findOnePage(Page page, Heatanalysis heatanalysis); @@ -32,4 +33,6 @@ public interface HeatanalysisService extends JeecgService { IPage yunweiPage(Page page,Heatanalysis heatanalysis); List getStaticNowList(HomeApiEntity dto); + + void syncXz(Heatanalysis heatanalysis); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisHistoryServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisHistoryServiceImpl.java index b0d5bbd..70bb80a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisHistoryServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisHistoryServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.heating.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; @@ -191,4 +192,14 @@ public class HeatanalysisHistoryServiceImpl extends JeecgServiceImpl findSyncXzHistoryList(HeatanalysisHistory heatanalysisHistory){ + return baseMapper.getJxHistoryList(heatanalysisHistory); + } + + @Override + @DS("multi-datasource1") + public void syncXzHistory(HeatanalysisHistory heatanalysisHistory){ + baseMapper.syncXzHistory(heatanalysisHistory); + } + } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java index b5e76ab..518635d 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/service/impl/HeatanalysisServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.heating.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.system.base.service.impl.JeecgServiceImpl; @@ -107,4 +108,9 @@ public class HeatanalysisServiceImpl extends JeecgServiceImpl