修改项目包结构

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/controller/BusClinicController.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/controller/BusClinicController.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.BusClinicDTO;
-import tr.cn.module.phototherapy.common.service.IBusClinicService;
-import tr.cn.module.phototherapy.common.dto.BusClinicQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusClinicDTO;
+import cn.tr.module.phototherapy.common.service.IBusClinicService;
+import cn.tr.module.phototherapy.common.dto.BusClinicQueryDTO;
 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/BusDeviceAlarmController.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/controller/BusDeviceAlarmController.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.BusDeviceAlarmDTO;
-import tr.cn.module.phototherapy.common.service.IBusDeviceAlarmService;
-import tr.cn.module.phototherapy.common.dto.BusDeviceAlarmQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceAlarmDTO;
+import cn.tr.module.phototherapy.common.service.IBusDeviceAlarmService;
+import cn.tr.module.phototherapy.common.dto.BusDeviceAlarmQueryDTO;
 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/BusClinicDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusClinicDTO.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,8 @@ 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;
+
+import java.util.Date;
 
 /**
  * 临床表传输对象
@@ -38,7 +39,7 @@ public class BusClinicDTO extends BaseDTO  {
 
     @Schema(description = "患者上次治疗时间")
     @NotNull(message = "患者上次治疗时间不能为空", groups = {Update.class, Insert.class})
-    private LocalDateTime lastTreatmentTime;
+    private Date lastTreatmentTime;
 
     @Schema(description = "关联治疗方案表（当前阶段）")
     @NotBlank(message = "关联治疗方案表（当前阶段）不能为空", groups = {Update.class, Insert.class})

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

@@ -1,9 +1,10 @@
-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.Serializable;
+import java.util.Date;
 
 /**
  * 临床表查询参数
@@ -27,7 +28,7 @@ public class BusClinicQueryDTO  implements Serializable{
     private String userId;
 
     @Schema(description = "患者上次治疗时间")
-    private java.time.LocalDateTime lastTreatmentTime;
+    private Date lastTreatmentTime;
 
     @Schema(description = "关联治疗方案表（当前阶段）")
     private String therapyPlanId;

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/dto/BusDeviceAlarmDTO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/dto/BusDeviceAlarmDTO.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;
 
 /**
  * 设备报警表传输对象
@@ -33,7 +34,7 @@ public class BusDeviceAlarmDTO extends BaseDTO  {
     private String deviceId;
 
     @Schema(description = "设备数据上传时间")
-    private LocalDateTime uploadTime;
+    private Date uploadTime;
 
     @Schema(description = "报警类型")
     @NotNull(message = "报警类型不能为空", groups = {Update.class, Insert.class})
@@ -52,6 +53,6 @@ public class BusDeviceAlarmDTO extends BaseDTO  {
     private Integer runState;
 
     @Schema(description = "报警时间")
-    private LocalDateTime alarmTime;
+    private Date alarmTime;
 
 }

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

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/po/BusClinicPO.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/po/BusClinicPO.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/BusClinicRepository.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/repository/BusClinicRepository.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.BusClinicPO;
+import cn.tr.module.phototherapy.common.po.BusClinicPO;
 
 /**
  * 临床表Mapper接口

tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/impl/BusClinicServiceImpl.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/impl/BusClinicServiceImpl.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.BusClinicRepository;
-import tr.cn.module.phototherapy.common.po.BusClinicPO;
-import tr.cn.module.phototherapy.common.dto.BusClinicDTO;
-import tr.cn.module.phototherapy.common.dto.BusClinicQueryDTO;
+import cn.tr.module.phototherapy.common.repository.BusClinicRepository;
+import cn.tr.module.phototherapy.common.po.BusClinicPO;
+import cn.tr.module.phototherapy.common.dto.BusClinicDTO;
+import cn.tr.module.phototherapy.common.dto.BusClinicQueryDTO;
 import java.util.*;
-import tr.cn.module.phototherapy.common.service.IBusClinicService;
-import tr.cn.module.phototherapy.common.mapper.BusClinicMapper;
+import cn.tr.module.phototherapy.common.service.IBusClinicService;
+import cn.tr.module.phototherapy.common.mapper.BusClinicMapper;
 import jakarta.annotation.Resource;
 import cn.tr.core.exception.TRExcCode;
 

tr-test/src/main/resources/application.yml

@@ -172,10 +172,10 @@ springdoc:
         - cn.tr.module.sys
         - cn.tr.module.excel
         - cn.tr.module.gen.modular.basic.controller
-    - group: 'platform'
+    - group: 'phototherapy'
       display-name: 平台管理端
       packages-to-scan:
-        - cn.tr.module.platform
+        - cn.tr.module.phototherapy
     - group: 'client'
       display-name: 平台用户端
       packages-to-scan: