From 76b4dd97417bd6e611b3889a0772c100a06d59ab Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:13:12 +0800
Subject: [PATCH] app
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 129 ++++++++++++++++++++++++++++--------------
1 files changed, 86 insertions(+), 43 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
index 1923dba..ff81864 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java
@@ -2,6 +2,8 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -113,7 +115,6 @@
monthZero = String.valueOf(month);
}
JSONArray jsonArray = new JSONArray();
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
for (int i = 1; i <= day; i++) {
String di;
if(i<10){
@@ -125,24 +126,20 @@
Boolean planBoolean = false;
//寰幆姣忎竴澶�
String ymd = year+"-"+monthZero+"-"+di;
-// Date ymdDate = dateFormat.parse(ymd);
//鍖归厤璁″垝鏃堕棿
String cycle = ardAppPatrolplan.getCycle();
if(cycle.equals("day")){
String createTime = ardAppPatrolplan.getCreateTime();
-// Date beginCreateDate = dateFormat.parse(createTime);
- int d = ymd.compareTo(createTime);
+ String st = createTime.substring(0,10);
+ int d = ymd.compareTo(st);
if(d>=0){
planBoolean = true;
}
}else if(cycle.equals("once")){
String onceBegin = ardAppPatrolplan.getPatroBeginTime();
-// Date onceBeginDate = dateFormat.parse(onceBegin);
- String onceEnd = ardAppPatrolplan.getPatroEndTime();
-// Date onceEndDate = dateFormat.parse(onceEnd);
- int bd = ymd.compareTo(onceBegin);
- int ed = ymd.compareTo(onceEnd);
- if(bd>=0 && ed<=0){
+ String onceT = onceBegin.substring(0,10);
+ int num = ymd.compareTo(onceT);
+ if(num==0){
planBoolean = true;
}
}
@@ -150,31 +147,49 @@
Boolean or = false;
if(planBoolean){
for (int j = 0; j < list.size(); j++) {
- //鎵撳崱鏃堕棿鎷嗗垎
- String recordTime = list.get(j).getRecordTime();
- String[] part = recordTime.split("[-\\s:]");
- int recordYear = Integer.parseInt(part[0]);
- int recordMonth = Integer.parseInt(part[1]);
- String recordMonthZero;
- if(recordMonth<10){
- recordMonthZero = String.format("%02d", recordMonth);
- }else {
- recordMonthZero = String.valueOf(recordMonth);
- }
- int recordDay = Integer.parseInt(part[2]);
- String recordDayZero;
- if(recordDay<10){
- recordDayZero = String.format("%02d", recordDay);
- }else {
- recordDayZero = String.valueOf(recordDay);
- }
- String recordDate = recordYear+"-"+recordMonthZero+"-"+recordDayZero;
- //濡傛灉鐩哥瓑璇存槑杩欏ぉ鏈夋墦鍗¤褰曡褰�
- if(ymd.equals(recordDate)){
- or = true;
- break;
+ //鑾峰彇鎵撳崱鏃堕棿
+ String toDayRecord = list.get(j).getRecordTime();
+ String dr = toDayRecord.substring(0,10);
+ //濡傛灉鎵撳紑鏃ユ湡鍜岃繖澶╃浉鍚�
+ if(ymd.equals(dr)){
+ //鏌ヨ璇ヨ鍒掔殑鎵�鏈夊叴瓒ｇ偣
+ List<ArdAlarmpointsWell> wellList = wellMapper.wellByPlanId(planId);
+ //鏌ヨ璇ヨ鍒掔殑鎵�鏈夋墽琛屼汉
+ List<SysUser> userList = sysUserMapper.userByPlanId(planId);
+ //婊″嫟澶氬皯鏉℃墦鍗¤褰�
+ int maxNum = wellList.size()*userList.size();
+ //瀵规瘮搴旀墦鍗¤褰曠浉绛夊垯true
+ if(list.size()==maxNum){
+ or = true;
+ }
}
}
+// for (int j = 0; j < list.size(); j++) {
+// //鎵撳崱鏃堕棿鎷嗗垎
+// String recordTime = list.get(j).getRecordTime();
+// String[] part = recordTime.split("[-\\s:]");
+// int recordYear = Integer.parseInt(part[0]);
+// int recordMonth = Integer.parseInt(part[1]);
+// String recordMonthZero;
+// if(recordMonth<10){
+// recordMonthZero = String.format("%02d", recordMonth);
+// }else {
+// recordMonthZero = String.valueOf(recordMonth);
+// }
+// int recordDay = Integer.parseInt(part[2]);
+// String recordDayZero;
+// if(recordDay<10){
+// recordDayZero = String.format("%02d", recordDay);
+// }else {
+// recordDayZero = String.valueOf(recordDay);
+// }
+// String recordDate = recordYear+"-"+recordMonthZero+"-"+recordDayZero;
+// //濡傛灉鐩哥瓑璇存槑杩欏ぉ鏈夋墦鍗¤褰曡褰�
+// if(ymd.equals(recordDate)){
+// or = true;
+// break;
+// }
+// }
}
jsonObject.put("toDay",ymd );
jsonObject.put("plan",planBoolean);
@@ -187,7 +202,7 @@
@Override
public Results recordDetails(RecordDetailsParam recordDetailsParam) throws ParseException {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat dateFormatTime = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ SimpleDateFormat dateFormatTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//鑾峰彇鍙傛暟
String planId = recordDetailsParam.getPlanId();
String toDay = recordDetailsParam.getToDay();
@@ -238,8 +253,9 @@
//灏忎簬0鏄巻鍙�
recordQueryWrapper.select("max(points_num) pointsNum","user_id","user_name").eq("plan_id", planId).like("record_time", toDay).groupBy("user_id","user_name");
}else{
+ String u = dateFormatTime.format(new Date());
//绛変簬0閫変腑鐨勬棩鏈熷氨鏄粖澶╋紝闇�瑕佽繘涓�姝ュ垽鏂皬浜庡綋鍓嶆椂鍒嗙鐨勮褰�
- recordQueryWrapper.select("max(points_num) pointsNum","user_id","user_name").eq("plan_id", planId).le("record_time", dateFormatTime.format(new Date())).groupBy("user_id","user_name");;
+ recordQueryWrapper.select("max(points_num) pointsNum","user_id","user_name").eq("plan_id", planId).le("record_time", u).groupBy("user_id","user_name");
}
List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(recordQueryWrapper);
//閫変腑杩欏ぉ璇ヨ鍒掍笅娌℃湁浠讳綍鎵撳崱璁板綍
@@ -463,7 +479,7 @@
@Override
public Results executeDetailsOld(RecordDetailsParam recordDetailsParam) throws ParseException {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat dateFormatTime = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ SimpleDateFormat dateFormatTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String userId = SecurityUtils.getUserId();
//鑾峰彇鍙傛暟
String planId = recordDetailsParam.getPlanId();
@@ -645,14 +661,14 @@
int planNum = dayNum+onceNum;
//杩欏ぉ鎬诲叴瓒ｇ偣鏁�
int wellNum = dayWell+onceWell;
- QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("user_id",userId).like("record_time",ymd);
- List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
//宸叉墦鍗℃�绘潯鏁�
+ QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("user_id",userId).like("record_time",ymd).isNull("del");
+ List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
int num = list.size();
//搴旀墦鍗℃�绘潯鏁�
int record = planNum*wellNum;
- if(num==record){
+ if(num>=record){
recordBoolean = true;
}
}
@@ -752,7 +768,7 @@
SysUser user = sysUserMapper.selectById(userId);
String userName = user.getNickName();
//鏌ヨ璇ヨ鍒掔殑鎵�鏈夊叴瓒ｇ偣
- ArdAlarmpointsWell ardAlarmpointsWell = wellMapper.selectById(wellId);
+ ArdAlarmpointsWell ardAlarmpointsWell = wellMapper.getWellById(wellId);
//娌℃墦鍗＄殑鏁版嵁
ArdAppPatrolpointRecord record1 = new ArdAppPatrolpointRecord();
record1.setAppPatrolpointsId(ardAlarmpointsWell.getId());
@@ -773,7 +789,34 @@
@Override
public Results son() {
-
- return null;
+ DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ //鑾峰彇鐢ㄦ埛鎵ц浜�
+ String userId = SecurityUtils.getUserId();
+ // 鍑忓皯 10 绉�
+ LocalDateTime now = LocalDateTime.now(); // 鑾峰彇褰撳墠鏃ユ湡鏃堕棿
+ LocalDateTime earlier = now.minusSeconds(10); // 鍑忓皯30绉�
+ RecordSonParam recordSonParam = new RecordSonParam();
+ recordSonParam.setUserId(userId);
+ String n = fmt.format(now);
+ recordSonParam.setTime(n);
+ String e = fmt.format(earlier);
+ recordSonParam.setBeforeTime(e);
+ //鏍规嵁濮撳悕ID涓烘墽琛屼汉鑾峰彇鎵�鏈夊搴旂殑璁″垝鍚嶇О
+ List<ArdAppPatrolplan> list = patrolplanMapper.planUser(recordSonParam);
+ JSONArray jsonArray = new JSONArray();
+ JSONObject jsonObject = new JSONObject();
+ if(list.size()>0){
+ jsonObject.put("plan",true);
+ jsonObject.put("user",list.get(0).getNickName());
+ jsonObject.put("name",list.get(0).getPlanName());
+// list.get(0).setSon("宸查�氱煡");
+// patrolplanMapper.updateById(list.get(0));
+ }else {
+ jsonObject.put("plan",false);
+ jsonObject.put("user",null);
+ jsonObject.put("name",null);
+ }
+ jsonArray.add(jsonObject);
+ return Results.succeed(jsonArray);
}
}
--
Gitblit v1.9.3