修改项目包结构

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/controller/BusHospitalConfigController.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/controller/BusHospitalConfigController.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.BusHospitalConfigDTO;
-import tr.cn.module.phototherapy.common.service.IBusHospitalConfigService;
-import tr.cn.module.phototherapy.common.dto.BusHospitalConfigQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalConfigDTO;
+import cn.tr.module.phototherapy.common.service.IBusHospitalConfigService;
+import cn.tr.module.phototherapy.common.dto.BusHospitalConfigQueryDTO;
 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/BusHospitalController.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/controller/BusHospitalController.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.BusHospitalDTO;
-import tr.cn.module.phototherapy.common.service.IBusHospitalService;
-import tr.cn.module.phototherapy.common.dto.BusHospitalQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalDTO;
+import cn.tr.module.phototherapy.common.service.IBusHospitalService;
+import cn.tr.module.phototherapy.common.dto.BusHospitalQueryDTO;
 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/BusPatientController.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/controller/BusPatientController.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.BusPatientDTO;
-import tr.cn.module.phototherapy.common.service.IBusPatientService;
-import tr.cn.module.phototherapy.common.dto.BusPatientQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusPatientDTO;
+import cn.tr.module.phototherapy.common.service.IBusPatientService;
+import cn.tr.module.phototherapy.common.dto.BusPatientQueryDTO;
 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/BusDeviceQueryDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceQueryDTO.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.dto;
+package cn.tr.module.phototherapy.common.dto;
 
 import lombok.ToString;
 import lombok.Data;
@@ -6,6 +6,7 @@ import lombok.Data;
 import java.time.LocalDateTime;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 设备表查询参数
@@ -45,13 +46,13 @@ public class BusDeviceQueryDTO  implements Serializable{
     private Integer deviceStatus;
 
     @Schema(description = "设备上传数据时间")
-    private LocalDateTime uploadTime;
+    private Date uploadTime;
 
     @Schema(description = "设备运行时间")
-    private LocalDateTime runTime;
+    private Date runTime;
 
     @Schema(description = "设备关闭时间")
-    private LocalDateTime closeTime;
+    private Date closeTime;
 
     @Schema(description = "患者唯一标识")
     private String patientUniqueId;

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/dto/BusHospitalConfigDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusHospitalConfigDTO.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;

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

@@ -1,10 +1,10 @@
-package tr.cn.module.phototherapy.common.dto;
+package cn.tr.module.phototherapy.common.dto;
 
 import lombok.ToString;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.Serializable;
 

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/dto/BusHospitalDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusHospitalDTO.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;

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

@@ -1,9 +1,9 @@
-package tr.cn.module.phototherapy.common.dto;
+package cn.tr.module.phototherapy.common.dto;
 
 import lombok.ToString;
 import lombok.Data;
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.io.Serial;
+
 import java.io.Serializable;
 
 /**

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/dto/BusPatientDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusPatientDTO.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;
@@ -8,7 +8,6 @@ import cn.tr.core.validation.Update;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import jakarta.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
 
 /**
  * 患者表传输对象
@@ -37,18 +36,6 @@ public class BusPatientDTO extends BaseDTO  {
     @NotBlank(message = "治疗记录表id不能为空", groups = {Update.class, Insert.class})
     private String therapyId;
 
-    @Schema(description = "记录开始时间")
-    private LocalDateTime createTime;
-
-    @Schema(description = "记录添加人")
-    private String createBy;
-
-    @Schema(description = "记录结束时间")
-    private LocalDateTime updateTime;
-
-    @Schema(description = "记录修改人")
-    private String updateBy;
-
     @Schema(description = "删除标志（0代表存在 1代表删除）")
     private Integer isDelete;
 

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/mapper/BusHospitalConfigMapper.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/mapper/BusHospitalConfigMapper.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.BusHospitalConfigPO;
-import tr.cn.module.phototherapy.common.dto.BusHospitalConfigDTO;
+import cn.tr.module.phototherapy.common.po.BusHospitalConfigPO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalConfigDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/mapper/BusHospitalMapper.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/mapper/BusHospitalMapper.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.BusHospitalPO;
-import tr.cn.module.phototherapy.common.dto.BusHospitalDTO;
+import cn.tr.module.phototherapy.common.po.BusHospitalPO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/po/BusDevicePO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusDevicePO.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/BusHospitalConfigPO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusHospitalConfigPO.java

@@ -1,17 +1,13 @@
-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/BusHospitalPO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusHospitalPO.java

@@ -1,7 +1,6 @@
-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 io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/repository/BusDeviceRepository.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/repository/BusDeviceRepository.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.BusDevicePO;
+import cn.tr.module.phototherapy.common.po.BusDevicePO;
 
 /**
  * 设备表Mapper接口

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/repository/BusHospitalConfigRepository.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/repository/BusHospitalConfigRepository.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.BusHospitalConfigPO;
+import cn.tr.module.phototherapy.common.po.BusHospitalConfigPO;
 
 /**
  * 医院-系统配置表Mapper接口

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

@@ -1,8 +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 tr.cn.module.phototherapy.common.po.BusHospitalPO;
+import cn.tr.module.phototherapy.common.po.BusHospitalPO;
 
 /**
  * 医院信息表Mapper接口

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/impl/BusDeviceServiceImpl.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusDeviceServiceImpl.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.BusDeviceRepository;
-import tr.cn.module.phototherapy.common.po.BusDevicePO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceDTO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceQueryDTO;
+import cn.tr.module.phototherapy.common.repository.BusDeviceRepository;
+import cn.tr.module.phototherapy.common.po.BusDevicePO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceQueryDTO;
 import java.util.*;
-import tr.cn.module.phototherapy.common.service.IBusDeviceService;
-import tr.cn.module.phototherapy.common.mapper.BusDeviceMapper;
+import cn.tr.module.phototherapy.common.service.IBusDeviceService;
+import cn.tr.module.phototherapy.common.mapper.BusDeviceMapper;
 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/BusHospitalConfigServiceImpl.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusHospitalConfigServiceImpl.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.BusHospitalConfigRepository;
-import tr.cn.module.phototherapy.common.po.BusHospitalConfigPO;
-import tr.cn.module.phototherapy.common.dto.BusHospitalConfigDTO;
-import tr.cn.module.phototherapy.common.dto.BusHospitalConfigQueryDTO;
+import cn.tr.module.phototherapy.common.repository.BusHospitalConfigRepository;
+import cn.tr.module.phototherapy.common.po.BusHospitalConfigPO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalConfigDTO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalConfigQueryDTO;
 import java.util.*;
-import tr.cn.module.phototherapy.common.service.IBusHospitalConfigService;
-import tr.cn.module.phototherapy.common.mapper.BusHospitalConfigMapper;
+import cn.tr.module.phototherapy.common.service.IBusHospitalConfigService;
+import cn.tr.module.phototherapy.common.mapper.BusHospitalConfigMapper;
 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/BusHospitalServiceImpl.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusHospitalServiceImpl.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.BusHospitalRepository;
-import tr.cn.module.phototherapy.common.po.BusHospitalPO;
-import tr.cn.module.phototherapy.common.dto.BusHospitalDTO;
-import tr.cn.module.phototherapy.common.dto.BusHospitalQueryDTO;
+import cn.tr.module.phototherapy.common.repository.BusHospitalRepository;
+import cn.tr.module.phototherapy.common.po.BusHospitalPO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalDTO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalQueryDTO;
 import java.util.*;
-import tr.cn.module.phototherapy.common.service.IBusHospitalService;
-import tr.cn.module.phototherapy.common.mapper.BusHospitalMapper;
+import cn.tr.module.phototherapy.common.service.IBusHospitalService;
+import cn.tr.module.phototherapy.common.mapper.BusHospitalMapper;
 import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;