TRX 1 год назад
Родитель
Сommit
3a699ba2a3

+ 7 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/ProjectOpenAPIController.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.controller.openAPI;
 package com.zhongshu.card.server.core.controller.openAPI;
 
 
 import com.github.microservice.models.device.DevicePerQuery;
 import com.github.microservice.models.device.DevicePerQuery;
+import com.github.microservice.models.device.UserPerQuery;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.project.ProjectSaveParam;
 import com.zhongshu.card.client.model.project.ProjectSaveParam;
 import com.zhongshu.card.client.model.school.BookInfoAddParam;
 import com.zhongshu.card.client.model.school.BookInfoAddParam;
@@ -41,4 +42,10 @@ public class ProjectOpenAPIController {
         return devicePermissIotService.getDeviceAboutUserInfos(param);
         return devicePermissIotService.getDeviceAboutUserInfos(param);
     }
     }
 
 
+    @Operation(summary = "查询设备对应的用户信息", description = "查询设备对应的用户信息")
+    @RequestMapping(value = "queryProjectUsersInfo", method = {RequestMethod.POST})
+    public ResultContent queryProjectUsersInfo(@RequestBody @Valid UserPerQuery param) {
+        return devicePermissIotService.getDeviceAboutUserInfos(param);
+    }
+
 }
 }

+ 22 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DevicePermissIotService.java

@@ -5,6 +5,7 @@ import cn.hutool.json.JSONUtil;
 import com.github.microservice.core.util.os.SystemUtil;
 import com.github.microservice.core.util.os.SystemUtil;
 import com.github.microservice.dataConfig.IotIdentifierConfig;
 import com.github.microservice.dataConfig.IotIdentifierConfig;
 import com.github.microservice.models.device.DevicePerQuery;
 import com.github.microservice.models.device.DevicePerQuery;
+import com.github.microservice.models.device.UserPerQuery;
 import com.github.microservice.models.devicePermiss.*;
 import com.github.microservice.models.devicePermiss.*;
 import com.github.microservice.models.iot.IotSendParam;
 import com.github.microservice.models.iot.IotSendParam;
 import com.github.microservice.net.ResultContent;
 import com.github.microservice.net.ResultContent;
@@ -17,6 +18,7 @@ import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.org.OrganizationUserDao;
 import com.zhongshu.card.server.core.dao.org.OrganizationUserDao;
 import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
 import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
+import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.projectAbout.OrgUserFace;
 import com.zhongshu.card.server.core.domain.projectAbout.OrgUserFace;
 import com.zhongshu.card.server.core.event.DevicePermissChangeEvent;
 import com.zhongshu.card.server.core.event.DevicePermissChangeEvent;
@@ -27,6 +29,8 @@ import com.zhongshu.card.server.core.service.user.UserAccountServiceImpl;
 import lombok.SneakyThrows;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.kafka.common.protocol.types.Field;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.event.EventListener;
 import org.springframework.context.event.EventListener;
@@ -111,6 +115,24 @@ public class DevicePermissIotService {
         return ResultContent.buildSuccess(JSONUtil.toJsonStr(permissModel));
         return ResultContent.buildSuccess(JSONUtil.toJsonStr(permissModel));
     }
     }
 
 
+    public ResultContent getDeviceAboutUserInfos(UserPerQuery query) {
+        DeviceUsersInfo permissModel = new DeviceUsersInfo();
+        String projectOid = "";
+        String projectCode = query.getProjectCode();
+        if (StringUtils.isNotEmpty(projectCode)) {
+            Organization organization = organizationDao.findTopByCode(projectCode);
+            if (ObjectUtils.isNotEmpty(organization)) {
+                projectOid = organization.getOid();
+            }
+        }
+        if (StringUtils.isNotEmpty(projectOid) && ObjectUtils.isNotEmpty(query.getUserIds())) {
+            permissModel.setUsers(devicePermissService.getUserPermiss(projectOid, query.getUserIds()));
+        }
+        permissModel.setSuccess();
+        permissModel.setGateWayId(query.getGateWayId());
+        return ResultContent.buildSuccess(JSONUtil.toJsonStr(permissModel));
+    }
+
     @EventListener(classes = DevicePermissChangeEvent.class)
     @EventListener(classes = DevicePermissChangeEvent.class)
     @SneakyThrows
     @SneakyThrows
     public void devicePermissChange(DevicePermissChangeEvent event) {
     public void devicePermissChange(DevicePermissChangeEvent event) {