From 9345bb7932c963e1f9ccbf2bfe0d6a415132875d Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Wed, 19 Mar 2025 15:40:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A2=85=E5=B7=9E=E4=B8=AD=E5=8C=BB?= =?UTF-8?q?=E9=99=A2LIS=E6=A3=80=E9=AA=8C=E5=8D=95=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ectJob.java => MzZyyReportCollectJob.java} | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) rename src/main/java/com/docus/server/mzzyy/job/{MzZyyLisCollectJob.java => MzZyyReportCollectJob.java} (86%) diff --git a/src/main/java/com/docus/server/mzzyy/job/MzZyyLisCollectJob.java b/src/main/java/com/docus/server/mzzyy/job/MzZyyReportCollectJob.java similarity index 86% rename from src/main/java/com/docus/server/mzzyy/job/MzZyyLisCollectJob.java rename to src/main/java/com/docus/server/mzzyy/job/MzZyyReportCollectJob.java index bedac1b..af171ae 100644 --- a/src/main/java/com/docus/server/mzzyy/job/MzZyyLisCollectJob.java +++ b/src/main/java/com/docus/server/mzzyy/job/MzZyyReportCollectJob.java @@ -39,7 +39,7 @@ import java.util.Locale; */ @Component @Slf4j -public class MzZyyLisCollectJob { +public class MzZyyReportCollectJob { @Autowired private DownPlatformService downPlatformService; @Autowired @@ -63,7 +63,7 @@ public class MzZyyLisCollectJob { return; } - final String fileTitle = "Lis检查报告单"; + final String fileTitle = "LIS检查报告单"; ReportDownTwoDto downTwoDto = commonResult.getData(); ReportTaskTwoDto task = downTwoDto.getTasks().get(0); @@ -126,5 +126,21 @@ public class MzZyyLisCollectJob { downPlatformService.report(reportDownDto); } + @XxlJob("MzZyyShouMaCollectJob") + public void shouMaCollectJob() { + String configPath = "data-config"; + String configName = "mzzyy-ws-config"; + TableJsonRead jsonReader = new TableJsonRead(); + JSONObject configOjb = jsonReader.Read(configPath, configName, JSONObject.class); + JSONObject lisWsConfig = configOjb.getJSONObject("shouMa"); + String collectorId = lisWsConfig.getString("collectorId"); + String assortId = lisWsConfig.getString("assortId"); + + CommonResult commonResult = taskDistributeService.getNoViewTaskByCollectorId(collectorId); + if (!ResultCode.SUCCESS.getCode().equals(commonResult.getCode()) + || commonResult.getData() == null) { + return; + } + } }