From a13dc532aa93bfa9ce5c3c01323e00869f4f0b76 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 27 二月 2024 14:01:23 +0800
Subject: [PATCH] 大华setPTZ1调用普通方法
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 d5589a2..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
@@ -3,6 +3,7 @@
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;
@@ -660,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;
}
}
@@ -767,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());
@@ -788,18 +789,18 @@
@Override
public Results son() {
- SimpleDateFormat dateFormatTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ 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绉�
- System.out.println("褰撳墠鏃ユ湡鏃堕棿锛�" + now);
- System.out.println("鍑忓皯10绉掑悗鐨勬棩鏈熸椂闂达細" + earlier);
RecordSonParam recordSonParam = new RecordSonParam();
recordSonParam.setUserId(userId);
- recordSonParam.setTime(dateFormatTime.format(now));
- recordSonParam.setBeforeTime(dateFormatTime.format(earlier));
+ 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();
--
Gitblit v1.9.3