更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DevicePermissSearch.java

@@ -22,6 +22,8 @@ public class DevicePermissSearch extends SuperSearch {
 
     //------------------设备冗余数据 start-------------------
 
+    private String deviceId;
+
     @Schema(description = "")
     private String deviceKeyWord;
 

FullCardClient/src/main/java/com/zhongshu/card/client/type/DataOperationType.java

@@ -0,0 +1,20 @@
+package com.zhongshu.card.client.type;
+
+import lombok.Getter;
+
+/**
+ *
+ */
+public enum DataOperationType {
+    Add("添加"),
+    Update("修改"),
+    Delete("删除"),
+    ;
+
+    @Getter
+    private String remark;
+
+    DataOperationType(String remark) {
+        this.remark = remark;
+    }
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/DevicePermissController.java

@@ -4,6 +4,7 @@ import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.base.IDsParam;
 import com.zhongshu.card.client.model.devices.*;
 import com.zhongshu.card.client.service.school.DeviceInfoService;
 import com.zhongshu.card.server.core.service.devices.DevicePermissService;
@@ -31,9 +32,6 @@ import java.util.List;
 @Tag(name = "项目-用户设备权限")
 public class DevicePermissController {
 
-    @Autowired
-    private DeviceInfoService deviceInfoService;
-
     @Autowired
     private DevicePermissService devicePermissService;
 
@@ -44,52 +42,36 @@ public class DevicePermissController {
         return this.devicePermissService.saveBindInfo(param);
     }
 
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "根据设备ID 设备详情（精确匹配）", description = "根据设备ID 设备详情（精确匹配）")
-    @RequestMapping(value = "getDeviceByDeviceId", method = {RequestMethod.GET})
-    public ResultContent<DeviceInfoMoreModel> getDeviceByDeviceId(@RequestParam(name = "deviceId") String deviceId) {
-        return this.deviceInfoService.getDeviceDetailByDeviceId(deviceId);
-    }
-
-    @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "根据设备ID 设备列表（模糊匹配）", description = "根据设备ID 设备列表（模糊匹配）")
-    @RequestMapping(value = "getDeviceDetailByDeviceIdLike", method = {RequestMethod.GET})
-    public ResultContent<List<DeviceInfoMoreModel>> getDeviceDetailByDeviceIdLike(@RequestParam(name = "deviceId") String deviceId) {
-        return this.deviceInfoService.getDeviceDetailByDeviceIdLike(deviceId);
-    }
-
     @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "添加-编辑设备", description = "添加-编辑设备")
-    @RequestMapping(value = "addDeviceInfo", method = {RequestMethod.POST})
-    public ResultContent addDeviceInfo(@RequestBody DeviceInfoParam param) {
-        return this.deviceInfoService.addDeviceInfo(param);
+    @Operation(summary = "列表-分页查询", description = "列表-分页查询")
+    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
+    public ResultContent<Page<DevicePermissModel>> page(
+            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
+            @Parameter(required = false) DevicePermissSearch param) {
+        Assert.hasText(param.getProjectOid(), "projectOid不能为空");
+        return devicePermissService.page(param, pageable);
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "删除设备", description = "删除设备")
-    @RequestMapping(value = "deleteDeviceInfo", method = {RequestMethod.POST})
-    public ResultContent deleteDeviceInfo(@RequestBody IDParam param) {
-        return this.deviceInfoService.deleteDeviceInfo(param.getId());
+    @Operation(summary = "查询详情", description = "查询详情")
+    @RequestMapping(value = "getDetail", method = {RequestMethod.POST})
+    public ResultContent<DevicePermissModel> getDetail(
+            @RequestBody IDParam param) {
+        return this.devicePermissService.getDetail(param.getId());
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "设备列表-分页查询", description = "设备列表-分页查询")
-    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
-    public ResultContent<Page<DeviceInfoModel>> page(
-            @Parameter(hidden = true) @PageableDefault(page = 0, size = 10) Pageable pageable,
-            @Parameter(required = false) DeviceInfoSearch param) {
-        Assert.hasText(param.getProjectOid(), "projectOid不能为空");
-        return deviceInfoService.page(param, pageable);
+    @Operation(summary = "删除设备权限", description = "删除设备权限")
+    @RequestMapping(value = "deleteInfo", method = {RequestMethod.POST})
+    public ResultContent deleteInfo(@RequestBody IDParam param) {
+        return this.devicePermissService.deleteInfo(param.getId());
     }
 
     @ResourceAuth(value = "user", type = AuthType.User)
-    @Operation(summary = "修改设备信息", description = "修改设备信息")
-    @RequestMapping(value = "updateDevice", method = {RequestMethod.POST})
-    public ResultContent updateDevice(@RequestBody @Valid DeviceBindAreaParam param) {
-        return this.deviceInfoService.updateDevice(param);
+    @Operation(summary = "删除设备权限(多个)", description = "删除设备权限（多个）")
+    @RequestMapping(value = "deleteByIds", method = {RequestMethod.POST})
+    public ResultContent deleteByIds(@RequestBody IDsParam param) {
+        return this.devicePermissService.deleteByIds(param);
     }
 
-    //----------------------------设备基础信息 end--------------------------
-
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/OrganizationUserController.java

@@ -4,6 +4,7 @@ import com.github.microservice.auth.client.constant.AuthConstant;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.base.IDParam;
 import com.zhongshu.card.client.model.base.OidModel;
 import com.zhongshu.card.client.model.base.ProjectOidParam;
 import com.zhongshu.card.client.model.org.*;
@@ -101,6 +102,13 @@ public class OrganizationUserController {
         return userAccountService.getOrgUserDetail(param);
     }
 
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @Operation(summary = "删除机构用户", description = "删除机构用户")
+    @RequestMapping(value = {"deleteOrgUser"}, method = {RequestMethod.POST})
+    public ResultContent deleteOrgUser(@RequestBody IDParam param) {
+        return organizationUserService.deleteOrgUser(param.getId());
+    }
+
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "importProjectUsers", consumes = MediaType.MULTIPART_FORM_DATA_VALUE, method = RequestMethod.POST)
     @Operation(summary = "导入项目用户", description = "导入项目用户")

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/DevicePermissDao.java

@@ -5,6 +5,9 @@ import com.zhongshu.card.server.core.dao.devices.extend.DeviceBindDaoExtend;
 import com.zhongshu.card.server.core.dao.devices.extend.DevicePermissDaoExtend;
 import com.zhongshu.card.server.core.domain.devices.DeviceBind;
 import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
+import com.zhongshu.card.server.core.domain.org.OrganizationUser;
+
+import java.util.List;
 
 /**
  * 设备Dao
@@ -16,4 +19,9 @@ public interface DevicePermissDao extends MongoDao<DevicePermiss>, DevicePermiss
 
     DevicePermiss findTopById(String id);
 
+    List<DevicePermiss> findByDeviceIdAndProjectOid(String deviceId, String projectOid);
+
+    DevicePermiss findTopByDeviceIdAndOrganizationUser(String deviceId, OrganizationUser organizationUser);
+
+    List<DevicePermiss> findByOrganizationUserIn(List<OrganizationUser> organizationUsers);
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/devices/impl/DevicePermissDaoImpl.java

@@ -90,7 +90,7 @@ public class DevicePermissDaoImpl extends BaseImpl implements DevicePermissDaoEx
         }
 
         // 搜索项目的用户
-        if (StringUtils.isNotEmpty(param.getPositionId())) {
+        if (StringUtils.isNotEmpty(param.getProjectOid())) {
             criteria.and("projectOid").is(param.getProjectOid());
         }
 
@@ -102,6 +102,11 @@ public class DevicePermissDaoImpl extends BaseImpl implements DevicePermissDaoEx
             criteria.and("deviceType").is(param.getDeviceType());
         }
 
+        // 设备ID
+        if (StringUtils.isNotEmpty(param.getDeviceId())) {
+            criteria.and("deviceId").is(param.getDeviceId());
+        }
+
         // 模糊搜索
         List<Criteria> criterias = new ArrayList<>();
 //        // 用户名称

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/OrganizationUserDao.java

@@ -16,6 +16,8 @@ import java.util.List;
  */
 public interface OrganizationUserDao extends MongoDao<OrganizationUser>, OrganizationUserDaoExtend {
 
+    List<OrganizationUser> findByIdIn(List<String> ids);
+
     OrganizationUser findTopById(String id);
 
     List<OrganizationUser> findByOrganizationAndIsAdmin(Organization organization, Boolean isAdmin);

FullCardServer/src/main/java/com/zhongshu/card/server/core/event/OrgUserBindUpdateSyncEvent.java

@@ -0,0 +1,29 @@
+package com.zhongshu.card.server.core.event;
+
+import com.zhongshu.card.client.type.DataOperationType;
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 机构绑定用户的信息发送改变
+ *
+ * @author TRX
+ * @date 2024/6/26
+ */
+public class OrgUserBindUpdateSyncEvent extends ApplicationEvent {
+
+    @Getter
+    private List<String> organizationUserIds;
+
+    @Getter
+    private DataOperationType dataOperationType;
+
+    public OrgUserBindUpdateSyncEvent(Object source, List<String> organizationUserIds, DataOperationType dataOperationType) {
+        super(source);
+        this.organizationUserIds = organizationUserIds;
+        this.dataOperationType = dataOperationType;
+    }
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DevicePermissService.java

@@ -1,21 +1,41 @@
 package com.zhongshu.card.server.core.service.devices;
 
+import com.github.microservice.components.data.base.util.PageEntityUtil;
 import com.github.microservice.net.ResultContent;
-import com.zhongshu.card.client.model.devices.DevicePermissModel;
-import com.zhongshu.card.client.model.devices.DevicePermissParam;
+import com.github.microservice.net.ResultMessage;
+import com.zhongshu.card.client.model.base.IDsParam;
+import com.zhongshu.card.client.model.devices.*;
 import com.zhongshu.card.client.model.org.OrganizationUserModel;
+import com.zhongshu.card.client.type.DataOperationType;
 import com.zhongshu.card.server.core.dao.devices.DeviceInfoDao;
 import com.zhongshu.card.server.core.dao.devices.DevicePermissDao;
+import com.zhongshu.card.server.core.dao.org.OrganizationDao;
+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.DevicePermiss;
+import com.zhongshu.card.server.core.domain.org.Organization;
+import com.zhongshu.card.server.core.domain.org.OrganizationUser;
+import com.zhongshu.card.server.core.domain.org.UserAccount;
+import com.zhongshu.card.server.core.event.OrgUserBindUpdateSyncEvent;
+import com.zhongshu.card.server.core.event.ProjectSyncEvent;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.user.UserAccountServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;
+import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.event.EventListener;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.security.core.userdetails.User;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 设备权限 （绑定用户）管理
  *
@@ -38,9 +58,146 @@ public class DevicePermissService extends SuperService {
     @Autowired
     private DeviceInfoDao deviceInfoDao;
 
+    @Autowired
+    private OrganizationDao organizationDao;
+
+    @Autowired
+    private OrganizationUserDao organizationUserDao;
+
+    /**
+     * 设备绑定用户
+     *
+     * @param param
+     * @return
+     */
     public ResultContent saveBindInfo(DevicePermissParam param) {
+        String projectOid = param.getProjectOid();
+        if (ObjectUtils.isEmpty(projectOid)) {
+            return ResultContent.buildFail(String.format("projectOid不能为空"));
+        }
+
+        String deviceId = param.getDeviceId();
+        DeviceInfo deviceInfo = deviceInfoDao.findTopByDeviceId(deviceId);
+        if (ObjectUtils.isEmpty(deviceInfo)) {
+            return ResultContent.buildFail(String.format("设备信息不存在：%s", deviceId));
+        }
+        List<String> ids = param.getIds();
+        if (ObjectUtils.isEmpty(ids)) {
+            return ResultContent.buildFail("ids is null");
+        }
+
+        if (ObjectUtils.isNotEmpty(ids)) {
+            List<OrganizationUser> list = organizationUserDao.findByIdIn(ids);
+            if (ObjectUtils.isNotEmpty(list)) {
+                List<DevicePermiss> permisses = new ArrayList<DevicePermiss>();
+                for (OrganizationUser organizationUser : list) {
+                    DevicePermiss permiss = devicePermissDao.findTopByDeviceIdAndOrganizationUser(deviceId, organizationUser);
+                    if (ObjectUtils.isEmpty(permiss)) {
+                        permiss = new DevicePermiss();
+                        initEntity(permiss);
+                    } else {
+                        initUpdateEntity(permiss);
+                    }
+                    buildDeviceInfo(permiss, deviceInfo);
+                    buildOrgUserInfo(permiss, organizationUser);
+                    permisses.add(permiss);
+                }
+                devicePermissDao.saveAll(permisses);
+            }
+        }
+        return ResultContent.buildSuccess();
+    }
+
+    private void buildDeviceInfo(DevicePermiss permiss, DeviceInfo deviceInfo) {
+        if (ObjectUtils.isNotEmpty(deviceInfo)) {
+            permiss.setDeviceInfo(deviceInfo);
+            permiss.setDeviceId(deviceInfo.getDeviceId());
+            permiss.setDeviceName(deviceInfo.getDeviceName());
+            permiss.setDeviceType(deviceInfo.getDeviceType());
+            permiss.setArea(deviceInfo.getArea());
+            permiss.setAreaPaths(deviceInfo.getAreaPaths());
+        }
+    }
 
+    private void buildOrgUserInfo(DevicePermiss permiss, OrganizationUser organizationUser) {
+        if (ObjectUtils.isNotEmpty(organizationUser)) {
+            UserAccount userAccount = organizationUser.getUser();
+            permiss.setOrganizationUser(organizationUser);
+            permiss.setUserAccount(userAccount);
+            permiss.setUserId(userAccount.getUserId());
+            permiss.setName(userAccount.getName());
+            permiss.setDepartment(organizationUser.getDepartment());
+            permiss.setRoles(organizationUser.getRoles());
+            permiss.setPosition(organizationUser.getPosition());
+            permiss.setState(organizationUser.getState());
+            permiss.setUserOid(organizationUser.getOid());
+            permiss.setCode(organizationUser.getCode());
+            permiss.setAuthType(organizationUser.getAuthType());
+        }
+    }
+
+    @EventListener(classes = OrgUserBindUpdateSyncEvent.class)
+    @Async
+    @SneakyThrows
+    public void syncOrgUserChangeInfo(OrgUserBindUpdateSyncEvent event) {
+        log.info("机构用户信息发生变化 syncOrgUserChangeInfo...");
+        DataOperationType dataOperationType = event.getDataOperationType();
+        List<String> organizationUserIds = event.getOrganizationUserIds();
+        if (dataOperationType != null) {
+            List<OrganizationUser> organizationUsers = organizationUserDao.findByIdIn(organizationUserIds);
+            if (ObjectUtils.isNotEmpty(organizationUsers)) {
+                List<DevicePermiss> list = devicePermissDao.findByOrganizationUserIn(organizationUsers);
+                if (dataOperationType == DataOperationType.Update) {
+                    for (DevicePermiss permiss : list) {
+                        buildOrgUserInfo(permiss, permiss.getOrganizationUser());
+                    }
+                    devicePermissDao.saveAll(list);
+                } else if (dataOperationType == DataOperationType.Delete) {
+                    devicePermissDao.deleteAll(list);
+                }
+            }
+        }
+    }
+    
+
+    /**
+     * 分页数据
+     *
+     * @param param
+     * @param pageable
+     * @return
+     */
+    public ResultContent<Page<DevicePermissModel>> page(DevicePermissSearch param, Pageable pageable) {
+        String projectOid = param.getProjectOid();
+        Organization organization = organizationDao.findTopByOid(projectOid);
+        if (ObjectUtils.isEmpty(organization)) {
+            return ResultContent.buildFail("projectOid不存在");
+        }
+        Page<DevicePermiss> page = devicePermissDao.page(pageable, param);
+        return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
+    }
 
+    public ResultContent<DevicePermissModel> getDetail(String id) {
+        DevicePermiss entity = devicePermissDao.findTopById(id);
+        if (ObjectUtils.isEmpty(entity)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
+        }
+        return ResultContent.buildSuccess(toModel(entity));
+    }
+
+    public ResultContent deleteInfo(String id) {
+        DevicePermiss entity = devicePermissDao.findTopById(id);
+        if (ObjectUtils.isEmpty(entity)) {
+            return ResultContent.buildFail(String.format(ResultMessage.DATA_NOT_EXIST, id));
+        }
+        devicePermissDao.delete(entity);
+        return ResultContent.buildSuccess();
+    }
+
+    public ResultContent deleteByIds(IDsParam param) {
+        if (ObjectUtils.isNotEmpty(param.getIds())) {
+            devicePermissDao.deleteAllById(param.getIds());
+        }
         return ResultContent.buildSuccess();
     }
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/OrganizationUserServiceImpl.java

@@ -14,6 +14,7 @@ import com.zhongshu.card.client.model.orgModel.OrgBindUserAllParam;
 import com.zhongshu.card.client.model.school.ExcelUserParam;
 import com.zhongshu.card.client.model.school.ImportResultModel;
 import com.zhongshu.card.client.model.school.RegisterBindSchoolParam;
+import com.zhongshu.card.client.type.DataOperationType;
 import com.zhongshu.card.client.type.OrganizationUserType;
 import com.zhongshu.card.client.type.UserState;
 import com.zhongshu.card.server.core.dao.org.*;
@@ -21,6 +22,7 @@ import com.zhongshu.card.server.core.dao.school.DictInfoDao;
 import com.zhongshu.card.server.core.dataConfig.CardSystemDefault;
 import com.zhongshu.card.server.core.domain.org.*;
 import com.zhongshu.card.server.core.domain.school.DictInfo;
+import com.zhongshu.card.server.core.event.OrgUserBindUpdateSyncEvent;
 import com.zhongshu.card.server.core.model.org.OrgBindUserParam;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.orgManager.OrganizationManagerServiceImpl;
@@ -38,6 +40,7 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -95,6 +98,9 @@ public class OrganizationUserServiceImpl extends SuperService {
     @Autowired
     UserAccountServiceImpl userAccountService;
 
+    @Autowired
+    ApplicationContext applicationContext;
+
     /**
      * 添加编辑用户 添加机构用户 (包括角色 部门 职位等信息)
      * 用户可能不存在
@@ -190,6 +196,7 @@ public class OrganizationUserServiceImpl extends SuperService {
             return ResultContent.buildFail(String.format("用户信息不存在：%s", param.getUserId()));
         }
 
+        boolean isUpdate = false;
         Organization organization = organizationDao.findTopByOid(param.getOrgOid());
         if (ObjectUtils.isEmpty(organization)) {
             return ResultContent.buildFail(String.format("机构信息不存在：%s", param.getOrgOid()));
@@ -227,6 +234,7 @@ public class OrganizationUserServiceImpl extends SuperService {
             if (ObjectUtils.isNotEmpty(codeTemp) && !codeTemp.getId().equals(organizationUser.getId())) {
                 return ResultContent.buildFail(String.format("code已存在：%s", param.getCode()));
             }
+            isUpdate = true;
             // 编辑
             BeanUtils.copyProperties(param, organizationUser, "id");
 
@@ -286,6 +294,11 @@ public class OrganizationUserServiceImpl extends SuperService {
         organizationUser.setCardNumber(userAccount.getCardNumber());
         organizationUserDao.save(organizationUser);
 
+        if (isUpdate) {
+            OrgUserBindUpdateSyncEvent event = new OrgUserBindUpdateSyncEvent(
+                    this, List.of(organizationUser.getId()), DataOperationType.Update);
+            applicationContext.publishEvent(event);
+        }
         // 权限中心 绑定用户
         com.github.microservice.auth.client.content.ResultContent<Void> resultContent = organizationUserService.update(organization.getOid(), new String[]{userId});
         if (resultContent.getState() == ResultState.Success) {
@@ -434,6 +447,23 @@ public class OrganizationUserServiceImpl extends SuperService {
         return ResultContent.buildSuccess();
     }
 
+    /**
+     * 删除机构用户
+     *
+     * @param id
+     * @return
+     */
+    public ResultContent deleteOrgUser(String id) {
+        OrganizationUser organizationUser = organizationUserDao.findTopById(id);
+        if (ObjectUtils.isNotEmpty(organizationUser)) {
+            organizationUserDao.delete(organizationUser);
+            OrgUserBindUpdateSyncEvent event = new OrgUserBindUpdateSyncEvent(
+                    this, List.of(id), DataOperationType.Delete);
+            applicationContext.publishEvent(event);
+        }
+        return ResultContent.buildSuccess();
+    }
+
     /**
      * 导入 学校用户excel
      *

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/RequestInfoService.java

@@ -1,6 +1,6 @@
 package com.zhongshu.card.server.core.service.payment;
 
-import com.github.microservice.models.hxz.base.HxzBaseResult;
+import com.github.microservice.models.hxz.base.IotBaseResult;
 import com.github.microservice.net.ResultContent;
 import com.zhongshu.card.client.model.payment.RequestInfoSaveParam;
 import com.zhongshu.card.client.type.payment.RequestType;
@@ -71,7 +71,7 @@ public class RequestInfoService {
      * @param response
      * @return
      */
-    public boolean addRequestInfo(Object param, HxzBaseResult response) {
+    public boolean addRequestInfo(Object param, IotBaseResult response) {
         CompletableFuture.runAsync(() -> {
             RequestInfo requestInfo = new RequestInfo();
             requestInfo.setParam(param);
@@ -86,7 +86,7 @@ public class RequestInfoService {
         return true;
     }
 
-    public boolean addRequestInfo(Object param, HxzBaseResult response, RequestType requestType) {
+    public boolean addRequestInfo(Object param, IotBaseResult response, RequestType requestType) {
         CompletableFuture.runAsync(() -> {
             RequestInfo requestInfo = new RequestInfo();
             requestInfo.setParam(param);