From 425032a9bf402d2c74bb2a3b7b02a05281ecc963 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 09 八月 2023 14:32:50 +0800
Subject: [PATCH] 巡检新增优化
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolplanServiceImpl.java | 10 ++++++++--
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java | 13 ++++++++++++-
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
index f145c12..8198d5a 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolplan.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+import java.util.Date;
import java.util.List;
/**
@@ -19,7 +20,7 @@
* @date 2023-08-02
*/
@Data
-public class ArdAppPatrolplan extends BaseEntity
+public class ArdAppPatrolplan
{
private static final long serialVersionUID = 1L;
@@ -64,6 +65,16 @@
// @JsonInclude(JsonInclude.Include.NON_DEFAULT )
private String pUser;
+ private String createTime;
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageNum;
+
+ @TableField(exist = false)
+ @JsonInclude(JsonInclude.Include.NON_DEFAULT )
+ private Integer pageSize;
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
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 b679d7c..69732dc 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;
@@ -87,7 +89,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);
}
@@ -182,7 +186,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();
--
Gitblit v1.9.3