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 | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 17c4ef3..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
@@ -12,10 +12,16 @@
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
@@ -25,7 +31,7 @@
private ManageCoordinateMapper manageCoordinateMapper;
@Autowired
- private ManageCoordinateDetailMapper manageCoordinateDetailMapper;
+ private SpecialDeviceMapper specialDeviceMapper;
/**
* ������������
@@ -34,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<>();
@@ -49,6 +61,7 @@
manageCoordinate.setStartPoint(startPoint);
manageCoordinate.setEndPoint(endPoint);
manageCoordinate.setIsDel(0);
+ manageCoordinate.setOrganizationId(specialDevice.getOrganizationId());
int code = manageCoordinateMapper.insert(manageCoordinate);
return code;
}
@@ -68,15 +81,10 @@
* @param id
*/
@Override
- public Integer deleteCoordinate(Integer id) {
- QueryWrapper<ManageCoordinateDetail> wrapper = new QueryWrapper<>();
- wrapper.eq("coordinate_id",id);
- Integer integer = manageCoordinateDetailMapper.selectCount(wrapper);
- if (integer>0){
- return 1;
- }
- manageCoordinateMapper.deleteById(id);
- return 200;
+ public void deleteCoordinate(Integer id) {
+ ManageCoordinate manageCoordinate = manageCoordinateMapper.selectById(id);
+ manageCoordinate.setIsDel(1);
+ manageCoordinateMapper.updateById(manageCoordinate);
}
--
Gitblit v1.8.0