From ef7dd19f25aa015e0b30c1397cffe95266c59471 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期六, 19 八月 2023 10:57:27 +0800
Subject: [PATCH] 打卡
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 127 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 126 insertions(+), 1 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 9aae3b1..722c83c 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
@@ -299,10 +299,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 +326,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 +360,7 @@
ardAppPatrolpointRecord.setUserName(userName);
ardAppPatrolpointRecord.setLatitude(String.valueOf(ardAlarmpointsWell.getLatitude()));
ardAppPatrolpointRecord.setLongitude(String.valueOf(ardAlarmpointsWell.getLongitude().toString()));
+ ardAppPatrolpointRecord.setPlanUserName(nikeName);
list.add(ardAppPatrolpointRecord);
}
}
@@ -448,7 +460,7 @@
}
@Override
- public Results executeDetails(RecordDetailsParam recordDetailsParam) throws ParseException {
+ public Results executeDetailsOld(RecordDetailsParam recordDetailsParam) throws ParseException {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat dateFormatTime = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
String userId = SecurityUtils.getUserId();
@@ -650,4 +662,117 @@
}
return Results.succeed(jsonArray);
}
+
+ @Override
+ public Results executeDetails(RecordDetailsExParam recordDetailsExParam) throws ParseException {
+ String userId = SecurityUtils.getUserId();
+ //鑾峰彇鍙傛暟
+ Boolean plan = recordDetailsExParam.getPlan();
+ String toDay = recordDetailsExParam.getToDay();
+ JSONArray jsonArray = new JSONArray();
+ if(plan){
+ //鏌ヨ杩欎釜鐢ㄦ埛涓嬩负鎵ц浜虹殑鎵�鏈夊贰妫�璁″垝
+ ArdAppPatrolplan ardAppPatrolplan = new ArdAppPatrolplan();
+ ardAppPatrolplan.setUserId(SecurityUtils.getUserId());
+ List<ArdAppPatrolplan> list = patrolplanMapper.executeList(ardAppPatrolplan);
+ //鎵惧嚭浠婂ぉ鐨勫崟娆″拰姣忔棩璁″垝
+ List<ArdAppPatrolplan> patrolplanList = new ArrayList<>();
+ for (int i = 0; i < list.size(); i++) {
+ String cycle = list.get(i).getCycle();
+ //濡傛灉鏄崟娆′换鍔�
+ if(cycle.equals("once")){
+ String begin = list.get(i).getPatroBeginTime();
+ String b = begin.substring(0,10);
+ if(b.equals(toDay)){
+ //鏄粖澶╃殑璁″垝
+ patrolplanList.add(list.get(i));
+ }
+ }
+ //濡傛灉鏄瘡鏃ヤ换鍔�
+ else if(cycle.equals("day")){
+ String create = list.get(i).getCreateTime();
+ String c = create.substring(0,10);
+ if(c.compareTo(toDay)<=0){
+ //鏈変粖澶╃殑璁″垝
+ patrolplanList.add(list.get(i));
+ }
+ }
+ }
+ if(patrolplanList.size()>0){
+ //閬嶅巻浠婂ぉ鐨勮鍒�
+ for (int i = 0; i < patrolplanList.size(); i++) {
+ String planId = patrolplanList.get(i).getId();
+ String planName = patrolplanList.get(i).getPlanName();
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("planId",planId);
+ jsonObject.put("planName",planName);
+ //鏌ヨ杩欏ぉ鏈夊灏戠偣
+ List<ArdAlarmpointsWell> dayWells = wellMapper.wellByPlanId(planId);
+ int dayWellNum = dayWells.size();
+ //鏌ヨ杩欎釜鐢ㄦ埛鐨勮繖涓鍒掑湪浠婂ぉ鎵撳崱鐨勬潯鏁�
+ QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("user_id",userId).eq("plan_id",planId).like("record_time",toDay);
+ List<ArdAppPatrolpointRecord> recordList = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
+ int recordNum = recordList.size();
+ //濡傛灉鐩哥瓑閭ｈ繖鏉′粖澶╃殑璁″垝灏辨槸鍏ㄩ儴瀹屾垚浜�
+ if(recordNum==dayWellNum){
+ jsonObject.put("type",true);
+ }else {
+ jsonObject.put("type",false);
+ }
+ jsonArray.add(jsonObject);
+ }
+ }
+ }else {
+ //娌℃湁璁″垝
+ return Results.succeed("[]");
+ }
+ 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