Explorar o código

修改项目包结构

zhouzeyu hai 2 semanas
pai
achega
7de2926acc
Modificáronse 23 ficheiros con 61 adicións e 49 borrados
  1. 1 1
      Dockerfile
  2. BIN=BIN
      logs/2025-12/hdis-2025-12-09-1.log.gz
  3. 5 0
      tr-dependencies/pom.xml
  4. 1 1
      tr-modules-api/pom.xml
  5. 3 3
      tr-modules/pom.xml
  6. 1 2
      tr-modules/tr-modules-phototherapy/pom.xml
  7. 2 2
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/config/MqttConfiguration.java
  8. 3 3
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/config/MqttInboundConfiguration.java
  9. 2 2
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/config/MqttOutBoundConfiguration.java
  10. 1 1
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/handle/ReceiverMessageHandler.java
  11. 1 1
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/properties/MqttProperties.java
  12. 3 3
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusClinicService.java
  13. 3 3
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusDeviceAlarmService.java
  14. 3 3
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusDeviceHistoryService.java
  15. 3 3
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusDeviceService.java
  16. 3 3
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusHospitalConfigService.java
  17. 3 3
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusHospitalService.java
  18. 3 3
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusPatientService.java
  19. 3 3
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusTherapyPlanService.java
  20. 3 3
      tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusTherapyRecordService.java
  21. 1 1
      tr-plugins/tr-spring-boot-starter-plugin-mybatis/pom.xml
  22. 4 2
      tr-plugins/tr-spring-boot-starter-plugin-sse/README.md
  23. 9 3
      tr-test/pom.xml

+ 1 - 1
Dockerfile

@@ -14,4 +14,4 @@ ENV JAVA_OPTS="-Xms512m -Xmx2g -XX:+UseG1GC"
 
 # 运行应用
 # 通过环境变量配置JVM参数
-ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar /app/tr-test.jar"]
+ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar /app/cn-test.jar"]

BIN=BIN
logs/2025-12/hdis-2025-12-09-1.log.gz


+ 5 - 0
tr-dependencies/pom.xml

@@ -379,6 +379,11 @@
                 <artifactId>tr-module-system</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <dependency>
+                <groupId>cn.tr</groupId>
+                <artifactId>tr-modules-phototherapy</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <dependency>
                 <groupId>cn.tr</groupId>

+ 1 - 1
tr-modules-api/pom.xml

@@ -15,7 +15,7 @@
     <modules>
         <module>tr-module-system-api</module>
         <module>tr-module-export-api</module>
-<!--        <module>tr-module-quartz-api</module>-->
+<!--        <module>cn-module-quartz-api</module>-->
     </modules>
 
 

+ 3 - 3
tr-modules/pom.xml

@@ -16,9 +16,9 @@
         <module>tr-module-system</module>
         <module>tr-module-export</module>
         <module>tr-modules-phototherapy</module>
-        <!--        <module>tr-module-ai</module>-->
-<!--        <module>tr-module-jgliu</module>-->
-<!--        <module>tr-module-platform</module>-->
+        <!--        <module>cn-module-ai</module>-->
+<!--        <module>cn-module-jgliu</module>-->
+<!--        <module>cn-module-platform</module>-->
     </modules>
 
 

+ 1 - 2
tr-modules/tr-modules-phototherapy/pom.xml

@@ -10,8 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>tr-modules-phototherapy</artifactId>
-    <packaging>pom</packaging>
-    <version>${revisi on}</version>
+    <version>${revision}</version>
 
     <properties>
         <maven.compiler.source>21</maven.compiler.source>

+ 2 - 2
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/config/MqttConfiguration.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/config/MqttConfiguration.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.config;
+package cn.tr.module.phototherapy.common.config;
 
 import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -6,7 +6,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
 import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
-import tr.cn.module.phototherapy.common.properties.MqttProperties;
+import cn.tr.module.phototherapy.common.properties.MqttProperties;
 
 /**
  * @author zzy

+ 3 - 3
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/config/MqttInboundConfiguration.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/config/MqttInboundConfiguration.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.config;
+package cn.tr.module.phototherapy.common.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -11,8 +11,8 @@ import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannel
 import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
-import tr.cn.module.phototherapy.common.handle.ReceiverMessageHandler;
-import tr.cn.module.phototherapy.common.properties.MqttProperties;
+import cn.tr.module.phototherapy.common.handle.ReceiverMessageHandler;
+import cn.tr.module.phototherapy.common.properties.MqttProperties;
 
 /**
  * @author zzy

+ 2 - 2
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/config/MqttOutBoundConfiguration.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/config/MqttOutBoundConfiguration.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.config;
+package cn.tr.module.phototherapy.common.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -9,7 +9,7 @@ import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
 import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
-import tr.cn.module.phototherapy.common.properties.MqttProperties;
+import cn.tr.module.phototherapy.common.properties.MqttProperties;
 
 /**
  * @author zzy

+ 1 - 1
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/handle/ReceiverMessageHandler.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/handle/ReceiverMessageHandler.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.handle;
+package cn.tr.module.phototherapy.common.handle;
 
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandler;

+ 1 - 1
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/properties/MqttProperties.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/properties/MqttProperties.java

@@ -1,4 +1,4 @@
-package tr.cn.module.phototherapy.common.properties;
+package cn.tr.module.phototherapy.common.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

+ 3 - 3
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/IBusClinicService.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusClinicService.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.service;
+package cn.tr.module.phototherapy.common.service;
 
-import tr.cn.module.phototherapy.common.dto.BusClinicDTO;
-import tr.cn.module.phototherapy.common.dto.BusClinicQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusClinicDTO;
+import cn.tr.module.phototherapy.common.dto.BusClinicQueryDTO;
 import java.util.*;
 import java.util.Collection;
 

+ 3 - 3
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/IBusDeviceAlarmService.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusDeviceAlarmService.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.service;
+package cn.tr.module.phototherapy.common.service;
 
-import tr.cn.module.phototherapy.common.dto.BusDeviceAlarmDTO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceAlarmQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceAlarmDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceAlarmQueryDTO;
 import java.util.*;
 import java.util.Collection;
 

+ 3 - 3
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/IBusDeviceHistoryService.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusDeviceHistoryService.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.service;
+package cn.tr.module.phototherapy.common.service;
 
-import tr.cn.module.phototherapy.common.dto.BusDeviceHistoryDTO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceHistoryQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceHistoryDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceHistoryQueryDTO;
 import java.util.*;
 import java.util.Collection;
 

+ 3 - 3
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/IBusDeviceService.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusDeviceService.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.service;
+package cn.tr.module.phototherapy.common.service;
 
-import tr.cn.module.phototherapy.common.dto.BusDeviceDTO;
-import tr.cn.module.phototherapy.common.dto.BusDeviceQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceDTO;
+import cn.tr.module.phototherapy.common.dto.BusDeviceQueryDTO;
 import java.util.*;
 import java.util.Collection;
 

+ 3 - 3
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/IBusHospitalConfigService.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusHospitalConfigService.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.service;
+package cn.tr.module.phototherapy.common.service;
 
-import tr.cn.module.phototherapy.common.dto.BusHospitalConfigDTO;
-import tr.cn.module.phototherapy.common.dto.BusHospitalConfigQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalConfigDTO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalConfigQueryDTO;
 import java.util.*;
 import java.util.Collection;
 

+ 3 - 3
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/IBusHospitalService.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusHospitalService.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.service;
+package cn.tr.module.phototherapy.common.service;
 
-import tr.cn.module.phototherapy.common.dto.BusHospitalDTO;
-import tr.cn.module.phototherapy.common.dto.BusHospitalQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalDTO;
+import cn.tr.module.phototherapy.common.dto.BusHospitalQueryDTO;
 import java.util.*;
 import java.util.Collection;
 

+ 3 - 3
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/IBusPatientService.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusPatientService.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.service;
+package cn.tr.module.phototherapy.common.service;
 
-import tr.cn.module.phototherapy.common.dto.BusPatientDTO;
-import tr.cn.module.phototherapy.common.dto.BusPatientQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusPatientDTO;
+import cn.tr.module.phototherapy.common.dto.BusPatientQueryDTO;
 import java.util.*;
 import java.util.Collection;
 

+ 3 - 3
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/IBusTherapyPlanService.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusTherapyPlanService.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.service;
+package cn.tr.module.phototherapy.common.service;
 
-import tr.cn.module.phototherapy.common.dto.BusTherapyPlanDTO;
-import tr.cn.module.phototherapy.common.dto.BusTherapyPlanQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusTherapyPlanDTO;
+import cn.tr.module.phototherapy.common.dto.BusTherapyPlanQueryDTO;
 import java.util.*;
 import java.util.Collection;
 

+ 3 - 3
tr-modules/tr-modules-phototherapy/src/main/java/tr/cn/module/phototherapy/common/service/IBusTherapyRecordService.java → tr-modules/tr-modules-phototherapy/src/main/java/cn/tr/module/phototherapy/common/service/IBusTherapyRecordService.java

@@ -1,7 +1,7 @@
-package tr.cn.module.phototherapy.common.service;
+package cn.tr.module.phototherapy.common.service;
 
-import tr.cn.module.phototherapy.common.dto.BusTherapyRecordDTO;
-import tr.cn.module.phototherapy.common.dto.BusTherapyRecordQueryDTO;
+import cn.tr.module.phototherapy.common.dto.BusTherapyRecordDTO;
+import cn.tr.module.phototherapy.common.dto.BusTherapyRecordQueryDTO;
 import java.util.*;
 import java.util.Collection;
 

+ 1 - 1
tr-plugins/tr-spring-boot-starter-plugin-mybatis/pom.xml

@@ -16,7 +16,7 @@
 
     <description>mybatis-plus插件配置</description>
 
-    <!-- 在 tr-spring-boot-starter-plugin-mybatis/pom.xml 中优化依赖范围 -->
+    <!-- 在 cn-spring-boot-starter-plugin-mybatis/pom.xml 中优化依赖范围 -->
     <dependencies>
         <!-- 核心框架依赖 -->
         <dependency>

+ 4 - 2
tr-plugins/tr-spring-boot-starter-plugin-sse/README.md

@@ -19,9 +19,10 @@ TR Spring Boot SSE插件是一个基于Spring Boot的Server-Sent Events (SSE)实
 在您的Spring Boot项目中添加以下依赖:
 
 ```xml
+
 <dependency>
     <groupId>cn.tr.plugin</groupId>
-    <artifactId>tr-spring-boot-starter-plugin-sse</artifactId>
+    <artifactId>cn-spring-boot-starter-plugin-sse</artifactId>
     <version>2.0.0</version>
 </dependency>
 ```
@@ -173,9 +174,10 @@ SSE (Server-Sent Events) 插件是一个基于Spring Boot的实时消息推送
 在需要使用SSE功能的模块中添加以下依赖:
 
 ```xml
+
 <dependency>
     <groupId>cn.tr.plugin</groupId>
-    <artifactId>tr-spring-boot-starter-plugin-sse</artifactId>
+    <artifactId>cn-spring-boot-starter-plugin-sse</artifactId>
     <version>{latest-version}</version>
 </dependency>
 ```

+ 9 - 3
tr-test/pom.xml

@@ -16,7 +16,7 @@
     <dependencies>
 <!--        <dependency>-->
 <!--            <groupId>cn.tr</groupId>-->
-<!--            <artifactId>tr-module-ai</artifactId>-->
+<!--            <artifactId>cn-module-ai</artifactId>-->
 <!--        </dependency>-->
 
         <dependency>
@@ -26,13 +26,13 @@
 
 <!--        <dependency>-->
 <!--            <groupId>cn.tr</groupId>-->
-<!--            <artifactId>tr-module-jgliu</artifactId>-->
+<!--            <artifactId>cn-module-jgliu</artifactId>-->
 <!--        </dependency>-->
 
 
 <!--        <dependency>-->
 <!--            <groupId>cn.tr</groupId>-->
-<!--            <artifactId>tr-module-platform</artifactId>-->
+<!--            <artifactId>cn-module-platform</artifactId>-->
 <!--        </dependency>-->
 
         <dependency>
@@ -102,6 +102,12 @@
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-database-postgresql</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>cn.tr</groupId>
+            <artifactId>tr-modules-phototherapy</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>