From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/controller/ServicesScopeController.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/ServicesScopeController.java b/screen-manage/src/main/java/com/moral/api/controller/ServicesScopeController.java
index 639358e..39d1c7a 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/ServicesScopeController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/ServicesScopeController.java
@@ -5,6 +5,7 @@
import com.moral.api.entity.Organization;
import com.moral.api.entity.ServicesScope;
import com.moral.api.mapper.OrganizationMapper;
+import com.moral.api.pojo.form.ServiceScope.AddBoundaryBindDevice;
import com.moral.api.service.OrganizationService;
import com.moral.api.service.ServicesScopeService;
import com.moral.constant.Constants;
@@ -109,4 +110,28 @@
return ResultMessage.ok();
}
+ @RequestMapping(value = "addBoundaryBindDevice",method = RequestMethod.POST)
+ @ResponseBody
+ public ResultMessage addBoundaryBindDevice(@RequestBody AddBoundaryBindDevice addBoundaryBindDevice){
+ if (ObjectUtils.isEmpty(addBoundaryBindDevice)){
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ }
+ QueryWrapper<ServicesScope> servicesScopeQueryWrapper = new QueryWrapper<>();
+ servicesScopeQueryWrapper.eq("id",addBoundaryBindDevice.getServicesScope().getId()).eq("is_delete",Constants.NOT_DELETE);
+ ServicesScope servicesScopeRes = servicesScopeService.getOne(servicesScopeQueryWrapper);
+ if (ObjectUtils.isEmpty(servicesScopeRes)){
+ return ResultMessage.fail(ResponseCodeEnum.SERVICES_SCOPE_IS_NOT_EXIST.getCode(), ResponseCodeEnum.SERVICES_SCOPE_IS_NOT_EXIST.getMsg());
+ }
+ /*if (!ObjectUtils.isEmpty(addBoundaryBindDevice.getServicesScope().getOrganizationId())){
+ QueryWrapper<Organization> organizationQueryWrapper = new QueryWrapper<>();
+ organizationQueryWrapper.eq("id",addBoundaryBindDevice.getServicesScope().getOrganizationId()).eq("is_delete",Constants.NOT_DELETE);
+ Organization organization = organizationService.getOne(organizationQueryWrapper);
+ if (ObjectUtils.isEmpty(organization)){
+ return ResultMessage.fail(ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getCode(), ResponseCodeEnum.ORGANIZATION_NOT_EXIST.getMsg());
+ }
+ }*/
+ servicesScopeService.addBoundaryBindDevice(addBoundaryBindDevice);
+ return ResultMessage.ok();
+ }
+
}
--
Gitblit v1.8.0