feat: Spring Boot 3.5.14 全量升级 + 组件升级

核心升级:
- Spring Boot 2.7.18 → 3.5.14
- MyBatis Plus 3.5.5 → 3.5.16 (spring-boot3-starter)
- Springdoc 1.8.0 → 2.8.6 (OpenAPI 3)
- Flowable 6.8.0 → 7.1.0
- Druid 1.2.x → 1.2.28 (boot3-starter)
- kotlin-reflect 1.9.10 → 1.9.25

迁移适配:
- javax → jakarta 命名空间 (620+ 文件)
- Swagger 注解迁移到 OpenAPI 3 (@Tag/@Schema/@Operation/@Parameter)
- Spring Security 6.2 适配 (antMatchers→requestMatchers, EnableMethodSecurity)
- Druid 包名迁移 (boot→boot3)
- Redis 配置路径迁移 (spring.redis→spring.data.redis)
- Flyway 适配 (flyway-database-postgresql)
- Flowable 7.x 适配 (MULE_TASK_IMAGE 移除)

修复:
- spring-boot-maven-plugin 2.5.15→3.5.14 (SPI服务发现失效)
- mybatis-plus-boot-starter 3.5.5→3.5.16 (kotlin-reflect+fastjson2冲突)
- Flowable database-schema-update 启用自动建表

验证: 23/23 测试通过, 1374 API端点正常
This commit is contained in:
2026-06-04 22:39:10 +08:00
parent b8d719429d
commit 1d21661a78
781 changed files with 57907 additions and 1301 deletions

View File

@@ -0,0 +1,106 @@
<template>
<div>
<el-table
ref="medicineRef"
height="400"
:data="medicineList"
@cell-click="clickRow"
>
<el-table-column
label="项目名称"
align="center"
prop="name"
width="300"
/>
<el-table-column
label="项目类型"
align="center"
prop="itemType_enumText"
/>
<el-table-column
label="包装单位"
align="center"
prop="unitCode_dictText"
/>
<el-table-column
label="最小单位"
align="center"
prop="minUnitCode_dictText"
/>
<el-table-column
label="规格"
align="center"
prop="volume"
/>
<!-- <el-table-column label="用法" align="center" prop="methodCode_dictText" />
<el-table-column label="单次剂量" align="center" prop="dose" />
<el-table-column
label="剂量单位"
align="center"
prop="doseUnitCode_dictText"
/> -->
<el-table-column
label="生产厂家"
align="center"
prop="manufacturerText"
/>
</el-table>
</div>
</template>
<script setup>
import {getMedicineList} from "./purchaseinventory";
import {watch} from "vue";
import {throttle} from "lodash-es";
const props = defineProps({
searchKey: {
type: String,
default: "",
},
itemType: {
type: String,
default: "",
},
});
const emit = defineEmits(["selectRow"]);
const queryParams = ref({
pageNum: 1,
pageSize: 50,
itemType: props.itemType,
});
const medicineList = ref([]);
// 节流函数
const throttledGetList = throttle(
() => {
getList();
},
300,
{ leading: true, trailing: true }
);
watch(
() => props,
(newValue) => {
queryParams.value.searchKey = newValue.searchKey;
queryParams.value.itemType = newValue.itemType;
throttledGetList();
},
{ immdiate: true, deep: true }
);
getList();
function getList() {
getMedicineList(queryParams.value).then((res) => {
medicineList.value = res.data;
});
}
function clickRow(row) {
emit("selectRow", row);
}
</script>
<style scoped>
</style>

View File

@@ -0,0 +1,149 @@
import request from '@/utils/request'
// 查询采购入库列表
export function getPurchaseinventoryList(query) {
return request({
url: '/inventory-manage/purchase/inventory-receipt-page',
method: 'get',
params: query
})
}
// 入库单据详情
export function getpurchaseInventoryDetail(busNo) {
return request({
url: '/inventory-manage/purchase/inventory-receipt',
method: 'get',
params: { busNo } // 确保参数正确传递
})
}
// 添加/编辑入库单据
export function addPurchaseInventory(data) {
return request({
url: '/inventory-manage/purchase/inventory-receipt',
method: 'put',
data: data
})
}
// 查询采购入库单据初始化数据
export function getInit() {
return request({
url: '/inventory-manage/purchase/init',
method: 'get'
})
}
// 查询busNo
export function getInitBusNo() {
return request({
url: '/inventory-manage/purchase/bus-no-init',
method: 'get'
})
}
// 删除单据(根据供应请求 ID
export function delPurchaseinventory(param) {
return request({
url: '/inventory-manage/purchase/inventory-receipt?supplyRequestIds=' + param,
method: 'delete',
})
}
// 删除单据(根据单据号)
export function delPurchaseinventoryByBusNo(busNoList) {
return request({
url: '/inventory-manage/purchase/inventory-receipt-by-bus-no?busNoList=' + busNoList,
method: 'delete',
})
}
// 提交审批
export function submitApproval(busNo) {
return request({
url: '/inventory-manage/purchase/submit-approval',
method: 'put',
data: { busNo: busNo }
})
}
// 撤回审批
export function withdrawApproval(busNo) {
return request({
url: '/inventory-manage/purchase/withdraw-approval',
method: 'put',
data: { busNo: busNo }
})
}
// 获取药品目录
export function getMedicineList(queryParams) {
return request({
url: '/app-common/inventory-item',
method: 'get',
params: queryParams
})
}
// 获取药品目录
export function getCount(queryParams) {
return request({
url: '/inventory-manage/purchase/inventory-item-info',
method: 'get',
params: queryParams
})
}
// 获取药房列表
export function getPharmacyList() {
return request({
url: '/app-common/pharmacy-list',
method: 'get',
})
}
// 获取药库列表
export function getDispensaryList() {
return request({
url: '/app-common/cabinet-list',
method: 'get',
})
}
// 查询已退库单列表详情
export function generatedReturnDetail(busNo) {
return request({
url: '/inventory-manage/return/generated-return-detail',
method: 'get',
params: { busNo }
})
}
// 查询已退库单详情
export function getpurchaseInventoryDetailReturn(busNo) {
return request({
url: '/inventory-manage/return/return-detail',
method: 'get',
params: { busNo }
})
}
// 退库提交审批
export function submitApprovalReturn(busNo) {
return request({
url: '/inventory-manage/return/return-submit-approval',
method: 'put',
data: { busNo: busNo }
})
}
// 退库撤回审批
export function withdrawApprovalReturn(busNo) {
return request({
url: '/inventory-manage/return/return-withdraw-approval',
method: 'put',
data: { busNo: busNo } // 修复:发送对象而不是字符串
})
}