From 618e184784d2e39a31affc40173e15ccb978bc24 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 01 七月 2024 11:48:52 +0800
Subject: [PATCH] 电磁锁概要提交
---
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockTemporaryMapper.java | 63 +++
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 41 +
ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWallLock.java | 79 ++++
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockTemporaryServiceImpl.java | 92 +++++
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockMapper.java | 4
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java | 7
ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankLock.java | 16
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockServiceImpl.java | 92 +++++
ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWallLockTemporary.java | 79 ++++
ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml | 11
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 12
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java | 84 +++++
ruoyi-admin/src/main/resources/application-prod.yml | 2
ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml | 72 ++++
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallLockTemporaryService.java | 61 +++
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java | 67 ++++
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallLockService.java | 61 +++
ard-work/src/main/resources/mapper/sy/ArdTankWallLockTemporaryMapper.xml | 72 ++++
18 files changed, 896 insertions(+), 19 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index feaa81f..beb7e1a 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -79,6 +79,12 @@
@Value("${syCar.enabled}")
private Boolean syCarEnabled;
+ @Value("${syCar.userId}")
+ private String userId;
+
+ @Value("${syCar.password}")
+ private String password;
+
@PostConstruct
public void init(){
ardSyCarController = this;
@@ -101,7 +107,8 @@
{
return;
}
- PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ //PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ PushClientImplPosition pushClientImplPosition = new PushClientImplPosition(ip,userId,password);
Thread pushClientImplPositionThread = new Thread(pushClientImplPosition);
pushClientImplPositionThread.start();
@@ -115,7 +122,8 @@
};
//carPositionTimer.scheduleAtFixedRate(carPositionTask,date,3*1000);//寮冪敤
//杞﹁締瀹炴椂鎶ヨ绾跨▼
- PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ //PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,ardSyUserList.get(0).getUserId(),ardSyUserList.get(0).getPassword());
+ PushClientImplAlarm pushClientImplAlarm = new PushClientImplAlarm(ip,userId,password);
Thread pushClientImplAlarmThread = new Thread(pushClientImplAlarm);
pushClientImplAlarmThread.start();
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
index 46f8860..4a42275 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
@@ -1,9 +1,12 @@
package com.ruoyi.sy.controller;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -29,7 +32,7 @@
* 鐢电閿丆ontroller
*
* @author ard
- * @date 2024-06-29
+ * @date 2024-07-01
*/
@Api(tags = "鐢电閿�")
@RestController
@@ -38,12 +41,12 @@
@Autowired
private IArdTankLockService ardTankLockService;
-/**
- * 鏌ヨ鐢电閿佸垪琛�
- */
-@ApiOperation("鏌ヨ鐢电閿佸垪琛�")
-@PreAuthorize("@ss.hasPermi('sy:lock:list')")
-@GetMapping("/list")
+ /**
+ * 鏌ヨ鐢电閿佸垪琛�
+ */
+ @ApiOperation("鏌ヨ鐢电閿佸垪琛�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:list')")
+ @GetMapping("/list")
public TableDataInfo list(ArdTankLock ardTankLock) {
startPage();
List<ArdTankLock> list = ardTankLockService.selectArdTankLockList(ardTankLock);
@@ -80,8 +83,6 @@
@Log(title = "鐢电閿�" , businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdTankLock ardTankLock) {
- String id = IdUtils.simpleUUID();
- ardTankLock.setId(id);
return toAjax(ardTankLockService.insertArdTankLock(ardTankLock));
}
@@ -99,11 +100,31 @@
/**
* 鍒犻櫎鐢电閿�
*/
- @ApiOperation("鍒犻櫎鐢电閿�")
+ /*@ApiOperation("鍒犻櫎鐢电閿�")
@PreAuthorize("@ss.hasPermi('sy:lock:remove')")
@Log(title = "鐢电閿�" , businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(ardTankLockService.deleteArdTankLockByIds(ids));
+ }*/
+
+ /**
+ * 鍒犻櫎鐢电閿�
+ */
+ @ApiOperation("鍒犻櫎鍗曚竴鐢电閿�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:remove')")
+ @Log(title = "鐢电閿�" , businessType = BusinessType.DELETE)
+ @DeleteMapping("/{id}")
+ public AjaxResult remove(@PathVariable String id) {
+ return toAjax(ardTankLockService.deleteArdTankLockById(id));
+ }
+
+ @ApiOperation("鏌ヨ鍏ㄩ儴鐢电閿�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getAll')")
+ @GetMapping("/getAll")
+ public Results getAll() {
+ String userId = SecurityUtils.getUserId();
+ Results result = ardTankLockService.getAll(userId);
+ return result;
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankLock.java b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankLock.java
index ce8b5e1..ca03718 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankLock.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankLock.java
@@ -9,7 +9,7 @@
* 鐢电閿佸璞� ard_tank_lock
*
* @author ard
- * @date 2024-06-29
+ * @date 2024-07-01
*/
public class ArdTankLock extends BaseEntity
{
@@ -41,6 +41,10 @@
/** 浣胯兘 */
@Excel(name = "浣胯兘")
private String enable;
+
+ /** 閲嶅惎鐘舵�侊細寮�鎴栧叧 */
+ @Excel(name = "閲嶅惎鐘舵�侊細寮�鎴栧叧")
+ private String restartState;
/** 鍦ㄧ嚎鏃堕棿 */
@Excel(name = "鍦ㄧ嚎鏃堕棿")
@@ -109,6 +113,15 @@
{
return enable;
}
+ public void setRestartState(String restartState)
+ {
+ this.restartState = restartState;
+ }
+
+ public String getRestartState()
+ {
+ return restartState;
+ }
public void setOnlineTime(String onlineTime)
{
this.onlineTime = onlineTime;
@@ -129,6 +142,7 @@
.append("imgPositionLeft", getImgPositionLeft())
.append("carId", getCarId())
.append("enable", getEnable())
+ .append("restartState", getRestartState())
.append("onlineTime", getOnlineTime())
.toString();
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWallLock.java b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWallLock.java
new file mode 100644
index 0000000..5ce2aba
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWallLock.java
@@ -0,0 +1,79 @@
+package com.ruoyi.sy.domain;
+
+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;
+
+/**
+ * 鐢靛瓙鍥存爮鐢电閿佸璞� ard_tank_wall_lock
+ *
+ * @author ard
+ * @date 2024-06-29
+ */
+public class ArdTankWallLock extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 鎿嶄綔绫诲瀷 */
+ @Excel(name = "鎿嶄綔绫诲瀷")
+ private String processType;
+
+ /** 涓婚敭 */
+ private String id;
+
+ /** 鐢靛瓙鍥存爮涓婚敭 */
+ @Excel(name = "鐢靛瓙鍥存爮涓婚敭")
+ private String wallId;
+
+ /** 閿佷富閿� */
+ @Excel(name = "閿佷富閿�")
+ private String lockId;
+
+ public void setProcessType(String processType)
+ {
+ this.processType = processType;
+ }
+
+ public String getProcessType()
+ {
+ return processType;
+ }
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+ public void setWallId(String wallId)
+ {
+ this.wallId = wallId;
+ }
+
+ public String getWallId()
+ {
+ return wallId;
+ }
+ public void setLockId(String lockId)
+ {
+ this.lockId = lockId;
+ }
+
+ public String getLockId()
+ {
+ return lockId;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("processType", getProcessType())
+ .append("id", getId())
+ .append("wallId", getWallId())
+ .append("lockId", getLockId())
+ .toString();
+ }
+}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWallLockTemporary.java b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWallLockTemporary.java
new file mode 100644
index 0000000..9db3495
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWallLockTemporary.java
@@ -0,0 +1,79 @@
+package com.ruoyi.sy.domain;
+
+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;
+
+/**
+ * 涓存椂鐢靛瓙鍥存爮鐢电閿佸璞� ard_tank_wall_lock_temporary
+ *
+ * @author ard
+ * @date 2024-07-01
+ */
+public class ArdTankWallLockTemporary extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭 */
+ private String id;
+
+ /** 鍥存爮涓婚敭 */
+ @Excel(name = "鍥存爮涓婚敭")
+ private String wallId;
+
+ /** 閿佷富閿� */
+ @Excel(name = "閿佷富閿�")
+ private String lockId;
+
+ /** 鎿嶄綔绫诲瀷 */
+ @Excel(name = "鎿嶄綔绫诲瀷")
+ private String processType;
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+ public void setWallId(String wallId)
+ {
+ this.wallId = wallId;
+ }
+
+ public String getWallId()
+ {
+ return wallId;
+ }
+ public void setLockId(String lockId)
+ {
+ this.lockId = lockId;
+ }
+
+ public String getLockId()
+ {
+ return lockId;
+ }
+ public void setProcessType(String processType)
+ {
+ this.processType = processType;
+ }
+
+ public String getProcessType()
+ {
+ return processType;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("wallId", getWallId())
+ .append("lockId", getLockId())
+ .append("processType", getProcessType())
+ .toString();
+ }
+}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockMapper.java
index 847df92..7f09d17 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockMapper.java
@@ -7,7 +7,7 @@
* 鐢电閿丮apper鎺ュ彛
*
* @author ard
- * @date 2024-06-29
+ * @date 2024-07-01
*/
public interface ArdTankLockMapper
{
@@ -58,4 +58,6 @@
* @return 缁撴灉
*/
public int deleteArdTankLockByIds(String[] ids);
+
+ public List<ArdTankLock> getAll();
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java
new file mode 100644
index 0000000..70f5a45
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockMapper.java
@@ -0,0 +1,67 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.ArdTankWallLock;
+
+/**
+ * 鐢靛瓙鍥存爮鐢电閿丮apper鎺ュ彛
+ *
+ * @author ard
+ * @date 2024-06-29
+ */
+public interface ArdTankWallLockMapper
+{
+ /**
+ * 鏌ヨ鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param processType 鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 鐢靛瓙鍥存爮鐢电閿�
+ */
+ public ArdTankWallLock selectArdTankWallLockByProcessType(String processType);
+
+ /**
+ * 鏌ヨ鐢靛瓙鍥存爮鐢电閿佸垪琛�
+ *
+ * @param ardTankWallLock 鐢靛瓙鍥存爮鐢电閿�
+ * @return 鐢靛瓙鍥存爮鐢电閿侀泦鍚�
+ */
+ public List<ArdTankWallLock> selectArdTankWallLockList(ArdTankWallLock ardTankWallLock);
+
+ /**
+ * 鏂板鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLock 鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ public int insertArdTankWallLock(ArdTankWallLock ardTankWallLock);
+
+ /**
+ * 淇敼鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLock 鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ public int updateArdTankWallLock(ArdTankWallLock ardTankWallLock);
+
+ /**
+ * 鍒犻櫎鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param processType 鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallLockByProcessType(String processType);
+
+ /**
+ * 鎵归噺鍒犻櫎鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param processTypes 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallLockByProcessTypes(String[] processTypes);
+
+ /**
+ *鏍规嵁鐢电閿佷富閿垹闄ょ數纾侀攣
+ *
+ */
+ public int deleteArdTankWallLockByLockId(String lockId);
+}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockTemporaryMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockTemporaryMapper.java
new file mode 100644
index 0000000..d8f6194
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallLockTemporaryMapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.ArdTankWallLockTemporary;
+
+/**
+ * 涓存椂鐢靛瓙鍥存爮鐢电閿丮apper鎺ュ彛
+ *
+ * @author ard
+ * @date 2024-07-01
+ */
+public interface ArdTankWallLockTemporaryMapper
+{
+ /**
+ * 鏌ヨ涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param id 涓存椂鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ */
+ public ArdTankWallLockTemporary selectArdTankWallLockTemporaryById(String id);
+
+ /**
+ * 鏌ヨ涓存椂鐢靛瓙鍥存爮鐢电閿佸垪琛�
+ *
+ * @param ardTankWallLockTemporary 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ * @return 涓存椂鐢靛瓙鍥存爮鐢电閿侀泦鍚�
+ */
+ public List<ArdTankWallLockTemporary> selectArdTankWallLockTemporaryList(ArdTankWallLockTemporary ardTankWallLockTemporary);
+
+ /**
+ * 鏂板涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLockTemporary 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ public int insertArdTankWallLockTemporary(ArdTankWallLockTemporary ardTankWallLockTemporary);
+
+ /**
+ * 淇敼涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLockTemporary 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ public int updateArdTankWallLockTemporary(ArdTankWallLockTemporary ardTankWallLockTemporary);
+
+ /**
+ * 鍒犻櫎涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param id 涓存椂鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallLockTemporaryById(String id);
+
+ /**
+ * 鎵归噺鍒犻櫎涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallLockTemporaryByIds(String[] ids);
+
+ public int deleteArdTankWallLockTemporaryByLockId(String lockId);
+}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java
index 43b1353..26e5f82 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java
@@ -1,13 +1,16 @@
package com.ruoyi.sy.service;
import java.util.List;
+import java.util.Map;
+
import com.ruoyi.sy.domain.ArdTankLock;
+import com.ruoyi.utils.result.Results;
/**
* 鐢电閿丼ervice鎺ュ彛
*
* @author ard
- * @date 2024-06-29
+ * @date 2024-07-01
*/
public interface IArdTankLockService
{
@@ -58,4 +61,6 @@
* @return 缁撴灉
*/
public int deleteArdTankLockById(String id);
+
+ public Results getAll(String usersId);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallLockService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallLockService.java
new file mode 100644
index 0000000..5ce129a
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallLockService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.sy.service;
+
+import java.util.List;
+import com.ruoyi.sy.domain.ArdTankWallLock;
+
+/**
+ * 鐢靛瓙鍥存爮鐢电閿丼ervice鎺ュ彛
+ *
+ * @author ard
+ * @date 2024-06-29
+ */
+public interface IArdTankWallLockService
+{
+ /**
+ * 鏌ヨ鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param processType 鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 鐢靛瓙鍥存爮鐢电閿�
+ */
+ public ArdTankWallLock selectArdTankWallLockByProcessType(String processType);
+
+ /**
+ * 鏌ヨ鐢靛瓙鍥存爮鐢电閿佸垪琛�
+ *
+ * @param ardTankWallLock 鐢靛瓙鍥存爮鐢电閿�
+ * @return 鐢靛瓙鍥存爮鐢电閿侀泦鍚�
+ */
+ public List<ArdTankWallLock> selectArdTankWallLockList(ArdTankWallLock ardTankWallLock);
+
+ /**
+ * 鏂板鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLock 鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ public int insertArdTankWallLock(ArdTankWallLock ardTankWallLock);
+
+ /**
+ * 淇敼鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLock 鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ public int updateArdTankWallLock(ArdTankWallLock ardTankWallLock);
+
+ /**
+ * 鎵归噺鍒犻櫎鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param processTypes 闇�瑕佸垹闄ょ殑鐢靛瓙鍥存爮鐢电閿佷富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallLockByProcessTypes(String[] processTypes);
+
+ /**
+ * 鍒犻櫎鐢靛瓙鍥存爮鐢电閿佷俊鎭�
+ *
+ * @param processType 鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallLockByProcessType(String processType);
+}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallLockTemporaryService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallLockTemporaryService.java
new file mode 100644
index 0000000..1f6a4ff
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallLockTemporaryService.java
@@ -0,0 +1,61 @@
+package com.ruoyi.sy.service;
+
+import java.util.List;
+import com.ruoyi.sy.domain.ArdTankWallLockTemporary;
+
+/**
+ * 涓存椂鐢靛瓙鍥存爮鐢电閿丼ervice鎺ュ彛
+ *
+ * @author ard
+ * @date 2024-07-01
+ */
+public interface IArdTankWallLockTemporaryService
+{
+ /**
+ * 鏌ヨ涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param id 涓存椂鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ */
+ public ArdTankWallLockTemporary selectArdTankWallLockTemporaryById(String id);
+
+ /**
+ * 鏌ヨ涓存椂鐢靛瓙鍥存爮鐢电閿佸垪琛�
+ *
+ * @param ardTankWallLockTemporary 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ * @return 涓存椂鐢靛瓙鍥存爮鐢电閿侀泦鍚�
+ */
+ public List<ArdTankWallLockTemporary> selectArdTankWallLockTemporaryList(ArdTankWallLockTemporary ardTankWallLockTemporary);
+
+ /**
+ * 鏂板涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLockTemporary 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ public int insertArdTankWallLockTemporary(ArdTankWallLockTemporary ardTankWallLockTemporary);
+
+ /**
+ * 淇敼涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLockTemporary 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ public int updateArdTankWallLockTemporary(ArdTankWallLockTemporary ardTankWallLockTemporary);
+
+ /**
+ * 鎵归噺鍒犻櫎涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑涓存椂鐢靛瓙鍥存爮鐢电閿佷富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallLockTemporaryByIds(String[] ids);
+
+ /**
+ * 鍒犻櫎涓存椂鐢靛瓙鍥存爮鐢电閿佷俊鎭�
+ *
+ * @param id 涓存椂鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallLockTemporaryById(String id);
+}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
index 06593f7..f4acfbf 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
@@ -1,27 +1,57 @@
package com.ruoyi.sy.service.impl;
+import java.util.HashMap;
import java.util.List;
+import com.dtflys.forest.annotation.Var;
+import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sy.domain.ArdSyUser;
+import com.ruoyi.sy.mapper.ArdSyUserMapper;
+import com.ruoyi.sy.mapper.ArdTankWallLockMapper;
+import com.ruoyi.sy.mapper.ArdTankWallLockTemporaryMapper;
+import com.ruoyi.system.mapper.SysConfigMapper;
+import com.ruoyi.utils.forest.SYClient;
+import com.ruoyi.utils.result.Results;
+import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Map;
+
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.sy.mapper.ArdTankLockMapper;
import com.ruoyi.sy.domain.ArdTankLock;
import com.ruoyi.sy.service.IArdTankLockService;
+import javax.annotation.Resource;
+
/**
* 鐢电閿丼ervice涓氬姟灞傚鐞�
*
* @author ard
- * @date 2024-06-29
+ * @date 2024-07-01
*/
@Service
public class ArdTankLockServiceImpl implements IArdTankLockService {
- @Autowired
+ @Resource
private ArdTankLockMapper ardTankLockMapper;
+
+ @Resource
+ private ArdTankWallLockMapper ardTankWallLockMapper;
+
+ @Resource
+ private ArdTankWallLockTemporaryMapper ardTankWallLockTemporaryMapper;
+
+ @Resource
+ private ArdSyUserMapper ardSyUserMapper;
+
+ @Resource
+ private SysConfigMapper sysConfigMapper;
+
+ @Resource
+ private SYClient sYClient;
/**
* 鏌ヨ鐢电閿�
@@ -87,6 +117,54 @@
*/
@Override
public int deleteArdTankLockById(String id) {
- return ardTankLockMapper.deleteArdTankLockById(id);
+ try{
+ return ardTankLockMapper.deleteArdTankLockById(id);
+ } finally {
+ ardTankWallLockMapper.deleteArdTankWallLockByLockId(id);//鍒犻櫎姘镐箙鐢靛瓙鍥存爮涓棿琛�
+ ardTankWallLockTemporaryMapper.deleteArdTankWallLockTemporaryByLockId(id);//鍒犻櫎涓存椂鐢靛瓙鍥存爮涓棿琛�
+ }
+ }
+
+ @Override
+ public Results getAll(String usersId) {
+ ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId);
+ if(ardSyUser == null){
+ return Results.error("娌℃湁鎸傛帴涓変竴杞﹁締鐢ㄦ埛");
+ }
+ List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
+ String syURL = "";
+ if(syURLResult.size() != 0){
+ syURL = syURLResult.get(0).getConfigValue();
+ }else{
+ return Results.error("涓変竴杞﹁締鍦板潃鏈綍鍏�");
+ }
+ String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
+ Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId());
+ String sessionId = (String) LogInResult.get("sessionId");
+ List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
+ List<Map<String,Object>> result = new ArrayList();
+ for(ArdTankLock ardTankLock : ardTankLockList){
+ Map<String,Object> map = new HashMap();
+ map.put("id",ardTankLock.getId());
+ map.put("lockNum",ardTankLock.getLockNum());
+ map.put("lockName",ardTankLock.getLockName());
+ map.put("imgPositionTop",ardTankLock.getImgPositionTop());
+ map.put("imgPositionLeft",ardTankLock.getImgPositionLeft());
+ map.put("carId",ardTankLock.getCarId());
+ map.put("enable",ardTankLock.getEnable());
+ map.put("restartState",ardTankLock.getRestartState());
+ if(ardTankLock.getOnlineTime() == null){
+ map.put("onlineTime","");
+ }else{
+ map.put("onlineTime",ardTankLock.getOnlineTime());
+ }
+ Map<String,Object> syResult = sYClient.getCarNearPositionByCarId(syURL, ardTankLock.getCarId(), ardSyUser.getUserId(), sessionId);
+ if(((String)syResult.get("rspCode")).equals("1")){
+ Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0);
+ map.put("carPlate",carMap.get("carPlate"));
+ }
+ result.add(map);
+ }
+ return Results.succeed(result);
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockServiceImpl.java
new file mode 100644
index 0000000..350f42e
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockServiceImpl.java
@@ -0,0 +1,92 @@
+package com.ruoyi.sy.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.uuid.IdUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.sy.mapper.ArdTankWallLockMapper;
+import com.ruoyi.sy.domain.ArdTankWallLock;
+import com.ruoyi.sy.service.IArdTankWallLockService;
+
+/**
+ * 鐢靛瓙鍥存爮鐢电閿丼ervice涓氬姟灞傚鐞�
+ *
+ * @author ard
+ * @date 2024-06-29
+ */
+@Service
+public class ArdTankWallLockServiceImpl implements IArdTankWallLockService {
+ @Autowired
+ private ArdTankWallLockMapper ardTankWallLockMapper;
+
+ /**
+ * 鏌ヨ鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param processType 鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 鐢靛瓙鍥存爮鐢电閿�
+ */
+ @Override
+ public ArdTankWallLock selectArdTankWallLockByProcessType(String processType) {
+ return ardTankWallLockMapper.selectArdTankWallLockByProcessType(processType);
+ }
+
+ /**
+ * 鏌ヨ鐢靛瓙鍥存爮鐢电閿佸垪琛�
+ *
+ * @param ardTankWallLock 鐢靛瓙鍥存爮鐢电閿�
+ * @return 鐢靛瓙鍥存爮鐢电閿�
+ */
+ @Override
+ public List<ArdTankWallLock> selectArdTankWallLockList(ArdTankWallLock ardTankWallLock) {
+ return ardTankWallLockMapper.selectArdTankWallLockList(ardTankWallLock);
+ }
+
+ /**
+ * 鏂板鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLock 鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertArdTankWallLock(ArdTankWallLock ardTankWallLock) {
+ ardTankWallLock.setId(IdUtils.simpleUUID());
+ return ardTankWallLockMapper.insertArdTankWallLock(ardTankWallLock);
+ }
+
+ /**
+ * 淇敼鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLock 鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateArdTankWallLock(ArdTankWallLock ardTankWallLock) {
+ return ardTankWallLockMapper.updateArdTankWallLock(ardTankWallLock);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param processTypes 闇�瑕佸垹闄ょ殑鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdTankWallLockByProcessTypes(String[] processTypes) {
+ return ardTankWallLockMapper.deleteArdTankWallLockByProcessTypes(processTypes);
+ }
+
+ /**
+ * 鍒犻櫎鐢靛瓙鍥存爮鐢电閿佷俊鎭�
+ *
+ * @param processType 鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdTankWallLockByProcessType(String processType) {
+ return ardTankWallLockMapper.deleteArdTankWallLockByProcessType(processType);
+ }
+}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockTemporaryServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockTemporaryServiceImpl.java
new file mode 100644
index 0000000..300fb96
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallLockTemporaryServiceImpl.java
@@ -0,0 +1,92 @@
+package com.ruoyi.sy.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.uuid.IdUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.sy.mapper.ArdTankWallLockTemporaryMapper;
+import com.ruoyi.sy.domain.ArdTankWallLockTemporary;
+import com.ruoyi.sy.service.IArdTankWallLockTemporaryService;
+
+/**
+ * 涓存椂鐢靛瓙鍥存爮鐢电閿丼ervice涓氬姟灞傚鐞�
+ *
+ * @author ard
+ * @date 2024-07-01
+ */
+@Service
+public class ArdTankWallLockTemporaryServiceImpl implements IArdTankWallLockTemporaryService {
+ @Autowired
+ private ArdTankWallLockTemporaryMapper ardTankWallLockTemporaryMapper;
+
+ /**
+ * 鏌ヨ涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param id 涓存椂鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ */
+ @Override
+ public ArdTankWallLockTemporary selectArdTankWallLockTemporaryById(String id) {
+ return ardTankWallLockTemporaryMapper.selectArdTankWallLockTemporaryById(id);
+ }
+
+ /**
+ * 鏌ヨ涓存椂鐢靛瓙鍥存爮鐢电閿佸垪琛�
+ *
+ * @param ardTankWallLockTemporary 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ * @return 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ */
+ @Override
+ public List<ArdTankWallLockTemporary> selectArdTankWallLockTemporaryList(ArdTankWallLockTemporary ardTankWallLockTemporary) {
+ return ardTankWallLockTemporaryMapper.selectArdTankWallLockTemporaryList(ardTankWallLockTemporary);
+ }
+
+ /**
+ * 鏂板涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLockTemporary 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertArdTankWallLockTemporary(ArdTankWallLockTemporary ardTankWallLockTemporary) {
+ ardTankWallLockTemporary.setId(IdUtils.simpleUUID());
+ return ardTankWallLockTemporaryMapper.insertArdTankWallLockTemporary(ardTankWallLockTemporary);
+ }
+
+ /**
+ * 淇敼涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ardTankWallLockTemporary 涓存椂鐢靛瓙鍥存爮鐢电閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateArdTankWallLockTemporary(ArdTankWallLockTemporary ardTankWallLockTemporary) {
+ return ardTankWallLockTemporaryMapper.updateArdTankWallLockTemporary(ardTankWallLockTemporary);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎涓存椂鐢靛瓙鍥存爮鐢电閿�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑涓存椂鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdTankWallLockTemporaryByIds(String[] ids) {
+ return ardTankWallLockTemporaryMapper.deleteArdTankWallLockTemporaryByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎涓存椂鐢靛瓙鍥存爮鐢电閿佷俊鎭�
+ *
+ * @param id 涓存椂鐢靛瓙鍥存爮鐢电閿佷富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdTankWallLockTemporaryById(String id) {
+ return ardTankWallLockTemporaryMapper.deleteArdTankWallLockTemporaryById(id);
+ }
+}
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml
index 0ee14af..4d033cd 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml
@@ -12,11 +12,12 @@
<result property="imgPositionLeft" column="img_position_left" />
<result property="carId" column="car_id" />
<result property="enable" column="enable" />
+ <result property="restartState" column="restart_state" />
<result property="onlineTime" column="online_time" />
</resultMap>
<sql id="selectArdTankLockVo">
- select id, lock_num, lock_name, img_position_top, img_position_left, car_id, enable, online_time from ard_tank_lock
+ select id, lock_num, lock_name, img_position_top, img_position_left, car_id, enable, restart_state, online_time from ard_tank_lock
</sql>
<select id="selectArdTankLockList" parameterType="ArdTankLock" resultMap="ArdTankLockResult">
@@ -28,6 +29,7 @@
<if test="imgPositionLeft != null and imgPositionLeft != ''"> and img_position_left = #{imgPositionLeft}</if>
<if test="carId != null and carId != ''"> and car_id = #{carId}</if>
<if test="enable != null and enable != ''"> and enable = #{enable}</if>
+ <if test="restartState != null and restartState != ''"> and restart_state = #{restartState}</if>
<if test="onlineTime != null and onlineTime != ''"> and online_time = #{onlineTime}</if>
</where>
</select>
@@ -47,6 +49,7 @@
<if test="imgPositionLeft != null">img_position_left,</if>
<if test="carId != null">car_id,</if>
<if test="enable != null">enable,</if>
+ <if test="restartState != null">restart_state,</if>
<if test="onlineTime != null">online_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -57,6 +60,7 @@
<if test="imgPositionLeft != null">#{imgPositionLeft},</if>
<if test="carId != null">#{carId},</if>
<if test="enable != null">#{enable},</if>
+ <if test="restartState != null">#{restartState},</if>
<if test="onlineTime != null">#{onlineTime},</if>
</trim>
</insert>
@@ -70,6 +74,7 @@
<if test="imgPositionLeft != null">img_position_left = #{imgPositionLeft},</if>
<if test="carId != null">car_id = #{carId},</if>
<if test="enable != null">enable = #{enable},</if>
+ <if test="restartState != null">restart_state = #{restartState},</if>
<if test="onlineTime != null">online_time = #{onlineTime},</if>
</trim>
where id = #{id}
@@ -85,4 +90,8 @@
#{id}
</foreach>
</delete>
+
+ <select id="getAll" resultMap="ArdTankLockResult">
+ select * from ard_tank_lock atl order by atl.car_id
+ </select>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml
new file mode 100644
index 0000000..fe471ef
--- /dev/null
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallLockMapper.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.sy.mapper.ArdTankWallLockMapper">
+
+ <resultMap type="ArdTankWallLock" id="ArdTankWallLockResult">
+ <result property="processType" column="process_type" />
+ <result property="id" column="id" />
+ <result property="wallId" column="wall_id" />
+ <result property="lockId" column="lock_id" />
+ </resultMap>
+
+ <sql id="selectArdTankWallLockVo">
+ select process_type, id, wall_id, lock_id from ard_tank_wall_lock
+ </sql>
+
+ <select id="selectArdTankWallLockList" parameterType="ArdTankWallLock" resultMap="ArdTankWallLockResult">
+ <include refid="selectArdTankWallLockVo"/>
+ <where>
+ <if test="processType != null and processType != ''"> and process_type = #{processType}</if>
+ <if test="wallId != null and wallId != ''"> and wall_id = #{wallId}</if>
+ <if test="lockId != null and lockId != ''"> and lock_id = #{lockId}</if>
+ </where>
+ </select>
+
+ <select id="selectArdTankWallLockByProcessType" parameterType="String" resultMap="ArdTankWallLockResult">
+ <include refid="selectArdTankWallLockVo"/>
+ where process_type = #{processType}
+ </select>
+
+ <insert id="insertArdTankWallLock" parameterType="ArdTankWallLock">
+ insert into ard_tank_wall_lock
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="processType != null">process_type,</if>
+ <if test="id != null">id,</if>
+ <if test="wallId != null">wall_id,</if>
+ <if test="lockId != null">lock_id,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="processType != null">#{processType},</if>
+ <if test="id != null">#{id},</if>
+ <if test="wallId != null">#{wallId},</if>
+ <if test="lockId != null">#{lockId},</if>
+ </trim>
+ </insert>
+
+ <update id="updateArdTankWallLock" parameterType="ArdTankWallLock">
+ update ard_tank_wall_lock
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="id != null">id = #{id},</if>
+ <if test="wallId != null">wall_id = #{wallId},</if>
+ <if test="lockId != null">lock_id = #{lockId},</if>
+ </trim>
+ where process_type = #{processType}
+ </update>
+
+ <delete id="deleteArdTankWallLockByProcessType" parameterType="String">
+ delete from ard_tank_wall_lock where process_type = #{processType}
+ </delete>
+
+ <delete id="deleteArdTankWallLockByProcessTypes" parameterType="String">
+ delete from ard_tank_wall_lock where process_type in
+ <foreach item="processType" collection="array" open="(" separator="," close=")">
+ #{processType}
+ </foreach>
+ </delete>
+
+ <delete id="deleteArdTankWallLockByLockId" parameterType="java.lang.String">
+ delete from ard_tank_wall_lock where lock_id = #{lockId}
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallLockTemporaryMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallLockTemporaryMapper.xml
new file mode 100644
index 0000000..ff0bbf4
--- /dev/null
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallLockTemporaryMapper.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.sy.mapper.ArdTankWallLockTemporaryMapper">
+
+ <resultMap type="ArdTankWallLockTemporary" id="ArdTankWallLockTemporaryResult">
+ <result property="id" column="id" />
+ <result property="wallId" column="wall_id" />
+ <result property="lockId" column="lock_id" />
+ <result property="processType" column="process_type" />
+ </resultMap>
+
+ <sql id="selectArdTankWallLockTemporaryVo">
+ select id, wall_id, lock_id, process_type from ard_tank_wall_lock_temporary
+ </sql>
+
+ <select id="selectArdTankWallLockTemporaryList" parameterType="ArdTankWallLockTemporary" resultMap="ArdTankWallLockTemporaryResult">
+ <include refid="selectArdTankWallLockTemporaryVo"/>
+ <where>
+ <if test="wallId != null and wallId != ''"> and wall_id = #{wallId}</if>
+ <if test="lockId != null and lockId != ''"> and lock_id = #{lockId}</if>
+ <if test="processType != null and processType != ''"> and process_type = #{processType}</if>
+ </where>
+ </select>
+
+ <select id="selectArdTankWallLockTemporaryById" parameterType="String" resultMap="ArdTankWallLockTemporaryResult">
+ <include refid="selectArdTankWallLockTemporaryVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertArdTankWallLockTemporary" parameterType="ArdTankWallLockTemporary">
+ insert into ard_tank_wall_lock_temporary
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="wallId != null">wall_id,</if>
+ <if test="lockId != null">lock_id,</if>
+ <if test="processType != null">process_type,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
+ <if test="wallId != null">#{wallId},</if>
+ <if test="lockId != null">#{lockId},</if>
+ <if test="processType != null">#{processType},</if>
+ </trim>
+ </insert>
+
+ <update id="updateArdTankWallLockTemporary" parameterType="ArdTankWallLockTemporary">
+ update ard_tank_wall_lock_temporary
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="wallId != null">wall_id = #{wallId},</if>
+ <if test="lockId != null">lock_id = #{lockId},</if>
+ <if test="processType != null">process_type = #{processType},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteArdTankWallLockTemporaryById" parameterType="String">
+ delete from ard_tank_wall_lock_temporary where id = #{id}
+ </delete>
+
+ <delete id="deleteArdTankWallLockTemporaryByIds" parameterType="String">
+ delete from ard_tank_wall_lock_temporary where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+
+ <delete id="deleteArdTankWallLockTemporaryByLockId" parameterType="java.lang.String">
+ delete from ard_tank_wall_lock_temporary where lock_id = #{lockId}
+ </delete>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index d426898..40d1e2b 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -77,6 +77,8 @@
#涓変竴杞﹁締寮�鍏�
syCar:
enabled: true
+ userId: admin
+ password: 654321
#鏃犱汉鏈哄紑鍏�
uav:
enabled: true
--
Gitblit v1.9.3