From e2411fee13ff406db4aa5d994d7dcffdf4482cab Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 06 Sep 2023 14:22:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/service/impl/ManageCoordinateServiceImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 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..7139fb6 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
@@ -2,6 +2,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import java.util.Date;
import java.util.List;
@@ -11,8 +12,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 +31,9 @@
@Autowired
private ManageCoordinateMapper manageCoordinateMapper;
+ @Autowired
+ private SpecialDeviceMapper specialDeviceMapper;
+
/**
* ������������
* @param params
@@ -28,11 +41,14 @@
*/
@Override
public Integer interCoordinate(Map<String, Object> params) {
+ String mac = params.get("mac").toString();
+ 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<>();
queryWrapper.eq("start_point",startPoint);
- queryWrapper.eq("end_point",endPoint);
Integer integer = manageCoordinateMapper.selectCount(queryWrapper);
if (integer>=1){
return null;
@@ -41,8 +57,8 @@
manageCoordinate.setCreateTime(new Date());
manageCoordinate.setUpdateTime(new Date());
manageCoordinate.setStartPoint(startPoint);
- manageCoordinate.setEndPoint(endPoint);
manageCoordinate.setIsDel(0);
+ manageCoordinate.setOrganizationId(specialDevice.getOrganizationId());
int code = manageCoordinateMapper.insert(manageCoordinate);
return code;
}
@@ -63,8 +79,10 @@
*/
@Override
public void deleteCoordinate(Integer id) {
+ ManageCoordinate manageCoordinate = manageCoordinateMapper.selectById(id);
+ manageCoordinate.setIsDel(1);
+ manageCoordinateMapper.updateById(manageCoordinate);
- manageCoordinateMapper.deleteById(id);
}
/**
@@ -72,9 +90,22 @@
* @return
*/
@Override
- public List<ManageCoordinate> selectCoordinate() {
+ public List<ManageCoordinate> selectCoordinate(String name,String mac) {
+
QueryWrapper<ManageCoordinate> queryWrapper = new QueryWrapper<>();
+
+ if (!ObjectUtils.isEmpty(name)){
+ queryWrapper.like("start_point",name);
+ }
+ if(!ObjectUtils.isEmpty(mac)){
+ QueryWrapper<SpecialDevice> wrapper = new QueryWrapper<>();
+ wrapper.eq("mac",mac);
+ wrapper.eq("is_delete","0");
+ SpecialDevice specialDevice = specialDeviceMapper.selectOne(wrapper);
+ queryWrapper.eq("organization_id",specialDevice.getOrganizationId());
+ }
queryWrapper.eq("is_del",0);
+ queryWrapper.orderByDesc("coordinate_id");
List<ManageCoordinate> manageCoordinates = manageCoordinateMapper.selectList(queryWrapper);
return manageCoordinates;
}
--
Gitblit v1.8.0