修改项目包结构

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/controller/BusTherapyPlanController.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/controller/BusTherapyPlanController.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.BusTherapyPlanDTO;
-import tr.cn.module.phototherapy.common.service.IBusTherapyPlanService;
-import tr.cn.module.phototherapy.common.dto.BusTherapyPlanQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusTherapyPlanDTO;
+import cn.tr.module.phototherapy.common.service.IBusTherapyPlanService;
+import cn.tr.module.phototherapy.common.dto.BusTherapyPlanQueryDTO;
 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/BusTherapyRecordController.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/controller/BusTherapyRecordController.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.BusTherapyRecordDTO;
-import tr.cn.module.phototherapy.common.service.IBusTherapyRecordService;
-import tr.cn.module.phototherapy.common.dto.BusTherapyRecordQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusTherapyRecordDTO;
+import cn.tr.module.phototherapy.common.service.IBusTherapyRecordService;
+import cn.tr.module.phototherapy.common.dto.BusTherapyRecordQueryDTO;
 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/BusPatientQueryDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusPatientQueryDTO.java

@@ -1,12 +1,10 @@
-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;
 
 /**

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/dto/BusTherapyPlanDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusTherapyPlanDTO.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;
@@ -9,7 +9,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import java.time.LocalDateTime;
 
 /**
  * 治疗方案表传输对象

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

@@ -1,10 +1,9 @@
-package tr.cn.module.phototherapy.common.dto;
+package cn.tr.module.phototherapy.common.dto;
 
 import lombok.ToString;
 import lombok.Data;
-import java.util.*;
 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/BusTherapyRecordDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusTherapyRecordDTO.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/BusTherapyRecordQueryDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusTherapyRecordQueryDTO.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;
 
 /**
  * 治疗记录表查询参数
@@ -31,10 +32,10 @@ public class BusTherapyRecordQueryDTO  implements Serializable{
     private String clinicId;
 
     @Schema(description = "光疗开始时间")
-    private LocalDateTime therapyStartTime;
+    private Date therapyStartTime;
 
     @Schema(description = "光疗结束时间")
-    private LocalDateTime therapyEndTime;
+    private Date therapyEndTime;
 
     @Schema(description = "累计治疗时长（不用实时）")
     private Integer therapyDuration;

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/enums/DeviceAlarmEnum.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/enums/DeviceAlarmEnum.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.enums;
+package cn.tr.module.phototherapy.common.enums;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/enums/DeviceStatusEnum.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/enums/DeviceStatusEnum.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.enums;
+package cn.tr.module.phototherapy.common.enums;
 
 import com.baomidou.mybatisplus.annotation.IEnum;
 import com.fasterxml.jackson.annotation.JsonFormat;

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-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.IdType;

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/repository/BusPatientRepository.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/repository/BusPatientRepository.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.BusPatientPO;
+import cn.tr.module.phototherapy.common.po.BusPatientPO;
 
 /**
  * 患者表Mapper接口

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/repository/BusTherapyPlanRepository.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/repository/BusTherapyPlanRepository.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.BusTherapyPlanPO;
+import cn.tr.module.phototherapy.common.po.BusTherapyPlanPO;
 
 /**
  * 治疗方案表Mapper接口

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/repository/BusTherapyRecordRepository.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/repository/BusTherapyRecordRepository.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.BusTherapyRecordPO;
+import cn.tr.module.phototherapy.common.po.BusTherapyRecordPO;
 
 /**
  * 治疗记录表Mapper接口

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/impl/BusPatientServiceImpl.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusPatientServiceImpl.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.BusPatientRepository;
-import tr.cn.module.phototherapy.common.po.BusPatientPO;
-import tr.cn.module.phototherapy.common.dto.BusPatientDTO;
-import tr.cn.module.phototherapy.common.dto.BusPatientQueryDTO;
+import cn.tr.module.phototherapy.common.repository.BusPatientRepository;
+import cn.tr.module.phototherapy.common.po.BusPatientPO;
+import cn.tr.module.phototherapy.common.dto.BusPatientDTO;
+import cn.tr.module.phototherapy.common.dto.BusPatientQueryDTO;
 import java.util.*;
-import tr.cn.module.phototherapy.common.service.IBusPatientService;
-import tr.cn.module.phototherapy.common.mapper.BusPatientMapper;
+import cn.tr.module.phototherapy.common.service.IBusPatientService;
+import cn.tr.module.phototherapy.common.mapper.BusPatientMapper;
 import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;
 
@@ -43,7 +43,6 @@ public class BusPatientServiceImpl implements IBusPatientService {
                     .eq(ObjectUtil.isNotNull(query.getGender()), BusPatientPO::getGender, query.getGender())
                     .eq(ObjectUtil.isNotNull(query.getTherapyId()), BusPatientPO::getTherapyId, query.getTherapyId())
                     .eq(ObjectUtil.isNotNull(query.getIsDelete()), BusPatientPO::getIsDelete, query.getIsDelete())
-                    .eq(ObjectUtil.isNotNull(query.getTenantId()), BusPatientPO::getTenantId, query.getTenantId())
                     .eq(ObjectUtil.isNotNull(query.getDeviceId()), BusPatientPO::getDeviceId, query.getDeviceId())
                     .eq(ObjectUtil.isNotNull(query.getAge()), BusPatientPO::getAge, query.getAge())
                     .like(ObjectUtil.isNotNull(query.getPhone()), BusPatientPO::getPhone, query.getPhone())

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/impl/BusTherapyPlanServiceImpl.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusTherapyPlanServiceImpl.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.BusTherapyPlanRepository;
-import tr.cn.module.phototherapy.common.po.BusTherapyPlanPO;
-import tr.cn.module.phototherapy.common.dto.BusTherapyPlanDTO;
-import tr.cn.module.phototherapy.common.dto.BusTherapyPlanQueryDTO;
+import cn.tr.module.phototherapy.common.repository.BusTherapyPlanRepository;
+import cn.tr.module.phototherapy.common.po.BusTherapyPlanPO;
+import cn.tr.module.phototherapy.common.dto.BusTherapyPlanDTO;
+import cn.tr.module.phototherapy.common.dto.BusTherapyPlanQueryDTO;
 import java.util.*;
-import tr.cn.module.phototherapy.common.service.IBusTherapyPlanService;
-import tr.cn.module.phototherapy.common.mapper.BusTherapyPlanMapper;
+import cn.tr.module.phototherapy.common.service.IBusTherapyPlanService;
+import cn.tr.module.phototherapy.common.mapper.BusTherapyPlanMapper;
 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/BusTherapyRecordServiceImpl.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusTherapyRecordServiceImpl.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.BusTherapyRecordRepository;
-import tr.cn.module.phototherapy.common.po.BusTherapyRecordPO;
-import tr.cn.module.phototherapy.common.dto.BusTherapyRecordDTO;
-import tr.cn.module.phototherapy.common.dto.BusTherapyRecordQueryDTO;
+import cn.tr.module.phototherapy.common.repository.BusTherapyRecordRepository;
+import cn.tr.module.phototherapy.common.po.BusTherapyRecordPO;
+import cn.tr.module.phototherapy.common.dto.BusTherapyRecordDTO;
+import cn.tr.module.phototherapy.common.dto.BusTherapyRecordQueryDTO;
 import java.util.*;
-import tr.cn.module.phototherapy.common.service.IBusTherapyRecordService;
-import tr.cn.module.phototherapy.common.mapper.BusTherapyRecordMapper;
+import cn.tr.module.phototherapy.common.service.IBusTherapyRecordService;
+import cn.tr.module.phototherapy.common.mapper.BusTherapyRecordMapper;
 import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;