From 5ad4e2b2e881204102cd0a5e96da936db19f39c7 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 11 八月 2023 11:30:47 +0800
Subject: [PATCH] 删除
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java | 69 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java
index 04164c2..89450e6 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.app.patrolplan.service.impl;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -12,8 +14,10 @@
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWellVo;
import com.ruoyi.alarmpoints.well.mapper.ArdAlarmpointsWellMapper;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
+import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecord;
import com.ruoyi.app.patrolplan.domain.ArdAppPatroluser;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointMapper;
+import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointRecordMapper;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatroluserMapper;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.SysUserVo;
@@ -56,6 +60,9 @@
@Resource
private SysUserMapper sysUserMapper;
+ @Resource
+ private ArdAppPatrolpointRecordMapper recordMapper;
+
/**
* 鏌ヨapp宸℃璁″垝
*
@@ -87,7 +94,9 @@
@Override
public int insertArdAppPatrolplan(ArdAppPatrolplan ardAppPatrolplan) {
ardAppPatrolplan.setUserId(SecurityUtils.getUserId());
- ardAppPatrolplan.setCreateTime(DateUtils.getNowDate());
+ Date date = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ ardAppPatrolplan.setCreateTime(sdf.format(date));
return ardAppPatrolplanMapper.insertArdAppPatrolplan(ardAppPatrolplan);
}
@@ -152,18 +161,46 @@
@Override
@Transactional
public int deleteArdApp(String id) {
- //ardAppPatroluserMapper.deleteArdAppPatroluserByReserved1(id);
- /*ardAppPatrolpointMapper.deleteArdAppPatrolpointById(id);
- if(ardAppPatrolplanMapper.deleteArdAppPatrolplanByPatroEndTime(id)>0){
- return Results.succeed("鍒犻櫎鎴愬姛锛�");
- }else {
- return Results.error("鍒犻櫎澶辫触锛�");
- }*/
try {
- int result = ardAppPatrolplanMapper.deleteArdAppPatrolplanById(id);//鍒犻櫎宸℃璁″垝
- ardAppPatrolpointMapper.deleteArdAppPatrolpointByPlanId(id);//鍒犻櫎宸℃璁″垝涓嬫寕鐐逛綅
- ardAppPatroluserMapper.deleteArdAppPatroluserByPlanId(id);//鍒犻櫎宸℃璁″垝涓嬫寕鐢ㄦ埛
- return result;
+ Boolean del = false;
+ //鏌ヨ璁″垝鏃堕棿鏄惁缁撴潫
+ ArdAppPatrolplan planList = ardAppPatrolplanMapper.selectById(id);
+ String cycle = planList.getCycle();
+ String end = planList.getPatroEndTime();
+ if(cycle.equals("day")){
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ String date = dateFormat.format(new Date());
+ end = date +" "+end;
+ }
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String toDay = dateFormat.format(new Date());
+ int once = toDay.compareTo(end);
+ if(once<0){
+ del = true;
+ }
+ if(!del){
+ //鏌ヨ鏄惁鏈夋墦鍗¤褰�
+ QueryWrapper<ArdAppPatrolpointRecord> recordQueryWrapper = new QueryWrapper<>();
+ recordQueryWrapper.eq("plan_id",id);
+ List<ArdAppPatrolpointRecord> recordList = recordMapper.selectList(recordQueryWrapper);
+ if(recordList.size()>0){
+ del = true;
+ }
+ }
+ if(del){
+ int result = ardAppPatrolplanMapper.deleteArdAppPatrolplanById(id);//鍒犻櫎宸℃璁″垝
+ ardAppPatrolpointMapper.deleteArdAppPatrolpointByPlanId(id);//鍒犻櫎宸℃璁″垝涓嬫寕鐐逛綅
+ ardAppPatroluserMapper.deleteArdAppPatroluserByPlanId(id);//鍒犻櫎宸℃璁″垝涓嬫寕鐢ㄦ埛
+ return result;
+ }else {
+ String userId = SecurityUtils.getUserId();
+ SysUser sysUser = sysUserMapper.selectUserById(userId);
+ String userName = sysUser.getNickName();
+ planList.setDelName(userName);
+ planList.setDelTime(dateFormat.format(new Date()));
+ int result = ardAppPatrolplanMapper.updateById(planList);
+ return result;
+ }
} catch (Exception e){
e.printStackTrace();
return 0;
@@ -182,7 +219,9 @@
String userId = SecurityUtils.getUserId();
ardAppPatrolplan.setUserId(userId);
ardAppPatrolplan.setCycle((String) para.get("cycle"));
- ardAppPatrolplan.setCreateTime(new Date());
+ Date date = new Date();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ ardAppPatrolplan.setCreateTime(sdf.format(date));
int result = ardAppPatrolplanMapper.insertArdAppPatrolplan(ardAppPatrolplan);//鏂板涓昏〃
List<String> alarmpointIdList = (List<String>) para.get("alarmpointIdList");
List<ArdAppPatrolpoint> ardAppPatrolpointList = new ArrayList();
@@ -237,8 +276,4 @@
return Results.succeed(jsonObject);
}
- @Override
- public Results allPlanUser(String id) {
- return null;
- }
}
--
Gitblit v1.9.3