fix:设备数据接口、使用记录接口调整

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceInfomationController.java

@@ -16,6 +16,7 @@ import com.zt.plat.framework.excel.core.util.ExcelUtils;
 import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationPageReqVO;
 import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationRespVO;
 import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationSaveReqVO;
+import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationWithProductVO;
 import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfomationDO;
 import com.zt.plat.module.qms.resource.device.service.DeviceInfomationService;
 import com.zt.plat.module.qms.resource.device.service.DeviceProductService;
@@ -119,16 +120,15 @@ public class DeviceInfomationController extends AbstractFileUploadController imp
     @GetMapping("/get")
     @Operation(summary = "获得设备-设备信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-//    @PreAuthorize("@ss.hasPermission('resource:device-infomation:query')")
+    public CommonResult<DeviceInfomationWithProductVO> getDeviceInfomation(@RequestParam("id") Long id) {
-    public CommonResult<DeviceInfomationRespVO> getDeviceInfomation(@RequestParam("id") Long id) {
+        DeviceInfomationWithProductVO deviceInfomation = deviceInfomationService.getDeviceWithProduct(id);
-        DeviceInfomationDO deviceInfomation = deviceInfomationService.getDeviceInfomation(id);
+        return success(deviceInfomation);
-        return success(BeanUtils.toBean(deviceInfomation, DeviceInfomationRespVO.class));
     }
 
+
     @GetMapping("/page")
     @Operation(summary = "获得设备-设备信息分页")
-//    @PreAuthorize("@ss.hasPermission('resource:device-infomation:query')")
+    public CommonResult<PageResult<DeviceInfomationWithProductVO>> getDeviceInfomationPage(@Valid DeviceInfomationPageReqVO pageReqVO) {
-    public CommonResult<PageResult<DeviceInfomationRespVO>> getDeviceInfomationPage(@Valid DeviceInfomationPageReqVO pageReqVO) {
         Long productId = pageReqVO.getProductId();
         if(productId != null){
             List<Long> productIds = deviceProductService.getIdListByIdPath(productId);
@@ -142,8 +142,8 @@ public class DeviceInfomationController extends AbstractFileUploadController imp
             deviceStatus = "{\"Enable\":\"1\"}";
         if(!ObjectUtils.isEmpty(deviceStatus))
             pageReqVO.setDeviceStatusJson(JSON.parseObject(deviceStatus));
-        PageResult<DeviceInfomationDO> pageResult = deviceInfomationService.getDeviceInfomationPage(pageReqVO);
+        PageResult<DeviceInfomationWithProductVO> pageResult = deviceInfomationService.getDeviceInfomationPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, DeviceInfomationRespVO.class));
+        return success(pageResult);
     }
 
     @GetMapping("/export-excel")
@@ -153,7 +153,7 @@ public class DeviceInfomationController extends AbstractFileUploadController imp
     public void exportDeviceInfomationExcel(@Valid DeviceInfomationPageReqVO pageReqVO,
               HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<DeviceInfomationDO> list = deviceInfomationService.getDeviceInfomationPage(pageReqVO).getList();
+        List<DeviceInfomationWithProductVO> list = deviceInfomationService.getDeviceInfomationPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "设备-设备信息.xls", "数据", DeviceInfomationRespVO.class,
                         BeanUtils.toBean(list, DeviceInfomationRespVO.class));

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/admin/DeviceUseRecordController.java

@@ -63,8 +63,8 @@ public class DeviceUseRecordController extends AbstractFileUploadController impl
 
     @GetMapping("/queryPageListWithCount")
     @Operation(summary = "使用记录分页列表查询（以设备为主数据）")
-    public CommonResult<PageResult<DeviceUseRecordVO>> queryPageListWithCount(@Valid DeviceUseRecordPageReqVO pageReqVO) {
+    public CommonResult<PageResult<DeviceInfomationWithProductVO>> queryPageListWithCount(@Valid DeviceUseRecordPageReqVO pageReqVO) {
-        PageResult<DeviceUseRecordVO> pageResult = deviceUseRecordService.queryPageListWithCount(pageReqVO);
+        PageResult<DeviceInfomationWithProductVO> pageResult = deviceUseRecordService.queryPageListWithCount(pageReqVO);
         return success(pageResult);
     }
 
@@ -98,7 +98,7 @@ public class DeviceUseRecordController extends AbstractFileUploadController impl
 
     @PutMapping("/update")
     @Operation(summary = "更新设备-使用记录")
-    @PreAuthorize("@ss.hasPermission('qms:device-use-record:update')")
+//    @PreAuthorize("@ss.hasPermission('qms:device-use-record:update')")
     public CommonResult<Boolean> updateDeviceUseRecord(@Valid @RequestBody DeviceUseRecordSaveReqVO reqVO) {
         Long deviceId = reqVO.getDeviceId();
         if(deviceId == null)
@@ -110,7 +110,7 @@ public class DeviceUseRecordController extends AbstractFileUploadController impl
     @DeleteMapping("/delete")
     @Operation(summary = "删除设备-使用记录")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('qms:device-use-record:delete')")
+//    @PreAuthorize("@ss.hasPermission('qms:device-use-record:delete')")
     public CommonResult<Boolean> deleteDeviceUseRecord(@RequestParam("id") Long id) {
         deviceUseRecordService.deleteDeviceUseRecord(id);
         return success(true);
@@ -128,7 +128,7 @@ public class DeviceUseRecordController extends AbstractFileUploadController impl
     @GetMapping("/get")
     @Operation(summary = "获得设备-使用记录")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('qms:device-use-record:query')")
+//    @PreAuthorize("@ss.hasPermission('qms:device-use-record:query')")
     public CommonResult<DeviceUseRecordRespVO> getDeviceUseRecord(@RequestParam("id") Long id) {
         DeviceUseRecordDO deviceUseRecord = deviceUseRecordService.getDeviceUseRecord(id);
         return success(BeanUtils.toBean(deviceUseRecord, DeviceUseRecordRespVO.class));

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationPageReqVO.java

@@ -16,6 +16,9 @@ import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 @Data
 public class DeviceInfomationPageReqVO extends PageParam {
 
+    @Schema(description = "id", example = "32101")
+    private Long id;
+
     @Schema(description = "设备大类id", example = "32101")
     private Long productId;
 

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationUseRecordVO.java

@@ -0,0 +1,25 @@
+package com.zt.plat.module.qms.resource.device.controller.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+/*
+* 设备含使用记录数
+* */
+@Data
+public class DeviceInfomationUseRecordVO extends DeviceInfomationWithProductVO {
+
+    //============使用记录数============
+    @Schema(description = "未提交数据量")
+    private Integer runningCount;
+
+    @Schema(description = "已提交数据量")
+    private Integer finishedCount;
+
+
+    //============查询字段============
+    @Schema(description = "截止时间不为空")
+    private String useTimeEndFlag;
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceInfomationWithProductVO.java

@@ -0,0 +1,48 @@
+package com.zt.plat.module.qms.resource.device.controller.vo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/*
+* 设备与大类实体
+*
+* */
+@Data
+public class DeviceInfomationWithProductVO extends DeviceInfomationRespVO{
+
+    //=========设备字段============
+
+    private Long companyId;
+    private String companyName;
+
+    private Long deptId;
+
+    @Schema(description = "所属部门名称")
+    private String deptName;
+
+    private Long postId;
+    private Long tenantId;
+
+    private String updaterName;
+    private String creatorName;
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
+    private String creator;
+    private String updater;
+
+    //============大类字段============
+
+    @Schema(description = "规格")
+    private String specification;
+
+    @Schema(description = "型号")
+    private String modelNo;
+
+    @Schema(description = "制造商")
+    private String  manufacturer;
+
+
+}

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/controller/vo/DeviceUseRecordSaveReqVO.java

@@ -1,5 +1,6 @@
 package com.zt.plat.module.qms.resource.device.controller.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -24,9 +25,11 @@ public class DeviceUseRecordSaveReqVO {
     private Long userId;
 
     @Schema(description = "开始使用时间")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime useTimeStart;
 
     @Schema(description = "结束使用时间")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime useTimeEnd;
 
     @Schema(description = "使用记录")

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceInfomationMapper.java

@@ -7,6 +7,7 @@ import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.module.qms.core.aspect.annotation.QmsPermission;
 import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationPageReqVO;
+import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationWithProductVO;
 import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfoWithBizConfigVO;
 import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfomationDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -26,7 +27,7 @@ import static com.zt.plat.module.qms.enums.QmsPermissionConstant.DEVICE_MANAGER;
 @Mapper
 public interface DeviceInfomationMapper extends BaseMapperX<DeviceInfomationDO> {
 
-    Page<DeviceInfomationDO> selectPage(IPage<?> page, @Param("param") DeviceInfomationPageReqVO param);
+    Page<DeviceInfomationWithProductVO> selectPage(IPage<?> page, @Param("param") DeviceInfomationPageReqVO param);
 
     //查询需要“某个业务类型”的设备列表
     List<DeviceInfoWithBizConfigVO> getListNeedByRule(@Param("param") Map<String, Object> param);

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/dal/mapper/DeviceUseRecordMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
-import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordVO;
+import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationWithProductVO;
 import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceUseRecordDO;
 import com.zt.plat.module.qms.resource.device.controller.vo.DeviceUseRecordPageReqVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -39,8 +39,10 @@ public interface DeviceUseRecordMapper extends BaseMapperX<DeviceUseRecordDO> {
                 .orderByDesc(DeviceUseRecordDO::getId));
     }
 
-    IPage<DeviceUseRecordVO> queryPageListWithCount(Page<DeviceUseRecordVO> page, @Param("param") DeviceUseRecordPageReqVO param);
+    IPage<DeviceInfomationWithProductVO> queryPageListWithCount(Page<DeviceInfomationWithProductVO> page, @Param("param") DeviceUseRecordPageReqVO param);
-    DeviceUseRecordVO queryVoById(@Param("id") Long id);
+
+
+//    DeviceUseRecordVO queryVoById(@Param("id") Long id);
 
 
 }

zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceInfomationService.java

@@ -6,6 +6,7 @@ import com.zt.plat.framework.common.pojo.PageResult;
 import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationPageReqVO;
 import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationRespVO;
 import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationSaveReqVO;
+import com.zt.plat.module.qms.resource.device.controller.vo.DeviceInfomationWithProductVO;
 import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfoWithBizConfigVO;
 import com.zt.plat.module.qms.resource.device.dal.dataobject.DeviceInfomationDO;
 import jakarta.validation.Valid;
@@ -90,6 +91,7 @@ public interface DeviceInfomationService {
      * @return 设备-设备信息
      */
     DeviceInfomationDO getDeviceInfomation(Long id);
+    DeviceInfomationWithProductVO getDeviceWithProduct(Long id);
 
     /**
      * 获得设备-设备信息分页
@@ -97,6 +99,6 @@ public interface DeviceInfomationService {
      * @param pageReqVO 分页查询
      * @return 设备-设备信息分页
      */
-    PageResult<DeviceInfomationDO> getDeviceInfomationPage(DeviceInfomationPageReqVO pageReqVO);
+    PageResult<DeviceInfomationWithProductVO> getDeviceInfomationPage(DeviceInfomationPageReqVO pageReqVO);
 
 }