From ba9c4bca1bdf36f827ab258222d92c885ff890db Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 05 Sep 2023 08:43:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
index 8ce0e1f..2100d71 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateDetailServiceImpl.java
@@ -40,7 +40,6 @@
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
import com.moral.util.TokenUtils;
-import com.sun.org.apache.regexp.internal.RE;
@Service
@@ -75,11 +74,12 @@
List<Map<String, Object>> data = (List<Map<String, Object>>) params.get("data");
for (Map<String, Object> datum : data) {
- ManageCoordinateDetail manageCoordinateDetail = new ManageCoordinateDetail();
+
String code = datum.get("code").toString();
String state = datum.get("state").toString();
if (state.equals("2")){
+ ManageCoordinateDetail manageCoordinateDetail = new ManageCoordinateDetail();
String[] rs = code.split("_");
manageCoordinateDetail.setCoordinateId(coordinateId);
manageCoordinateDetail.setLongitude(Double.parseDouble(rs[0]));
@@ -102,7 +102,7 @@
return 2;
}
manageCoordinateDetailMapper.deleteById(Integer.parseInt(id1.toString()));
-// manageCoordinateDetailMapper.delete(wrapper);
+
}
}
return 200;
@@ -204,7 +204,7 @@
queryWrapper.eq("coordinate_id",coordinateId);
String time1 = params.remove("time1").toString();
String time2 = params.remove("time2").toString();
- long l = DateUtils.compareDateStr(time1, time2);
+ long l = DateUtils.compareDateStrDay(time1, time2);
if (l>0){
params.put("time1",time1);
params.put("time2",time2);
--
Gitblit v1.8.0