From c0624d94183e85e6c7579a318e75694434b13fdb Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 04 Jul 2024 10:54:15 +0800
Subject: [PATCH] 代码优化
---
src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java | 12 +++---------
src/main/java/org/springblade/modules/eCallEventTwo/dto/EcOrderParamDTO.java | 4 ++--
src/main/java/org/springblade/xxljob/jobhandler/LabelHandleJob.java | 20 +++-----------------
src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java | 15 ++++++++-------
src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcOrderMapper.xml | 3 +--
5 files changed, 17 insertions(+), 37 deletions(-)
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java b/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
index f8e12d3..744fd6e 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/controller/ECallEventTwoController.java
@@ -27,6 +27,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.eCallEventTwo.dto.EcOrderDTO;
import org.springblade.modules.eCallEventTwo.dto.EcOrderParamDTO;
@@ -144,13 +145,13 @@
// 创建居住证发送短信定时任务
EcOrderParamDTO ecOrderParamDTO = new EcOrderParamDTO();
// 获取当前日期时间
- // LocalDateTime now = LocalDateTime.now();
- // // 获取前一天的开始时间
- // LocalDateTime yesterdayStart = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MIN);
- // // 获取前一天的结束时间
- // LocalDateTime yesterdayEnd = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MAX);
- // ecOrderParamDTO.setEndTime(yesterdayEnd);
- // ecOrderParamDTO.setStartTime(yesterdayStart);
+ LocalDateTime now = LocalDateTime.now();
+ // 获取前一天的开始时间
+ LocalDateTime yesterdayStart = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MIN);
+ // 获取前一天的结束时间
+ LocalDateTime yesterdayEnd = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MAX);
+ ecOrderParamDTO.setEndTime(yesterdayEnd.format(DateUtil.DATETIME_FORMATTER));
+ ecOrderParamDTO.setStartTime(yesterdayStart.format(DateUtil.DATETIME_FORMATTER));
boolean b = ecOrderService.SynchronizeData(ecOrderParamDTO);
return R.status(b);
}
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/dto/EcOrderParamDTO.java b/src/main/java/org/springblade/modules/eCallEventTwo/dto/EcOrderParamDTO.java
index 34150c9..496325d 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/dto/EcOrderParamDTO.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/dto/EcOrderParamDTO.java
@@ -15,12 +15,12 @@
@ApiModelProperty(value = "开始时间", example = "")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime startTime;
+ private String startTime;
@ApiModelProperty(value = "结束时间", example = "")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime endTime;
+ private String endTime;
@ApiModelProperty(value = "调度单位", example = "")
private String subjectOrgCode;
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcOrderMapper.xml b/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcOrderMapper.xml
index 704432f..2077cd3 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcOrderMapper.xml
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/mapper/EcOrderMapper.xml
@@ -5,7 +5,6 @@
<mapper namespace="org.springblade.modules.eCallEventTwo.mapper.EcOrderMapper">
<resultMap type="org.springblade.modules.eCallEventTwo.dto.EcOrderDTO" id="EcOrderDTOResult">
- <result property="id" column="id" />
<result property="orderId" column="order_id" />
<result property="orderCode" column="order_code" />
<result property="issueOrigin" column="issue_origin" />
@@ -60,7 +59,7 @@
</resultMap>
<sql id="selectEcOrder">
- select id,
+ select
order_id,
order_code,
issue_origin,
diff --git a/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java b/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
index 5562c6f..6481e39 100644
--- a/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/eCallEventTwo/service/impl/EcOrderServiceImpl.java
@@ -113,8 +113,6 @@
}
@Override
- @Transactional(rollbackFor = Exception.class)
- @DS("slave_1")
public boolean SynchronizeData(EcOrderParamDTO ecOrderParamDTO) {
processPages(100, ecOrderParamDTO);
return true;
@@ -131,14 +129,10 @@
for (int pageNum = 1; pageNum <= totalPages; pageNum++) {
Page<EcOrder> page = new Page<>(pageNum, pageSize);
QueryWrapper<EcOrder> objectQueryWrapper = new QueryWrapper<>();
- IPage<EcOrder> resultPage = page(page, objectQueryWrapper);
+ IPage<EcOrder> resultPage = baseMapper.selectPage(page, objectQueryWrapper);
List<EcOrder> records = resultPage.getRecords();
List<ECallEventTwoEntity> recordEntityList = BeanUtil.copy(records, ECallEventTwoEntity.class);
- recordEntityList.forEach(ecOrderEntity -> {
- // 点落面 设置警格网格信息
- setGridInfo(ecOrderEntity);
- });
- boolean b = saveEcOrder(recordEntityList);
+ boolean b = ecOrderService.saveOrUpdateBatch(recordEntityList);
System.out.println("更新第" + pageNum + "页" + b);
}
}
@@ -146,7 +140,7 @@
@Override
@DS("master")
public boolean saveEcOrder(List<ECallEventTwoEntity> recordEntityList) {
- return ecOrderService.saveOrUpdateBatch(recordEntityList);
+ return false;
}
diff --git a/src/main/java/org/springblade/xxljob/jobhandler/LabelHandleJob.java b/src/main/java/org/springblade/xxljob/jobhandler/LabelHandleJob.java
index caef9ee..5646ec4 100644
--- a/src/main/java/org/springblade/xxljob/jobhandler/LabelHandleJob.java
+++ b/src/main/java/org/springblade/xxljob/jobhandler/LabelHandleJob.java
@@ -1,33 +1,19 @@
package org.springblade.xxljob.jobhandler;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.modules.eCallEventTwo.dto.EcOrderParamDTO;
import org.springblade.modules.eCallEventTwo.service.EcOrderService;
import org.springblade.modules.task.service.ITaskService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.DataOutputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
import java.time.LocalDateTime;
import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
/**
* 三色标签定时任务执行器
@@ -101,8 +87,8 @@
LocalDateTime yesterdayStart = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MIN);
// 获取前一天的结束时间
LocalDateTime yesterdayEnd = now.minus(1, ChronoUnit.DAYS).with(LocalTime.MAX);
- ecOrderParamDTO.setEndTime(yesterdayEnd);
- ecOrderParamDTO.setStartTime(yesterdayStart);
+ ecOrderParamDTO.setEndTime(yesterdayEnd.format(DateUtil.DATETIME_FORMATTER));
+ ecOrderParamDTO.setStartTime(yesterdayStart.format(DateUtil.DATETIME_FORMATTER));
boolean result = ecOrderService.SynchronizeData(ecOrderParamDTO);
XxlJobHelper.log("任务响应结果..." + result);
XxlJobHelper.log("E呼即办定时任务-结束自动创建任务...");
--
Gitblit v1.9.3