更新！

FullCardClient/src/main/java/com/zhongshu/card/client/openApi/model/device/DeviceUseRecordOpenApiSearch.java

@@ -0,0 +1,61 @@
+package com.zhongshu.card.client.openApi.model.device;
+
+import com.github.microservice.types.deviceUse.DeviceType;
+import com.github.microservice.types.deviceUse.OperateState;
+import com.github.microservice.types.deviceUse.OperateType;
+import com.github.microservice.types.user.DevicePermissFromType;
+import com.github.microservice.types.user.UserFromType;
+import com.zhongshu.card.client.model.base.SuperSearch;
+import com.zhongshu.card.client.openApi.base.SuperOpenAPIParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 设备使用记录的搜索
+ *
+ * @author TRX
+ * @date 2024/10/21
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DeviceUseRecordOpenApiSearch extends SuperOpenAPIParam {
+
+    @Schema(description = "设备ID")
+    private String deviceId;
+
+    @Schema(description = "设备类型")
+    private DeviceType deviceType;
+
+    @Schema(description = "操作模式，卡片、人脸、密码、指纹...")
+    private OperateType operateType;
+
+    @Schema(description = "操作记录结果")
+    private OperateState operateState;
+
+    @Schema(description = "网关ID")
+    private String gateWayId;
+
+    @Schema(description = "设备所属机构oid")
+    private String beLongOid;
+
+    @Schema(description = "10进制卡序列号（实体卡号或虚拟卡号）")
+    private String cardNo;
+
+    @Schema(description = "用户userId")
+    private String userId;
+
+    @Schema(description = "权限来自哪里的配置")
+    private DevicePermissFromType permissFromType;
+
+    @Schema(description = "用户类型")
+    private UserFromType userFromType;
+
+    @Schema(description = "处理的service名称")
+    private String serviceBeanName;
+
+    @Schema(description = "关联的数据id")
+    private String aboutDataId;
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/device/DeviceUseApiController.java

@@ -0,0 +1,43 @@
+package com.zhongshu.card.server.core.controller.openAPI.device;
+
+import com.github.microservice.net.ResultContent;
+import com.github.microservice.staticVariable.OpenApiMark;
+import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.devices.DeviceUseRecordModel;
+import com.zhongshu.card.client.openApi.model.device.DeviceUseRecordOpenApiSearch;
+import com.zhongshu.card.server.core.service.openAPI.device.DeviceUseRecordOpenApiService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author TRX
+ * @date 2024/6/5
+ */
+@RestController
+@RequestMapping("/" + OpenApiMark.fullCardOpenAPI + "/v1/deviceUseRecord")
+@Tag(name = "openAPI-设备使用记录")
+public class DeviceUseApiController {
+
+    @Autowired
+    private DeviceUseRecordOpenApiService deviceUseRecordOpenApiService;
+
+    @Operation(summary = "设备使用记录-分页查询", description = "设备使用记录-分页查询")
+    @RequestMapping(value = {"page"}, method = {RequestMethod.POST})
+    public ResultContent<Page<DeviceUseRecordModel>> page(
+            @RequestBody DeviceUseRecordOpenApiSearch param) {
+        return deviceUseRecordOpenApiService.page(param);
+    }
+
+    @Operation(summary = "设使用详情--根据设备ID查询", description = "设使用详情-根据设备ID查询")
+    @RequestMapping(value = {"detailById"}, method = {RequestMethod.POST})
+    public ResultContent<DeviceUseRecordModel> detailById(@RequestBody IDParam param) {
+        return deviceUseRecordOpenApiService.detailById(param);
+    }
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/openAPI/visitor/VisitorOpenApiController.java

@@ -55,4 +55,11 @@ public class VisitorOpenApiController {
         return visitorOpenService.detailByBusId(param);
     }
 
+    @Operation(summary = "根据busId 删除访客信息", description = "根据busId 删除访客信息")
+    @RequestMapping(value = {"deleteByBusId"}, method = {RequestMethod.POST})
+    public ResultContent deleteByBusId(@RequestBody BusIdParam param) {
+        return visitorOpenService.deleteByBusId(param);
+    }
+    
+
 }

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

@@ -38,6 +38,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
+ * 设备使用记录
  * @author TRX
  * @date 2024/10/21
  */

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/device/DeviceUseRecordOpenApiService.java

@@ -0,0 +1,69 @@
+package com.zhongshu.card.server.core.service.openAPI.device;
+
+import com.github.microservice.components.data.base.util.PageEntityUtil;
+import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.client.model.base.IDParam;
+import com.zhongshu.card.client.model.devices.DeviceUseRecordModel;
+import com.zhongshu.card.client.model.devices.DeviceUseRecordSearch;
+import com.zhongshu.card.client.openApi.model.device.DeviceUseRecordOpenApiSearch;
+import com.zhongshu.card.server.core.dao.devices.DeviceUseRecordDao;
+import com.zhongshu.card.server.core.domain.devices.DeviceUseRecords;
+import com.zhongshu.card.server.core.service.base.CommonService;
+import com.zhongshu.card.server.core.service.devices.DeviceUseRecordService;
+import com.zhongshu.card.server.core.util.BeanUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+/**
+ * 设备使用记录的 openAPI
+ * @author TRX
+ * @date 2025/3/10
+ */
+@Slf4j
+@Service
+public class DeviceUseRecordOpenApiService {
+
+    @Autowired
+    private DeviceUseRecordDao deviceUseRecordDao;
+
+    @Autowired
+    private DeviceUseRecordService deviceUseRecordService;
+
+    @Autowired
+    private CommonService commonService;
+
+    /**
+     * 设备使用记录分页
+     * @param param
+     * @return
+     */
+    public ResultContent<Page<DeviceUseRecordModel>> page(DeviceUseRecordOpenApiSearch param) {
+        ResultContent<String> resultContent = commonService.checkProjectCanUserByCode(param.getProjectCode());
+        if (resultContent.isFailed()) {
+            return ResultContent.buildFail(resultContent.getMsg());
+        }
+        String projectOid = resultContent.getContent();
+        DeviceUseRecordSearch search = new DeviceUseRecordSearch();
+        BeanUtils.copyProperties(param, search);
+        search.setProjectOid(projectOid);
+
+        Pageable pageable = PageRequest.of(param.getNumber(), param.getSize());
+        Page<DeviceUseRecords> page = deviceUseRecordDao.page(pageable, search);
+
+        return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, deviceUseRecordService::toModel));
+    }
+
+    public ResultContent<DeviceUseRecordModel> detailById(IDParam param) {
+        DeviceUseRecords entity = deviceUseRecordDao.findTopById(param.getId());
+        if (ObjectUtils.isEmpty(entity)) {
+            return ResultContent.buildFail(String.format("数据不存在"));
+        }
+        return ResultContent.buildSuccess(deviceUseRecordService.toModel(entity));
+    }
+
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/openAPI/visitor/VisitorOpenService.java

@@ -137,4 +137,12 @@ public class VisitorOpenService {
         return ResultContent.buildSuccess(model);
     }
 
+    public ResultContent deleteByBusId(BusIdParam param) {
+        VisitorMain entity = visitorMainDao.findTopByBusId(param.getBusId());
+        if (entity == null) {
+            return ResultContent.buildFail("数据不存在");
+        }
+        return visitorMainService.deleteInfo(entity.getId());
+    }
+
 }