修改项目包结构

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/controller/BusDeviceController.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/controller/BusDeviceController.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.controller;
+package cn.tr.module.phototherapy.common.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.tr.core.validation.Insert;
@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import tr.cn.module.phototherapy.common.dto.BusDeviceDTO;
-import tr.cn.module.phototherapy.common.service.IBusDeviceService;
-import tr.cn.module.phototherapy.common.dto.BusDeviceQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceDTO;
+import cn.tr.module.phototherapy.common.service.IBusDeviceService;
+import cn.tr.module.phototherapy.common.dto.BusDeviceQueryDTO;
 import java.util.*;
 import cn.tr.core.context.BaseController;
 import org.springframework.web.bind.annotation.*;

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/controller/BusDeviceHistoryController.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/controller/BusDeviceHistoryController.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.controller;
+package cn.tr.module.phototherapy.common.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.tr.core.validation.Insert;
@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import tr.cn.module.phototherapy.common.dto.BusDeviceHistoryDTO;
-import tr.cn.module.phototherapy.common.service.IBusDeviceHistoryService;
-import tr.cn.module.phototherapy.common.dto.BusDeviceHistoryQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceHistoryDTO;
+import cn.tr.module.phototherapy.common.service.IBusDeviceHistoryService;
+import cn.tr.module.phototherapy.common.dto.BusDeviceHistoryQueryDTO;
 import java.util.*;
 import cn.tr.core.context.BaseController;
 import org.springframework.web.bind.annotation.*;

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/dto/BusDeviceAlarmQueryDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceAlarmQueryDTO.java

@@ -1,13 +1,14 @@
-package tr.cn.module.phototherapy.common.dto;
+package cn.tr.module.phototherapy.common.dto;
 
 import lombok.ToString;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.*;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serial;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 设备报警表查询参数
@@ -28,7 +29,7 @@ public class BusDeviceAlarmQueryDTO  implements Serializable{
     private String deviceId;
 
     @Schema(description = "设备数据上传时间")
-    private LocalDateTime uploadTime;
+    private Date uploadTime;
 
     @Schema(description = "报警类型")
     private Integer deviceAlarm;

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/dto/BusDeviceDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceDTO.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.dto;
+package cn.tr.module.phototherapy.common.dto;
 
 import cn.tr.core.pojo.BaseDTO;
 import lombok.EqualsAndHashCode;
@@ -10,6 +10,7 @@ import lombok.Data;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 设备表传输对象
@@ -56,15 +57,15 @@ public class BusDeviceDTO extends BaseDTO  {
     private Integer deviceStatus;
 
     @Schema(description = "设备上传数据时间")
-    private LocalDateTime uploadTime;
+    private Date uploadTime;
 
     @Schema(description = "设备运行时间")
     @NotNull(message = "设备运行时间不能为空", groups = {Update.class, Insert.class})
-    private LocalDateTime runTime;
+    private Date runTime;
 
     @Schema(description = "设备关闭时间")
     @NotNull(message = "设备关闭时间不能为空", groups = {Update.class, Insert.class})
-    private LocalDateTime closeTime;
+    private Date closeTime;
 
     @Schema(description = "患者唯一标识")
     @NotBlank(message = "患者唯一标识不能为空", groups = {Update.class, Insert.class})

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/dto/BusDeviceHistoryDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceHistoryDTO.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.dto;
+package cn.tr.module.phototherapy.common.dto;
 
 import cn.tr.core.pojo.BaseDTO;
 import lombok.EqualsAndHashCode;
@@ -10,6 +10,7 @@ import lombok.Data;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 设备历史传输对象
@@ -47,17 +48,17 @@ public class BusDeviceHistoryDTO extends BaseDTO  {
     private Integer dataNumber;
 
     @Schema(description = "光疗开始时间")
-    private LocalDateTime therapyStartTime;
+    private Date therapyStartTime;
 
     @Schema(description = "光疗结束时间")
-    private LocalDateTime therapyEndTime;
+    private Date therapyEndTime;
 
     @Schema(description = "治疗时长")
     @NotNull(message = "治疗时长不能为空", groups = {Update.class, Insert.class})
     private Integer therapyDuration;
 
     @Schema(description = "设备上传数据时间")
-    private LocalDateTime uploadTime;
+    private Date uploadTime;
 
     @Schema(description = "设备运行状态(0关机 1开机 2治疗中)")
     @NotNull(message = "设备运行状态不能为空", groups = {Update.class, Insert.class})

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/dto/BusDeviceHistoryQueryDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceHistoryQueryDTO.java

@@ -1,13 +1,14 @@
-package tr.cn.module.phototherapy.common.dto;
+package cn.tr.module.phototherapy.common.dto;
 
 import lombok.ToString;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.*;
+
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serial;
+
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 设备历史查询参数
@@ -40,16 +41,16 @@ public class BusDeviceHistoryQueryDTO  implements Serializable{
     private Integer dataNumber;
 
     @Schema(description = "光疗开始时间")
-    private LocalDateTime therapyStartTime;
+    private Date therapyStartTime;
 
     @Schema(description = "光疗结束时间")
-    private LocalDateTime therapyEndTime;
+    private Date therapyEndTime;
 
     @Schema(description = "治疗时长")
     private Integer therapyDuration;
 
     @Schema(description = "设备上传数据时间")
-    private LocalDateTime uploadTime;
+    private Date uploadTime;
 
     @Schema(description = "设备运行状态(0关机 1开机 2治疗中)")
     private Integer runState;

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/mapper/BusDeviceAlarmMapper.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/mapper/BusDeviceAlarmMapper.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.mapper;
+package cn.tr.module.phototherapy.common.mapper;
 
-import tr.cn.module.phototherapy.common.po.BusDeviceAlarmPO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceAlarmDTO;
+import cn.tr.module.phototherapy.common.po.BusDeviceAlarmPO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceAlarmDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/mapper/BusDeviceHistoryMapper.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/mapper/BusDeviceHistoryMapper.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.mapper;
+package cn.tr.module.phototherapy.common.mapper;
 
-import tr.cn.module.phototherapy.common.po.BusDeviceHistoryPO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceHistoryDTO;
+import cn.tr.module.phototherapy.common.po.BusDeviceHistoryPO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceHistoryDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/mapper/BusDeviceMapper.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/mapper/BusDeviceMapper.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.mapper;
+package cn.tr.module.phototherapy.common.mapper;
 
-import tr.cn.module.phototherapy.common.po.BusDevicePO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceDTO;
+import cn.tr.module.phototherapy.common.po.BusDevicePO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/po/BusDeviceAlarmPO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusDeviceAlarmPO.java

@@ -1,16 +1,14 @@
-package tr.cn.module.phototherapy.common.po;
+package cn.tr.module.phototherapy.common.po;
 
 import cn.tr.core.pojo.TenantPO;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import java.math.BigDecimal;
+
 import java.time.LocalDateTime;
 
 /**

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/po/BusDeviceHistoryPO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusDeviceHistoryPO.java

@@ -1,16 +1,14 @@
-package tr.cn.module.phototherapy.common.po;
+package cn.tr.module.phototherapy.common.po;
 
 import cn.tr.core.pojo.TenantPO;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import java.math.BigDecimal;
+
 import java.time.LocalDateTime;
 
 /**

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/repository/BusDeviceAlarmRepository.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/repository/BusDeviceAlarmRepository.java

@@ -1,10 +1,8 @@
-package tr.cn.module.phototherapy.common.repository;
+package cn.tr.module.phototherapy.common.repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import java.util.*;
-import tr.cn.module.phototherapy.common.po.BusDeviceAlarmPO;
+import cn.tr.module.phototherapy.common.po.BusDeviceAlarmPO;
 
 /**
  * 设备报警表Mapper接口

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/repository/BusDeviceHistoryRepository.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/repository/BusDeviceHistoryRepository.java

@@ -1,10 +1,8 @@
-package tr.cn.module.phototherapy.common.repository;
+package cn.tr.module.phototherapy.common.repository;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import java.util.*;
-import tr.cn.module.phototherapy.common.po.BusDeviceHistoryPO;
+import cn.tr.module.phototherapy.common.po.BusDeviceHistoryPO;
 
 /**
  * 设备历史Mapper接口

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/impl/BusDeviceAlarmServiceImpl.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusDeviceAlarmServiceImpl.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.service.impl;
+package cn.tr.module.phototherapy.common.service.impl;
 
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
@@ -6,13 +6,13 @@ import cn.hutool.core.util.ObjectUtil;
 import org.springframework.transaction.annotation.Transactional;
 import cn.tr.core.exception.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import tr.cn.module.phototherapy.common.repository.BusDeviceAlarmRepository;
-import tr.cn.module.phototherapy.common.po.BusDeviceAlarmPO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceAlarmDTO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceAlarmQueryDTO;
+import cn.tr.module.phototherapy.common.repository.BusDeviceAlarmRepository;
+import cn.tr.module.phototherapy.common.po.BusDeviceAlarmPO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceAlarmDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceAlarmQueryDTO;
 import java.util.*;
-import tr.cn.module.phototherapy.common.service.IBusDeviceAlarmService;
-import tr.cn.module.phototherapy.common.mapper.BusDeviceAlarmMapper;
+import cn.tr.module.phototherapy.common.service.IBusDeviceAlarmService;
+import cn.tr.module.phototherapy.common.mapper.BusDeviceAlarmMapper;
 import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;
 

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/impl/BusDeviceHistoryServiceImpl.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusDeviceHistoryServiceImpl.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.service.impl;
+package cn.tr.module.phototherapy.common.service.impl;
 
 import org.springframework.stereotype.Service;
 import cn.hutool.core.collection.CollectionUtil;
@@ -6,13 +6,13 @@ import cn.hutool.core.util.ObjectUtil;
 import org.springframework.transaction.annotation.Transactional;
 import cn.tr.core.exception.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import tr.cn.module.phototherapy.common.repository.BusDeviceHistoryRepository;
-import tr.cn.module.phototherapy.common.po.BusDeviceHistoryPO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceHistoryDTO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceHistoryQueryDTO;
+import cn.tr.module.phototherapy.common.repository.BusDeviceHistoryRepository;
+import cn.tr.module.phototherapy.common.po.BusDeviceHistoryPO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceHistoryDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceHistoryQueryDTO;
 import java.util.*;
-import tr.cn.module.phototherapy.common.service.IBusDeviceHistoryService;
-import tr.cn.module.phototherapy.common.mapper.BusDeviceHistoryMapper;
+import cn.tr.module.phototherapy.common.service.IBusDeviceHistoryService;
+import cn.tr.module.phototherapy.common.mapper.BusDeviceHistoryMapper;
 import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;