From 7a7048db22ace25df5fd39a78c32ea6685c97862 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 02 七月 2024 10:49:38 +0800
Subject: [PATCH] 电磁锁概要操作修改提交
---
ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWall.java | 93 ++++++++++
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java | 63 +++++++
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 55 ++++++
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java | 100 +++++++++++
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockMapper.java | 3
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockService.java | 3
ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml | 13 +
ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml | 73 ++++++++
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java | 63 +++++++
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java | 54 +++++
10 files changed, 511 insertions(+), 9 deletions(-)
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 4a42275..a0f3e6f 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
@@ -6,6 +6,8 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sy.domain.ArdTankWall;
+import com.ruoyi.sy.service.IArdTankWallService;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -40,6 +42,9 @@
public class ArdTankLockController extends BaseController {
@Autowired
private IArdTankLockService ardTankLockService;
+
+ @Autowired
+ private IArdTankWallService ardTankWallService;
/**
* 鏌ヨ鐢电閿佸垪琛�
@@ -78,12 +83,19 @@
/**
* 鏂板鐢电閿�
*/
- @ApiOperation("鏂板鐢电閿�")
+ /*@ApiOperation("鏂板鐢电閿�")
@PreAuthorize("@ss.hasPermi('sy:lock:add')")
@Log(title = "鐢电閿�" , businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdTankLock ardTankLock) {
return toAjax(ardTankLockService.insertArdTankLock(ardTankLock));
+ }*/
+ @ApiOperation("鏂板鐢电閿�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:add')")
+ @Log(title = "鐢电閿�" , businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody Map<String,Object> para) {
+ return toAjax(ardTankLockService.insertArdTankLock(para));
}
/**
@@ -127,4 +139,45 @@
Results result = ardTankLockService.getAll(userId);
return result;
}
+
+ /**
+ * 鏂板鐢靛瓙鍥存爮
+ */
+ @ApiOperation("鏂板鐢靛瓙鍥存爮")
+ @PreAuthorize("@ss.hasPermi('sy:lock:addWall')")
+ @Log(title = "鐢电閿�" , businessType = BusinessType.INSERT)
+ @PostMapping("/addWall")
+ public AjaxResult addWall(@RequestBody ArdTankWall ardTankWall) {
+ return toAjax(ardTankWallService.insertArdTankWall(ardTankWall));
+ }
+
+ /**
+ * 淇敼鐢靛瓙鍥存爮
+ */
+ @ApiOperation("淇敼鐢靛瓙鍥存爮")
+ @PreAuthorize("@ss.hasPermi('sy:lock:updateWall')")
+ @Log(title = "鐢电閿�" , businessType = BusinessType.UPDATE)
+ @PutMapping("/updateWall")
+ public AjaxResult updateWall(@RequestBody ArdTankWall ardTankWall) {
+ return toAjax(ardTankWallService.updateArdTankWall(ardTankWall));
+ }
+
+ /**
+ * 鍒犻櫎鐢靛瓙鍥存爮
+ */
+ @ApiOperation("鍒犻櫎鍗曚竴鐢靛瓙鍥存爮")
+ @PreAuthorize("@ss.hasPermi('sy:lock:removeWall')")
+ @Log(title = "鐢电閿�" , businessType = BusinessType.DELETE)
+ @DeleteMapping("/removeWall/{id}")
+ public AjaxResult removeWall(@PathVariable String id) {
+ return toAjax(ardTankWallService.deleteArdTankWallById(id));
+ }
+
+ @ApiOperation("鏌ヨ鍏ㄩ儴鐢靛瓙鍥存爮")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getAllArdTankWall')")
+ @GetMapping("/getAllArdTankWall")
+ public Results getAllArdTankWall() {
+ List<ArdTankWall> result = ardTankWallService.getAllArdTankWall();
+ return Results.succeed(result);
+ }
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWall.java b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWall.java
new file mode 100644
index 0000000..54aa1b8
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWall.java
@@ -0,0 +1,93 @@
+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
+ *
+ * @author ard
+ * @date 2024-07-01
+ */
+public class ArdTankWall extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 涓婚敭 */
+ private String id;
+
+ /** 鐢靛瓙鍥存爮鍚嶇О */
+ @Excel(name = "鐢靛瓙鍥存爮鍚嶇О")
+ private String wallName;
+
+ /** 缁忓害 */
+ @Excel(name = "缁忓害")
+ private Double longitude;
+
+ /** 绾害 */
+ @Excel(name = "绾害")
+ private Double latitude;
+
+ /** 璺濈 */
+ @Excel(name = "璺濈")
+ private Integer distance;
+
+ public void setId(String id)
+ {
+ this.id = id;
+ }
+
+ public String getId()
+ {
+ return id;
+ }
+ public void setWallName(String wallName)
+ {
+ this.wallName = wallName;
+ }
+
+ public String getWallName()
+ {
+ return wallName;
+ }
+ public void setLongitude(Double longitude)
+ {
+ this.longitude = longitude;
+ }
+
+ public Double getLongitude()
+ {
+ return longitude;
+ }
+ public void setLatitude(Double latitude)
+ {
+ this.latitude = latitude;
+ }
+
+ public Double getLatitude()
+ {
+ return latitude;
+ }
+ public void setDistance(Integer distance)
+ {
+ this.distance = distance;
+ }
+
+ public Integer getDistance()
+ {
+ return distance;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("wallName", getWallName())
+ .append("longitude", getLongitude())
+ .append("latitude", getLatitude())
+ .append("distance", getDistance())
+ .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 7f09d17..e5fe141 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
@@ -2,6 +2,7 @@
import java.util.List;
import com.ruoyi.sy.domain.ArdTankLock;
+import org.apache.ibatis.annotations.Param;
/**
* 鐢电閿丮apper鎺ュ彛
@@ -60,4 +61,6 @@
public int deleteArdTankLockByIds(String[] ids);
public List<ArdTankLock> getAll();
+
+ public int insertArdTankLocks(@Param("ardTankLocks") List<ArdTankLock> ardTankLocks);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java
new file mode 100644
index 0000000..1c40bf4
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.sy.mapper;
+
+import java.util.List;
+import com.ruoyi.sy.domain.ArdTankWall;
+
+/**
+ * 鐢电閿佺數瀛愬洿鏍廙apper鎺ュ彛
+ *
+ * @author ard
+ * @date 2024-07-01
+ */
+public interface ArdTankWallMapper
+{
+ /**
+ * 鏌ヨ鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param id 鐢电閿佺數瀛愬洿鏍忎富閿�
+ * @return 鐢电閿佺數瀛愬洿鏍�
+ */
+ public ArdTankWall selectArdTankWallById(String id);
+
+ /**
+ * 鏌ヨ鐢电閿佺數瀛愬洿鏍忓垪琛�
+ *
+ * @param ardTankWall 鐢电閿佺數瀛愬洿鏍�
+ * @return 鐢电閿佺數瀛愬洿鏍忛泦鍚�
+ */
+ public List<ArdTankWall> selectArdTankWallList(ArdTankWall ardTankWall);
+
+ /**
+ * 鏂板鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param ardTankWall 鐢电閿佺數瀛愬洿鏍�
+ * @return 缁撴灉
+ */
+ public int insertArdTankWall(ArdTankWall ardTankWall);
+
+ /**
+ * 淇敼鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param ardTankWall 鐢电閿佺數瀛愬洿鏍�
+ * @return 缁撴灉
+ */
+ public int updateArdTankWall(ArdTankWall ardTankWall);
+
+ /**
+ * 鍒犻櫎鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param id 鐢电閿佺數瀛愬洿鏍忎富閿�
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallById(String id);
+
+ /**
+ * 鎵归噺鍒犻櫎鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallByIds(String[] ids);
+
+ public List<ArdTankWall> getAllArdTankWall();
+}
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 26e5f82..ba0b0f8 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
@@ -36,7 +36,8 @@
* @param ardTankLock 鐢电閿�
* @return 缁撴灉
*/
- public int insertArdTankLock(ArdTankLock ardTankLock);
+ //public int insertArdTankLock(ArdTankLock ardTankLock);
+ public int insertArdTankLock(Map<String,Object> para);
/**
* 淇敼鐢电閿�
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java
new file mode 100644
index 0000000..7b3c852
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java
@@ -0,0 +1,63 @@
+package com.ruoyi.sy.service;
+
+import java.util.List;
+import com.ruoyi.sy.domain.ArdTankWall;
+
+/**
+ * 鐢电閿佺數瀛愬洿鏍廠ervice鎺ュ彛
+ *
+ * @author ard
+ * @date 2024-07-01
+ */
+public interface IArdTankWallService
+{
+ /**
+ * 鏌ヨ鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param id 鐢电閿佺數瀛愬洿鏍忎富閿�
+ * @return 鐢电閿佺數瀛愬洿鏍�
+ */
+ public ArdTankWall selectArdTankWallById(String id);
+
+ /**
+ * 鏌ヨ鐢电閿佺數瀛愬洿鏍忓垪琛�
+ *
+ * @param ardTankWall 鐢电閿佺數瀛愬洿鏍�
+ * @return 鐢电閿佺數瀛愬洿鏍忛泦鍚�
+ */
+ public List<ArdTankWall> selectArdTankWallList(ArdTankWall ardTankWall);
+
+ /**
+ * 鏂板鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param ardTankWall 鐢电閿佺數瀛愬洿鏍�
+ * @return 缁撴灉
+ */
+ public int insertArdTankWall(ArdTankWall ardTankWall);
+
+ /**
+ * 淇敼鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param ardTankWall 鐢电閿佺數瀛愬洿鏍�
+ * @return 缁撴灉
+ */
+ public int updateArdTankWall(ArdTankWall ardTankWall);
+
+ /**
+ * 鎵归噺鍒犻櫎鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鐢电閿佺數瀛愬洿鏍忎富閿泦鍚�
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallByIds(String[] ids);
+
+ /**
+ * 鍒犻櫎鐢电閿佺數瀛愬洿鏍忎俊鎭�
+ *
+ * @param id 鐢电閿佺數瀛愬洿鏍忎富閿�
+ * @return 缁撴灉
+ */
+ public int deleteArdTankWallById(String id);
+
+ public List<ArdTankWall> getAllArdTankWall();
+}
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 f4acfbf..df379cd 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,7 +1,6 @@
package com.ruoyi.sy.service.impl;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
import com.dtflys.forest.annotation.Var;
import com.ruoyi.common.core.domain.entity.SysConfig;
@@ -16,8 +15,8 @@
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 java.util.stream.Collectors;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -82,10 +81,28 @@
* @return 缁撴灉
*/
@Override
+ public int insertArdTankLock(Map<String,Object> para) {
+ String carId = (String) para.get("carId");
+ List<Map<String,String>> lockList = (List<Map<String,String>>)para.get("lockList");
+ List<ArdTankLock> ardTankLocks = new ArrayList();
+ for(Map<String,String> map : lockList){
+ ArdTankLock ardTankLock = new ArdTankLock();
+ ardTankLock.setId(IdUtils.simpleUUID());
+ ardTankLock.setLockNum(map.get("lockNum"));
+ ardTankLock.setLockName(map.get("lockName"));
+ ardTankLock.setImgPositionTop(map.get("imgPositionTop"));
+ ardTankLock.setImgPositionLeft(map.get("imgPositionLeft"));
+ ardTankLock.setCarId(carId);
+ ardTankLock.setEnable(map.get("enable"));
+ ardTankLocks.add(ardTankLock);
+ }
+ return ardTankLockMapper.insertArdTankLocks(ardTankLocks);
+ }
+ /*@Override
public int insertArdTankLock(ArdTankLock ardTankLock) {
ardTankLock.setId(IdUtils.simpleUUID());
return ardTankLockMapper.insertArdTankLock(ardTankLock);
- }
+ }*/
/**
* 淇敼鐢电閿�
@@ -152,7 +169,11 @@
map.put("imgPositionLeft",ardTankLock.getImgPositionLeft());
map.put("carId",ardTankLock.getCarId());
map.put("enable",ardTankLock.getEnable());
- map.put("restartState",ardTankLock.getRestartState());
+ if(ardTankLock.getRestartState() == null){
+ map.put("restartState","");
+ }else{
+ map.put("restartState",ardTankLock.getRestartState());
+ }
if(ardTankLock.getOnlineTime() == null){
map.put("onlineTime","");
}else{
@@ -165,6 +186,25 @@
}
result.add(map);
}
- return Results.succeed(result);
+ List<Map<String,Object>> result0 = new ArrayList();//鎷兼帴carId鍜宑arPlate
+ Set<String> carIdSet = new HashSet();
+ for(Map<String,Object> map : result){
+ if(!carIdSet.contains((String) map.get("carId"))){
+ Map<String,Object> mapr = new HashMap();
+ mapr.put("carId",map.get("carId"));
+ mapr.put("carPlate",map.get("carPlate"));
+ mapr.put("lockList",new ArrayList());
+ result0.add(mapr);
+ }
+ carIdSet.add((String) map.get("carId"));
+ }
+ for(Map<String,Object> map : result0){
+ for(Map<String,Object> map0 : result){
+ if(((String)map.get("carId")).equals((String)map0.get("carId"))){
+ ((List)map.get("lockList")).add(map0);
+ }
+ }
+ }
+ return Results.succeed(result0);
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
new file mode 100644
index 0000000..d57f56f
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
@@ -0,0 +1,100 @@
+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.ArdTankWallMapper;
+import com.ruoyi.sy.domain.ArdTankWall;
+import com.ruoyi.sy.service.IArdTankWallService;
+
+import javax.annotation.Resource;
+
+/**
+ * 鐢电閿佺數瀛愬洿鏍廠ervice涓氬姟灞傚鐞�
+ *
+ * @author ard
+ * @date 2024-07-01
+ */
+@Service
+public class ArdTankWallServiceImpl implements IArdTankWallService {
+ @Resource
+ private ArdTankWallMapper ardTankWallMapper;
+
+ /**
+ * 鏌ヨ鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param id 鐢电閿佺數瀛愬洿鏍忎富閿�
+ * @return 鐢电閿佺數瀛愬洿鏍�
+ */
+ @Override
+ public ArdTankWall selectArdTankWallById(String id) {
+ return ardTankWallMapper.selectArdTankWallById(id);
+ }
+
+ /**
+ * 鏌ヨ鐢电閿佺數瀛愬洿鏍忓垪琛�
+ *
+ * @param ardTankWall 鐢电閿佺數瀛愬洿鏍�
+ * @return 鐢电閿佺數瀛愬洿鏍�
+ */
+ @Override
+ public List<ArdTankWall> selectArdTankWallList(ArdTankWall ardTankWall) {
+ return ardTankWallMapper.selectArdTankWallList(ardTankWall);
+ }
+
+ /**
+ * 鏂板鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param ardTankWall 鐢电閿佺數瀛愬洿鏍�
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertArdTankWall(ArdTankWall ardTankWall) {
+ ardTankWall.setId(IdUtils.simpleUUID());
+ return ardTankWallMapper.insertArdTankWall(ardTankWall);
+ }
+
+ /**
+ * 淇敼鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param ardTankWall 鐢电閿佺數瀛愬洿鏍�
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateArdTankWall(ArdTankWall ardTankWall) {
+ return ardTankWallMapper.updateArdTankWall(ardTankWall);
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎鐢电閿佺數瀛愬洿鏍�
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鐢电閿佺數瀛愬洿鏍忎富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdTankWallByIds(String[] ids) {
+ return ardTankWallMapper.deleteArdTankWallByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎鐢电閿佺數瀛愬洿鏍忎俊鎭�
+ *
+ * @param id 鐢电閿佺數瀛愬洿鏍忎富閿�
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteArdTankWallById(String id) {
+ return ardTankWallMapper.deleteArdTankWallById(id);
+ }
+
+ @Override
+ public List<ArdTankWall> getAllArdTankWall() {
+ List<ArdTankWall> result = ardTankWallMapper.getAllArdTankWall();
+ return result;
+ }
+}
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml
index 4d033cd..e7231e9 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml
@@ -94,4 +94,17 @@
<select id="getAll" resultMap="ArdTankLockResult">
select * from ard_tank_lock atl order by atl.car_id
</select>
+
+ <insert id="insertArdTankLocks" parameterType="com.ruoyi.sy.domain.ArdTankLock" >
+ insert into ard_tank_lock (id, lock_num, lock_name,
+ img_position_top, img_position_left, car_id,
+ enable, restart_state, online_time)
+ values
+ <foreach collection ="ardTankLocks" item="ardTankLock" separator =",">
+ (#{ardTankLock.id},#{ardTankLock.lockNum},#{ardTankLock.lockName},
+ #{ardTankLock.imgPositionTop},#{ardTankLock.imgPositionLeft},
+ #{ardTankLock.carId},#{ardTankLock.enable},#{ardTankLock.restartState},
+ #{ardTankLock.onlineTime})
+ </foreach >
+ </insert>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
new file mode 100644
index 0000000..504bdd9
--- /dev/null
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
@@ -0,0 +1,73 @@
+<?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.ArdTankWallMapper">
+
+ <resultMap type="ArdTankWall" id="ArdTankWallResult">
+ <result property="id" column="id" />
+ <result property="wallName" column="wall_name" />
+ <result property="longitude" column="longitude" />
+ <result property="latitude" column="latitude" />
+ <result property="distance" column="distance" />
+ </resultMap>
+
+ <sql id="selectArdTankWallVo">
+ select id, wall_name, longitude, latitude, distance from ard_tank_wall
+ </sql>
+
+ <select id="selectArdTankWallList" parameterType="ArdTankWall" resultMap="ArdTankWallResult">
+ <include refid="selectArdTankWallVo"/>
+ <where>
+ <if test="wallName != null and wallName != ''"> and wall_name like '%'||#{wallName}||'%'</if>
+ <if test="longitude != null "> and longitude = #{longitude}</if>
+ <if test="latitude != null "> and latitude = #{latitude}</if>
+ <if test="distance != null "> and distance = #{distance}</if>
+ </where>
+ </select>
+
+ <select id="selectArdTankWallById" parameterType="String" resultMap="ArdTankWallResult">
+ <include refid="selectArdTankWallVo"/>
+ where id = #{id}
+ </select>
+
+ <insert id="insertArdTankWall" parameterType="ArdTankWall">
+ insert into ard_tank_wall
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
+ <if test="wallName != null">wall_name,</if>
+ <if test="longitude != null">longitude,</if>
+ <if test="latitude != null">latitude,</if>
+ <if test="distance != null">distance,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
+ <if test="wallName != null">#{wallName},</if>
+ <if test="longitude != null">#{longitude},</if>
+ <if test="latitude != null">#{latitude},</if>
+ <if test="distance != null">#{distance},</if>
+ </trim>
+ </insert>
+
+ <update id="updateArdTankWall" parameterType="ArdTankWall">
+ update ard_tank_wall
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="wallName != null">wall_name = #{wallName},</if>
+ <if test="longitude != null">longitude = #{longitude},</if>
+ <if test="latitude != null">latitude = #{latitude},</if>
+ <if test="distance != null">distance = #{distance},</if>
+ </trim>
+ where id = #{id}
+ </update>
+
+ <delete id="deleteArdTankWallById" parameterType="String">
+ delete from ard_tank_wall where id = #{id}
+ </delete>
+
+ <delete id="deleteArdTankWallByIds" parameterType="String">
+ delete from ard_tank_wall where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.3