From bd3916f68a3f8971bfe8c78b0b71e87fba643e11 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 09:24:58 +0800
Subject: [PATCH] 巡检日历及查询优化
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/param/ArdAppPatrolpointRecordParam.java | 12 ++++
ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml | 6 +
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointRecordService.java | 4 +
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 86 +++++++++++++++++++++++++++-
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 13 ++++
5 files changed, 112 insertions(+), 9 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
index 4970d48..5dd4f92 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -1,5 +1,6 @@
package com.ruoyi.app.patrolplan.controller;
+import java.text.ParseException;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
@@ -13,6 +14,7 @@
import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecord;
+import com.ruoyi.app.patrolplan.domain.param.ArdAppPatrolpointRecordParam;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointRecordService;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
@@ -206,11 +208,20 @@
* 宸℃鎵撳崱
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:record')")
- @Log(title = "app宸℃璁″垝", businessType = BusinessType.UPDATE)
@ApiOperation("宸℃鎵撳崱")
@PostMapping("record")
public Results edit(@RequestBody ArdAppPatrolpointRecord ardAppPatrolpointRecord) {
return recordService.record(ardAppPatrolpointRecord);
}
+ /**
+ * 宸℃鏃ュ巻
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordMonth')")
+ @ApiOperation("宸℃鏃ュ巻")
+ @PostMapping("recordMonth")
+ public Results recordMonth(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
+ return recordService.recordMonth(ardAppPatrolpointRecordParam);
+ }
+
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/param/ArdAppPatrolpointRecordParam.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/param/ArdAppPatrolpointRecordParam.java
new file mode 100644
index 0000000..0aaf27a
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/param/ArdAppPatrolpointRecordParam.java
@@ -0,0 +1,12 @@
+package com.ruoyi.app.patrolplan.domain.param;
+
+import lombok.Data;
+
+@Data
+public class ArdAppPatrolpointRecordParam {
+
+ private String begin;
+ private String end;
+ private String planId;
+ private String cycle;
+}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointRecordService.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointRecordService.java
index 9353718..c002cd0 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointRecordService.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointRecordService.java
@@ -1,9 +1,11 @@
package com.ruoyi.app.patrolplan.service;
+import java.text.ParseException;
import java.util.List;
import java.util.Map;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecord;
+import com.ruoyi.app.patrolplan.domain.param.ArdAppPatrolpointRecordParam;
import com.ruoyi.utils.result.Results;
/**
@@ -64,5 +66,5 @@
Results record(ArdAppPatrolpointRecord ardAppPatrolpointRecord);
- Results recordMonth(Map<String,Object> map);
+ Results recordMonth(ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException;
}
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 fe68763..226735c 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
@@ -1,9 +1,18 @@
package com.ruoyi.app.patrolplan.service.impl;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
import java.util.Map;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.app.patrolplan.domain.ArdAppPatrolplan;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecordImg;
+import com.ruoyi.app.patrolplan.domain.param.ArdAppPatrolpointRecordParam;
+import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolplanMapper;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointRecordImgMapper;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -15,6 +24,7 @@
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointRecordService;
import javax.annotation.Resource;
+import javax.xml.crypto.Data;
/**
* app宸℃璁″垝璁板綍Service涓氬姟灞傚鐞�
@@ -29,6 +39,9 @@
@Resource
private ArdAppPatrolpointRecordImgMapper recordImgMapper;
+
+ @Resource
+ private ArdAppPatrolplanMapper patrolplanMapper;
/**
* 鏌ヨapp宸℃璁″垝璁板綍
@@ -119,10 +132,73 @@
}
@Override
- public Results recordMonth(Map<String, Object> map) {
- String begin = (String) map.get("begin");
- String end = (String) map.get("end");
-
- return null;
+ public Results recordMonth(ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
+ //鑾峰彇鍓嶇鍙傛暟
+ String begin = ardAppPatrolpointRecordParam.getBegin();
+ String end = ardAppPatrolpointRecordParam.getEnd();
+ String planId = ardAppPatrolpointRecordParam.getPlanId();
+ //鏌ヨ璁″垝琛�
+ ArdAppPatrolplan ardAppPatrolplan = patrolplanMapper.selectById(planId);
+ //鏌ヨ鍑烘湁鏁堟墦鍗℃暟鎹�
+ QueryWrapper<ArdAppPatrolpointRecord> queryWrapper = new QueryWrapper<>();
+ queryWrapper.between("record_time",begin,end).eq("plan_id",planId);
+ List<ArdAppPatrolpointRecord> list = ardAppPatrolpointRecordMapper.selectList(queryWrapper);
+ //鏃堕棿鎷嗗垎
+ String[] parts = end.split("[-\\s:]");
+ int year = Integer.parseInt(parts[0]);
+ int month = Integer.parseInt(parts[1]);
+ int day = Integer.parseInt(parts[2]);
+ JSONArray jsonArray = new JSONArray();
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ for (int i = 1; i <= day; i++) {
+ JSONObject jsonObject = new JSONObject();
+ Boolean planBoolean = false;
+ //寰幆姣忎竴澶�
+ String ymd = year+"-"+month+"-"+i;
+ Date ymdDate = dateFormat.parse(ymd);
+ //鍖归厤璁″垝鏃堕棿
+ String cycle = ardAppPatrolplan.getCycle();
+ if(cycle.equals("day")){
+ String createTime = ardAppPatrolplan.getCreateTime();
+ Date beginCreateDate = dateFormat.parse(createTime);
+ int d = ymdDate.compareTo(beginCreateDate);
+ 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 = ymdDate.compareTo(onceBeginDate);
+ int ed = ymdDate.compareTo(onceEndDate);
+ if(bd>=0 && ed<=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]);
+ int recordDay = Integer.parseInt(part[2]);
+ String recordDate = recordYear+"-"+recordMonth+"-"+recordDay;
+ //濡傛灉鐩哥瓑璇存槑杩欏ぉ鏈夋墦鍗¤褰曡褰�
+ if(ymd.equals(recordDate)){
+ or = true;
+ break;
+ }
+ }
+ }
+ jsonObject.put("toDay",ymdDate);
+ jsonObject.put("plan",planBoolean);
+ jsonObject.put("record",or);
+ jsonArray.add(jsonObject);
+ }
+ return Results.succeed(jsonArray);
}
}
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
index 7e82cdb..cfeb44f 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppPatrolplanMapper.xml
@@ -41,10 +41,12 @@
<if test="patroBeginTime != null and patroBeginTime != ''"> and patro_begin_time >= #{patroBeginTime}</if>
<if test="patroEndTime != null and patroEndTime != ''"> and patro_end_time <= #{patroEndTime}</if>
<if test="wellId != null and wellId != ''">
- and well.alarmpoints_id in (select ard_alarmpoints_well.id from ard_alarmpoints_well where well_id = #{wellId})
+<!-- and well.alarmpoints_id in (select ard_alarmpoints_well.id from ard_alarmpoints_well where well_id = #{wellId})-->
+ and well.alarmpoints_id = #{wellId}
</if>
<if test="pUser != null and pUser != ''">
- and users.app_user_id in (select sys_user.user_id from sys_user where nick_name = #{pUser})
+<!-- and users.app_user_id in (select sys_user.user_id from sys_user where nick_name = #{pUser})-->
+ and users.app_user_id = #{pUser}
</if>
</where>
group by ard_app_patrolplan.id
--
Gitblit v1.9.3