wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

merge: 合并 upgrade/springboot-4.0 到 develop

Browse Source 
- 解决 pom.xml 冲突 (空行)
- 解决 TokenService.java 冲突 (保留 getSigningKey() 方案)
- 包含: JDK 25 + Spring Boot 4.0 特性落地
This commit is contained in:
华佗
2026-06-05 09:49:04 +08:00
parent 7e8d32a851 5d9ce9c759
commit c0149693f5
29 changed files with 533 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openhis-server-new/core-common/pom.xml
View File

@@ -21,10 +21,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<source>17</source>
<target>17</target>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>UTF-8</encoding>
<compilerArgs>
<arg>-parameters</arg>
@@ -35,7 +35,7 @@
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.34</version>
<version>${lombok.version}</version>
</path>
</annotationProcessorPaths>
</configuration>

52
openhis-server-new/core-common/src/main/java/com/core/common/core/text/Convert.java
View File

@@ -30,8 +30,8 @@ public class Convert {
if (null == value) {
return defaultValue;
}
if (value instanceof String) {
return (String)value;
if (value instanceof String t) {
return t;
}
return value.toString();
}
@@ -61,8 +61,8 @@ public class Convert {
if (null == value) {
return defaultValue;
}
if (value instanceof Character) {
return (Character)value;
if (value instanceof Character t) {
return t;
}
final String valueStr = toStr(value, null);
@@ -94,8 +94,8 @@ public class Convert {
if (value == null) {
return defaultValue;
}
if (value instanceof Byte) {
return (Byte)value;
if (value instanceof Byte t) {
return t;
}
if (value instanceof Number) {
return ((Number)value).byteValue();
@@ -136,8 +136,8 @@ public class Convert {
if (value == null) {
return defaultValue;
}
if (value instanceof Short) {
return (Short)value;
if (value instanceof Short t) {
return t;
}
if (value instanceof Number) {
return ((Number)value).shortValue();
@@ -178,8 +178,8 @@ public class Convert {
if (value == null) {
return defaultValue;
}
if (value instanceof Number) {
return (Number)value;
if (value instanceof Number t) {
return t;
}
final String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr)) {
@@ -217,8 +217,8 @@ public class Convert {
if (value == null) {
return defaultValue;
}
if (value instanceof Integer) {
return (Integer)value;
if (value instanceof Integer t) {
return t;
}
if (value instanceof Number) {
return ((Number)value).intValue();
@@ -343,8 +343,8 @@ public class Convert {
if (value == null) {
return defaultValue;
}
if (value instanceof Long) {
return (Long)value;
if (value instanceof Long t) {
return t;
}
if (value instanceof Number) {
return ((Number)value).longValue();
@@ -386,8 +386,8 @@ public class Convert {
if (value == null) {
return defaultValue;
}
if (value instanceof Double) {
return (Double)value;
if (value instanceof Double t) {
return t;
}
if (value instanceof Number) {
return ((Number)value).doubleValue();
@@ -429,8 +429,8 @@ public class Convert {
if (value == null) {
return defaultValue;
}
if (value instanceof Float) {
return (Float)value;
if (value instanceof Float t) {
return t;
}
if (value instanceof Number) {
return ((Number)value).floatValue();
@@ -471,8 +471,8 @@ public class Convert {
if (value == null) {
return defaultValue;
}
if (value instanceof Boolean) {
return (Boolean)value;
if (value instanceof Boolean t) {
return t;
}
String valueStr = toStr(value, null);
if (StringUtils.isEmpty(valueStr)) {
@@ -560,8 +560,8 @@ public class Convert {
if (value == null) {
return defaultValue;
}
if (value instanceof BigInteger) {
return (BigInteger)value;
if (value instanceof BigInteger t) {
return t;
}
if (value instanceof Long) {
return BigInteger.valueOf((Long)value);
@@ -602,8 +602,8 @@ public class Convert {
if (value == null) {
return defaultValue;
}
if (value instanceof BigDecimal) {
return (BigDecimal)value;
if (value instanceof BigDecimal t) {
return t;
}
if (value instanceof Long) {
return new BigDecimal((Long)value);
@@ -673,8 +673,8 @@ public class Convert {
return null;
}
if (obj instanceof String) {
return (String)obj;
if (obj instanceof String t) {
return t;
} else if (obj instanceof byte[]) {
return str((byte[])obj, charset);
} else if (obj instanceof Byte[]) {

9
openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java
View File

@@ -255,8 +255,7 @@ public class NewExcelUtil<T> {
if (!pictures.isEmpty()) {
for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren()) {
HSSFClientAnchor anchor = (HSSFClientAnchor)shape.getAnchor();
if (shape instanceof HSSFPicture) {
HSSFPicture pic = (HSSFPicture)shape;
if (shape instanceof HSSFPicture pic) {
int pictureIndex = pic.getPictureIndex() - 1;
HSSFPictureData picData = pictures.get(pictureIndex);
String picIndex = anchor.getRow1() + "_" + anchor.getCol1();
@@ -279,12 +278,10 @@ public class NewExcelUtil<T> {
public static Map<String, PictureData> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook) {
Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
for (POIXMLDocumentPart dr : sheet.getRelations()) {
if (dr instanceof XSSFDrawing) {
XSSFDrawing drawing = (XSSFDrawing)dr;
if (dr instanceof XSSFDrawing drawing) {
List<XSSFShape> shapes = drawing.getShapes();
for (XSSFShape shape : shapes) {
if (shape instanceof XSSFPicture) {
XSSFPicture pic = (XSSFPicture)shape;
if (shape instanceof XSSFPicture pic) {
XSSFClientAnchor anchor = pic.getPreferredSize();
CTMarker ctMarker = anchor.getFrom();
String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol();

9
openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java
View File

@@ -245,8 +245,7 @@ public class ExcelUtil<T> {
if (!pictures.isEmpty()) {
for (HSSFShape shape : sheet.getDrawingPatriarch().getChildren()) {
HSSFClientAnchor anchor = (HSSFClientAnchor)shape.getAnchor();
if (shape instanceof HSSFPicture) {
HSSFPicture pic = (HSSFPicture)shape;
if (shape instanceof HSSFPicture pic) {
int pictureIndex = pic.getPictureIndex() - 1;
HSSFPictureData picData = pictures.get(pictureIndex);
String picIndex = anchor.getRow1() + "_" + anchor.getCol1();
@@ -269,12 +268,10 @@ public class ExcelUtil<T> {
public static Map<String, PictureData> getSheetPictures07(XSSFSheet sheet, XSSFWorkbook workbook) {
Map<String, PictureData> sheetIndexPicMap = new HashMap<String, PictureData>();
for (POIXMLDocumentPart dr : sheet.getRelations()) {
if (dr instanceof XSSFDrawing) {
XSSFDrawing drawing = (XSSFDrawing)dr;
if (dr instanceof XSSFDrawing drawing) {
List<XSSFShape> shapes = drawing.getShapes();
for (XSSFShape shape : shapes) {
if (shape instanceof XSSFPicture) {
XSSFPicture pic = (XSSFPicture)shape;
if (shape instanceof XSSFPicture pic) {
XSSFClientAnchor anchor = pic.getPreferredSize();
CTMarker ctMarker = anchor.getFrom();
String picIndex = ctMarker.getRow() + "_" + ctMarker.getCol();