From 979166aaa979629bf223a44a46aeb6d0c0e61aec Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 01 Sep 2023 16:32:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java
index 98c4569..0b79153 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java
@@ -11,8 +11,17 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.entity.ManageCoordinate;
+import com.moral.api.entity.ManageCoordinateDetail;
+import com.moral.api.entity.SpecialDevice;
+import com.moral.api.mapper.DeviceMapper;
+import com.moral.api.mapper.ManageCoordinateDetailMapper;
import com.moral.api.mapper.ManageCoordinateMapper;
+import com.moral.api.mapper.SpecialDeviceMapper;
+import com.moral.api.service.DeviceService;
+import com.moral.api.service.ManageCoordinateDetailService;
import com.moral.api.service.ManageCoordinateService;
+import com.moral.api.service.SpecialDeviceService;
+import com.moral.util.TokenUtils;
@Service
@@ -21,6 +30,9 @@
@Autowired
private ManageCoordinateMapper manageCoordinateMapper;
+ @Autowired
+ private SpecialDeviceMapper specialDeviceMapper;
+
/**
* ������������
* @param params
@@ -28,6 +40,12 @@
*/
@Override
public Integer interCoordinate(Map<String, Object> params) {
+// String mac = params.get("mac").toString();
+ String mac ="p5dnd7a0243625";
+ QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
+ wrapper.eq("mac",mac);
+ wrapper.eq("is_delete","0");
+ SpecialDevice specialDevice = specialDeviceMapper.selectOne(wrapper);
String startPoint = params.get("startPoint").toString();
String endPoint = params.get("endPoint").toString();
QueryWrapper<ManageCoordinate> queryWrapper = new QueryWrapper<>();
@@ -43,6 +61,7 @@
manageCoordinate.setStartPoint(startPoint);
manageCoordinate.setEndPoint(endPoint);
manageCoordinate.setIsDel(0);
+ manageCoordinate.setOrganizationId(specialDevice.getOrganizationId());
int code = manageCoordinateMapper.insert(manageCoordinate);
return code;
}
@@ -63,8 +82,10 @@
*/
@Override
public void deleteCoordinate(Integer id) {
+ ManageCoordinate manageCoordinate = manageCoordinateMapper.selectById(id);
+ manageCoordinate.setIsDel(1);
+ manageCoordinateMapper.updateById(manageCoordinate);
- manageCoordinateMapper.deleteById(id);
}
/**
--
Gitblit v1.8.0