From c5a78ff231a82918f5e5097c5df0881adddf0cb6 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期四, 21 十二月 2023 14:10:13 +0800
Subject: [PATCH] 前后端对接，接口调整
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 44 +++++++++++++++++++++++++++++++-------------
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java | 2 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java | 2 +-
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java | 6 +++---
5 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
index b143bea..fd69d04 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
@@ -76,7 +76,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:device:exportExcel")
+ //@RequiresPermissions("business:device:exportExcel")
public void exportExcel (@RequestBody PageWrap<Device> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Device.class).export(deviceService.findPage(pageWrap).getRecords(), "璁惧淇℃伅琛�", response);
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
index 84a2e00..fe0f82e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
@@ -40,7 +40,7 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("business:devicerole:delete")
+ //@RequiresPermissions("business:devicerole:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
deviceRoleService.deleteById(id);
return ApiResponse.success(null);
@@ -48,7 +48,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @RequiresPermissions("business:devicerole:delete")
+ //@RequiresPermissions("business:devicerole:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -84,7 +84,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:devicerole:exportExcel")
+ //@RequiresPermissions("business:devicerole:exportExcel")
public void exportExcel (@RequestBody PageWrap<DeviceRole> pageWrap, HttpServletResponse response) {
ExcelExporter.build(DeviceRole.class).export(deviceRoleService.findPage(pageWrap).getRecords(), "闂ㄧ瑙掕壊淇℃伅琛�", response);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
index 8d31b83..dd2046a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
@@ -62,7 +62,7 @@
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
@ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
- private Integer type;
+ private String type;
@ApiModelProperty(value = "鍙娇鐢ㄩ棬绂佺紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
@ExcelColumn(name="鍙娇鐢ㄩ棬绂佺紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index b802f7d..e14ae63 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -56,8 +56,8 @@
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
- if(Constants.ONE == deviceRole.getStatus() && null != deviceRole.getType()) {
- newDeviceRole = getDeviceRole(deviceRole.getStatus(), deviceRole.getType());
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
if(null != newDeviceRole) {
@@ -66,8 +66,7 @@
updateDeviceRole.setId(newDeviceRole.getId());
updateDeviceRole.setEdirot(loginUserInfo.getId().toString());
updateDeviceRole.setEditDate(new Date());
- updateDeviceRole.setIsdeleted(Constants.ONE);
- updateDeviceRole.setStatus(Constants.ZERO);
+ updateDeviceRole.setIsDefault(Constants.ONE);
deviceRoleMapper.updateById(updateDeviceRole);
}
DeviceRole insert = new DeviceRole();
@@ -78,7 +77,7 @@
insert.setIsdeleted(Constants.ZERO);
insert.setRemark(deviceRole.getRemark());
insert.setName(deviceRole.getName());
- insert.setIsDefault(Constants.equalsInteger(Constants.ONE,deviceRole.getStatus()) ? 0 : 1);
+ insert.setIsDefault(deviceRole.getIsDefault());
insert.setType(deviceRole.getType());
insert.setDoorIds(deviceRole.getDoorIds());
insert.setDoorNames(deviceRole.getDoorNames());
@@ -114,7 +113,19 @@
@Override
public void updateById(DeviceRole deviceRole) {
- deviceRole.setIsDefault(Constants.equalsInteger(Constants.ONE,deviceRole.getStatus()) ? 0 : 1);
+ DeviceRole newDeviceRole = null;
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+ if(null != newDeviceRole) {
+ DeviceRole update = new DeviceRole();
+ update.setEdirot(loginUserInfo.getId().toString());
+ update.setEditDate(new Date());
+ update.setId(newDeviceRole.getId());
+ update.setIsDefault(Constants.ONE);
+ deviceRoleMapper.updateById(update);
+ }
deviceRoleMapper.updateById(deviceRole);
}
@@ -122,8 +133,8 @@
public void updateStatusById(DeviceRole deviceRole) {
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
- if(Constants.ONE == deviceRole.getStatus() && null != deviceRole.getType()) {
- newDeviceRole = getDeviceRole(deviceRole.getStatus(), deviceRole.getType());
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
List<DeviceRole> deviceRoleList = new ArrayList<>();
@@ -149,12 +160,11 @@
}
}
- private DeviceRole getDeviceRole(Integer status, Integer type) {
+ private DeviceRole getDeviceRole(String type) {
LambdaQueryWrapper<DeviceRole> query = new LambdaQueryWrapper<>();
query.eq(DeviceRole::getIsdeleted,Constants.ZERO)
.eq(DeviceRole::getIsDefault,Constants.ZERO)
- .eq(DeviceRole::getType,type)
- .eq(DeviceRole::getStatus,status);
+ .eq(DeviceRole::getType,type);
// 鏌ヨ鏄惁鏈夐粯璁ら棬绂佺粍锛屽彧鑳芥湁涓�缁勯粯璁ら棬绂佺粍
DeviceRole getDeviceRole = deviceRoleMapper.selectOne(query);
return getDeviceRole;
@@ -221,8 +231,16 @@
if (pageWrap.getModel().getIsDefault() != null) {
queryWrapper.lambda().eq(DeviceRole::getIsDefault, pageWrap.getModel().getIsDefault());
}
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(DeviceRole::getType, pageWrap.getModel().getType());
+ if (StringUtils.isNotBlank(pageWrap.getModel().getType())) {
+ if(pageWrap.getModel().getType().length() > 1) {
+ String[] types = pageWrap.getModel().getType().split(",");
+ queryWrapper.lambda()
+ .eq(DeviceRole::getType, types[0])
+ .or()
+ .eq(DeviceRole::getType, types[1]);
+ }else {
+ queryWrapper.lambda().eq(DeviceRole::getType, pageWrap.getModel().getType());
+ }
}
if (pageWrap.getModel().getDoorIds() != null) {
queryWrapper.lambda().eq(DeviceRole::getDoorIds, pageWrap.getModel().getDoorIds());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
index c8c8824..2459aa6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
@@ -143,7 +143,7 @@
model.setHkStatus(Constants.ONE);
model.setIsdeleted(Constants.ONE);
model.setIsDefault(device.getIsDefault());
- model.setType(Constants.ZERO);
+ model.setType(String.valueOf(Constants.ZERO));
return model;
}
--
Gitblit v1.9.3