From a6cf52adb35541aaae7d84c06d3bde4e881f45f5 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期六, 19 八月 2023 14:39:31 +0800
Subject: [PATCH] 巡检日历
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 143 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 104 insertions(+), 39 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 c777b05..ce84672 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
@@ -71,7 +71,8 @@
.eq("user_id",ardAppPatrolpointRecord.getUserId());
List<ArdAppPatrolpointRecord> recordList = ardAppPatrolpointRecordMapper.selectList(recordQueryWrapper);
ardAppPatrolpointRecord.setPointsNum(recordList.size()+1);
- int num = ardAppPatrolpointRecordMapper.insert(ardAppPatrolpointRecord);
+// int num = ardAppPatrolpointRecordMapper.insert(ardAppPatrolpointRecord);
+ int num = ardAppPatrolpointRecordMapper.insertArdAppPatrolpointRecord(ardAppPatrolpointRecord);
List<String> list = ardAppPatrolpointRecord.getImg();
for (int i = 0; i < list.size(); i++) {
ArdAppPatrolpointRecordImg recordImg = new ArdAppPatrolpointRecordImg();
@@ -79,7 +80,7 @@
recordImg.setId(imgId);
recordImg.setAppPatrolponitRecordId(id);
recordImg.setImg(list.get(i));
- recordImgMapper.insert(recordImg);
+ recordImgMapper.insertArdAppPatrolpointRecordImg(recordImg);
}
if(num>0){
return Results.succeed("鎵撳崱鎴愬姛锛�");
@@ -112,7 +113,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){
@@ -124,56 +124,62 @@
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;
}
}
//鍖归厤鎵撳崱鏃堕棿
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;
- }
+ //鏌ヨ璇ヨ鍒掔殑鎵�鏈夊叴瓒ｇ偣
+ 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);
@@ -186,7 +192,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();
@@ -237,8 +243,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);
//閫変腑杩欏ぉ璇ヨ鍒掍笅娌℃湁浠讳綍鎵撳崱璁板綍
@@ -299,10 +306,20 @@
String userId = recordSoloParam.getUserId();
String planName = recordSoloParam.getPlanName();
String userName = recordSoloParam.getUserName();
+ //鏍规嵁璁″垝ID鑾峰彇鍒跺畾浜篒D
+ ArdAppPatrolplan ardAppPatrolplan = patrolplanMapper.selectById(planId);
+ //鏍规嵁濮撳悕ID鏌ヨ璁″垝鍒跺畾浜虹殑濮撳悕
+ String planUserId = ardAppPatrolplan.getUserId();
+ SysUser sysUser = sysUserMapper.selectById(planUserId);
+ String nikeName = sysUser.getNickName();
QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("plan_id", planId).eq("user_id",userId).like("record_time", toDay);
//褰撳墠璁″垝閫変腑鏃堕棿閲屾鐢ㄦ埛鐨勬墦鍗¤褰�
List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
+ for (int i = 0; i < list.size(); i++) {
+ ArdAppPatrolpointRecord ardAppPatrolpointRecord = list.get(i);
+ ardAppPatrolpointRecord.setPlanUserName(nikeName);
+ }
//鏌ヨ璇ヨ鍒掔殑鎵�鏈夊叴瓒ｇ偣
List<ArdAlarmpointsWell> wellList = wellMapper.wellByPlanId(planId);
if(list.size()==0){
@@ -316,6 +333,7 @@
ardAppPatrolpointRecord.setUserName(userName);
ardAppPatrolpointRecord.setLatitude(String.valueOf(ardAlarmpointsWell.getLatitude()));
ardAppPatrolpointRecord.setLongitude(String.valueOf(ardAlarmpointsWell.getLongitude().toString()));
+ ardAppPatrolpointRecord.setPlanUserName(nikeName);
list.add(ardAppPatrolpointRecord);
}
return Results.succeed(list);
@@ -349,6 +367,7 @@
ardAppPatrolpointRecord.setUserName(userName);
ardAppPatrolpointRecord.setLatitude(String.valueOf(ardAlarmpointsWell.getLatitude()));
ardAppPatrolpointRecord.setLongitude(String.valueOf(ardAlarmpointsWell.getLongitude().toString()));
+ ardAppPatrolpointRecord.setPlanUserName(nikeName);
list.add(ardAppPatrolpointRecord);
}
}
@@ -717,4 +736,50 @@
}
return Results.succeed(jsonArray);
}
+
+ @Override
+ public Results recordBefore(RecordBeforeParam recordBeforeParam) {
+ String planId = recordBeforeParam.getPlanId();
+ String wellId = recordBeforeParam.getWellId();
+ String toDay = recordBeforeParam.getToDay();
+ String userId = SecurityUtils.getUserId();
+ JSONArray jsonArray = new JSONArray();
+ ArdAppPatrolplan plan = patrolplanMapper.selectById(planId);
+ jsonArray.add(plan);
+ QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("plan_id",planId).eq("app_patrolpoints_id",wellId).eq("user_id",userId).like("record_time",toDay);
+ ArdAppPatrolpointRecord record = ardAppPatrolpointRecordMapper.selectOne(queryWrapper);
+ //鏍规嵁濮撳悕ID鏌ヨ璁″垝鍒跺畾浜虹殑濮撳悕
+ String planUserId = plan.getUserId();
+ SysUser sysUser = sysUserMapper.selectById(planUserId);
+ String nikeName = sysUser.getNickName();
+ if(record==null){
+ //鏍规嵁濮撳悕ID鏌ヨ鎵ц浜哄鍚�
+ SysUser user = sysUserMapper.selectById(userId);
+ String userName = user.getNickName();
+ //鏌ヨ璇ヨ鍒掔殑鎵�鏈夊叴瓒ｇ偣
+ ArdAlarmpointsWell ardAlarmpointsWell = wellMapper.selectById(wellId);
+ //娌℃墦鍗＄殑鏁版嵁
+ ArdAppPatrolpointRecord record1 = new ArdAppPatrolpointRecord();
+ record1.setAppPatrolpointsId(ardAlarmpointsWell.getId());
+ record1.setAppPatrolpointsName(ardAlarmpointsWell.getWellId());
+ record1.setPlanId(planId);
+ record1.setPlanName(plan.getPlanName());
+ record1.setUserId(userId);
+ record1.setUserName(userName);
+ record1.setLatitude(String.valueOf(ardAlarmpointsWell.getLatitude()));
+ record1.setLongitude(String.valueOf(ardAlarmpointsWell.getLongitude().toString()));
+ record1.setPlanUserName(nikeName);
+ jsonArray.add(record1);
+ }else {
+ jsonArray.add(record);
+ }
+ return Results.succeed(jsonArray);
+ }
+
+ @Override
+ public Results son() {
+
+ return null;
+ }
}
--
Gitblit v1.9.3