From 9cf1626b76c6de6c837727761dc7816d3639ca87 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 09 八月 2023 13:18:30 +0800
Subject: [PATCH] 巡检打卡
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java | 61 +++++-------------------------
ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordMapper.java | 4 +
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/IArdAppPatrolpointRecordService.java | 3 +
ard-work/src/main/java/com/ruoyi/app/patrolplan/service/impl/ArdAppPatrolpointRecordServiceImpl.java | 28 ++++++++++++++
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 15 +++++++
ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordImgMapper.java | 4 +
6 files changed, 63 insertions(+), 52 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 18d3b7e..4970d48 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
@@ -12,6 +12,8 @@
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
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.service.IArdAppPatrolpointRecordService;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -70,6 +72,9 @@
@Resource
IArdAlarmpointsWellService wellService;
+
+ @Resource
+ IArdAppPatrolpointRecordService recordService;
/**
* 鏌ヨapp宸℃璁″垝鍒楄〃
@@ -197,5 +202,15 @@
return ardAppPatrolplanService.updateArdAppPatrolplan(para);
}
+ /**
+ * 宸℃鎵撳崱
+ */
+ @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);
+ }
}
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java
index 6cdce2d..7d13b9f 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/domain/ArdAppPatrolpointRecord.java
@@ -1,9 +1,13 @@
package com.ruoyi.app.patrolplan.domain;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
+
+import java.util.List;
/**
* app宸℃璁″垝璁板綍瀵硅薄 ard_app_patrolpoint_record
@@ -11,6 +15,7 @@
* @author ard
* @date 2023-08-02
*/
+@Data
public class ArdAppPatrolpointRecord extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -38,60 +43,16 @@
@Excel(name = "宸℃鐐逛富閿�")
private String appPatrolpointsId;
- public void setId(String id)
- {
- this.id = id;
- }
+ private String appPatrolpointsName;
- public String getId()
- {
- return id;
- }
- public void setLongitude(String longitude)
- {
- this.longitude = longitude;
- }
+ private String planName;
- public String getLongitude()
- {
- return longitude;
- }
- public void setLatitude(String latitude)
- {
- this.latitude = latitude;
- }
+ private String userName;
- public String getLatitude()
- {
- return latitude;
- }
- public void setUserId(String userId)
- {
- this.userId = userId;
- }
+ private String remark;
- public String getUserId()
- {
- return userId;
- }
- public void setRecordTime(String recordTime)
- {
- this.recordTime = recordTime;
- }
-
- public String getRecordTime()
- {
- return recordTime;
- }
- public void setAppPatrolpointsId(String appPatrolpointsId)
- {
- this.appPatrolpointsId = appPatrolpointsId;
- }
-
- public String getAppPatrolpointsId()
- {
- return appPatrolpointsId;
- }
+ @TableField(exist = false)
+ private List<String> img;
@Override
public String toString() {
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordImgMapper.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordImgMapper.java
index e65aca1..e2ce091 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordImgMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordImgMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.app.patrolplan.mapper;
import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecordImg;
/**
@@ -9,7 +11,7 @@
* @author ard
* @date 2023-08-02
*/
-public interface ArdAppPatrolpointRecordImgMapper
+public interface ArdAppPatrolpointRecordImgMapper extends BaseMapper<ArdAppPatrolpointRecordImg>
{
/**
* 鏌ヨapp宸℃璁″垝璁板綍鍥剧墖
diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordMapper.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordMapper.java
index d15ac0d..a7fa82c 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/mapper/ArdAppPatrolpointRecordMapper.java
@@ -1,6 +1,8 @@
package com.ruoyi.app.patrolplan.mapper;
import java.util.List;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecord;
/**
@@ -9,7 +11,7 @@
* @author ard
* @date 2023-08-02
*/
-public interface ArdAppPatrolpointRecordMapper
+public interface ArdAppPatrolpointRecordMapper extends BaseMapper<ArdAppPatrolpointRecord>
{
/**
* 鏌ヨapp宸℃璁″垝璁板綍
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 a05d64d..3d4363b 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
@@ -2,6 +2,7 @@
import java.util.List;
import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecord;
+import com.ruoyi.utils.result.Results;
/**
* app宸℃璁″垝璁板綍Service鎺ュ彛
@@ -58,4 +59,6 @@
* @return 缁撴灉
*/
public int deleteArdAppPatrolpointRecordById(String id);
+
+ Results record(ArdAppPatrolpointRecord ardAppPatrolpointRecord);
}
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 887f965..f0becb9 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
@@ -2,7 +2,11 @@
import java.util.List;
+import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecordImg;
+import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointRecordImgMapper;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.utils.result.Results;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.app.patrolplan.mapper.ArdAppPatrolpointRecordMapper;
@@ -21,6 +25,9 @@
public class ArdAppPatrolpointRecordServiceImpl implements IArdAppPatrolpointRecordService {
@Resource
private ArdAppPatrolpointRecordMapper ardAppPatrolpointRecordMapper;
+
+ @Resource
+ private ArdAppPatrolpointRecordImgMapper recordImgMapper;
/**
* 鏌ヨapp宸℃璁″垝璁板綍
@@ -88,4 +95,25 @@
public int deleteArdAppPatrolpointRecordById(String id) {
return ardAppPatrolpointRecordMapper.deleteArdAppPatrolpointRecordById(id);
}
+
+ @Override
+ public Results record(ArdAppPatrolpointRecord ardAppPatrolpointRecord) {
+ String id = IdUtils.simpleUUID();
+ ardAppPatrolpointRecord.setId(id);
+ int num = ardAppPatrolpointRecordMapper.insert(ardAppPatrolpointRecord);
+ List<String> list = ardAppPatrolpointRecord.getImg();
+ for (int i = 0; i < list.size(); i++) {
+ ArdAppPatrolpointRecordImg recordImg = new ArdAppPatrolpointRecordImg();
+ String imgId = IdUtils.simpleUUID();
+ recordImg.setId(imgId);
+ recordImg.setAppPatrolponitRecordId(id);
+ recordImg.setImg(list.get(i));
+ recordImgMapper.insert(recordImg);
+ }
+ if(num>0){
+ return Results.succeed("鎵撳崱鎴愬姛锛�");
+ }else {
+ return Results.error("鎵撳紑澶辫触锛�");
+ }
+ }
}
--
Gitblit v1.9.3