From a1e07a204b58bc2da5e72461ae02dfb6363ee2d5 Mon Sep 17 00:00:00 2001 From: chenqi Date: Tue, 30 Dec 2025 00:02:59 +0800 Subject: [PATCH] =?UTF-8?q?```=20refactor(db):=20=E7=A7=BB=E9=99=A4SQL?= =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E4=B8=AD=E7=9A=84public=20schema=E5=89=8D?= =?UTF-8?q?=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MedicineSummaryAppServiceImpl.java | 23 - ...SummaryDispenseMedicineAppServiceImpl.java | 42 - openhis-server-new/core-admin/pom.xml | 8 +- .../controller/common/CaptchaController.java | 24 +- .../controller/common/CommonController.java | 24 +- .../common/FileUploadController.java | 15 +- .../controller/monitor/CacheController.java | 11 +- .../controller/monitor/ServerController.java | 5 +- .../monitor/SysLogininforController.java | 20 +- .../monitor/SysOperlogController.java | 14 +- .../monitor/SysUserOnlineController.java | 17 +- .../system/SysConfigController.java | 16 +- .../controller/system/SysDeptController.java | 15 +- .../system/SysDictDataController.java | 18 +- .../system/SysDictTypeController.java | 16 +- .../controller/system/SysIndexController.java | 7 +- .../controller/system/SysLoginController.java | 17 +- .../controller/system/SysMenuController.java | 13 +- .../system/SysNoticeController.java | 13 +- .../controller/system/SysPostController.java | 16 +- .../system/SysProfileController.java | 7 +- .../system/SysRegisterController.java | 9 +- .../controller/system/SysRoleController.java | 16 +- .../system/SysTenantController.java | 11 +- .../system/SysTenantOptionController.java | 11 +- .../controller/system/SysUserController.java | 22 +- .../web/controller/tool/TestController.java | 14 +- .../core/web/core/config/SwaggerConfig.java | 14 +- openhis-server-new/core-common/pom.xml | 36 +- .../core/common/annotation/DataSource.java | 4 +- .../com/core/common/annotation/Excel.java | 9 +- .../java/com/core/common/annotation/Log.java | 4 +- .../core/common/annotation/RateLimiter.java | 4 +- .../com/core/common/annotation/Sensitive.java | 10 +- .../serializer/SensitiveJsonSerializer.java | 6 +- .../com/core/common/constant/Constants.java | 4 +- .../core/controller/BaseController.java | 17 +- .../core/common/core/domain/AjaxResult.java | 6 +- .../core/common/core/domain/BaseEntity.java | 10 +- .../common/core/domain/HisBaseEntity.java | 7 +- .../java/com/core/common/core/domain/R.java | 4 +- .../core/common/core/domain/TreeSelect.java | 8 +- .../common/core/domain/entity/SysDept.java | 12 +- .../core/domain/entity/SysDictData.java | 11 +- .../core/domain/entity/SysDictType.java | 13 +- .../common/core/domain/entity/SysMenu.java | 12 +- .../common/core/domain/entity/SysRole.java | 16 +- .../common/core/domain/entity/SysUser.java | 22 +- .../common/core/domain/model/LoginUser.java | 18 +- .../core/common/core/redis/RedisCache.java | 11 +- .../com/core/common/core/text/CharsetKit.java | 4 +- .../com/core/common/core/text/Convert.java | 7 +- .../java/com/core/common/enums/DelFlag.java | 13 + .../core/common/enums/DesensitizedType.java | 4 +- .../com/core/common/enums/HttpMethod.java | 4 +- .../core/common/filter/RepeatableFilter.java | 8 +- .../filter/RepeatedlyRequestWrapper.java | 13 +- .../com/core/common/filter/XssFilter.java | 11 +- .../filter/XssHttpServletRequestWrapper.java | 16 +- .../com/core/common/utils/AssignSeqUtil.java | 11 +- .../java/com/core/common/utils/DateUtils.java | 4 +- .../java/com/core/common/utils/DictUtils.java | 6 +- .../com/core/common/utils/ExceptionUtil.java | 4 +- .../com/core/common/utils/MessageUtils.java | 3 +- .../com/core/common/utils/NewExcelUtil.java | 52 +- .../com/core/common/utils/SecurityUtils.java | 17 +- .../com/core/common/utils/ServletUtils.java | 22 +- .../com/core/common/utils/StringUtils.java | 7 +- .../java/com/core/common/utils/Threads.java | 4 +- .../java/com/core/common/utils/TimeUtils.java | 12 +- .../common/utils/bean/BeanValidators.java | 3 +- .../core/common/utils/file/FileTypeUtils.java | 4 +- .../common/utils/file/FileUploadUtils.java | 15 +- .../com/core/common/utils/file/FileUtils.java | 20 +- .../core/common/utils/file/ImageUtils.java | 15 +- .../core/common/utils/http/HttpHelper.java | 11 +- .../com/core/common/utils/http/HttpUtils.java | 14 +- .../core/common/utils/ip/AddressUtils.java | 5 +- .../com/core/common/utils/ip/IpUtils.java | 9 +- .../com/core/common/utils/poi/ExcelUtil.java | 54 +- .../common/utils/reflect/ReflectUtils.java | 9 +- .../com/core/common/utils/sign/Md5Utils.java | 6 +- .../core/common/utils/spring/SpringUtils.java | 3 +- .../java/com/core/common/utils/uuid/Seq.java | 4 +- .../java/com/core/common/utils/uuid/UUID.java | 4 +- .../main/java/com/core/common/xss/Xss.java | 5 +- .../com/core/common/xss/XssValidator.java | 7 +- .../framework/config/MybatisPlusConfig.java | 47 +- .../handler/MybastisColumnsHandler.java | 43 +- .../java/com/core/quartz/util/CronUtils.java | 4 +- .../com/core/system/domain/SysTenant.java | 8 + .../java/com/openhis/OpenHisApplication.java | 9 + .../web/ybmanage/config/YbServiceConfig.java | 4 - .../src/main/resources/application.yml | 2 +- .../src/main/resources/banner.txt | 14 +- .../administration/domain/BizUser.java | 4 +- .../administration/domain/BizUserRole.java | 3 + .../administration/domain/Invoice.java | 85 +- .../administration/domain/InvoiceSegment.java | 227 ++- .../impl/InvoiceSegmentServiceImpl.java | 1 - .../service/impl/InvoiceServiceImpl.java | 39 +- .../administration/InstrumentMapper.xml | 4 - .../administration/PatientStudentMapper.xml | 4 - openhis-server-new/openhis-miniapp/pom.xml | 6 +- openhis-server-new/pom.xml | 20 +- openhis-ui-vue3/index.html | 2 +- openhis-ui-vue3/package-lock.json | 1325 ++++++++++++----- openhis-ui-vue3/src/api/public.js | 130 +- openhis-ui-vue3/src/main.js | 2 - openhis-ui-vue3/src/utils/validate.js | 2 +- .../components/outpatientregistration.js | 11 + .../views/clinicmanagement/disposal/index.vue | 54 +- .../clinicmanagement/returnDrug/index.vue | 2 +- .../components/adviceBaseList.vue | 19 - .../src/views/doctorstation/components/api.js | 10 - .../components/eprescriptiondialog.vue | 4 +- .../prescription/prescriptionlist.vue | 448 +----- .../components/MedicationDetails.vue | 4 +- .../components/MedicationTable.vue | 2 +- .../components/ReturnDrug.vue | 2 +- .../components/medicalRecordFirst.vue | 8 +- .../register/components/patientRegister.vue | 2 +- .../components/home/components/receipt.vue | 2 +- .../settlement/components/home/index.vue | 16 +- .../bloodTtransfusionAapplication.vue | 2 +- .../applicationShow/examineApplication.vue | 2 +- .../applicationShow/nursingStatus.vue | 18 +- .../applicationShow/surgeryApplication.vue | 2 +- .../applicationShow/testApplication.vue | 2 +- .../home/components/diagnosis/diagnosis.vue | 2 +- .../home/components/patientCard.vue | 4 +- .../inOut/components/bedAllocation.vue | 3 +- .../inOut/components/transferOut.vue | 2 +- .../src/views/inpatientNurse/inOut/index.vue | 3 +- .../components/check/patientList.vue | 16 +- .../components/execute/patientList.vue | 16 +- .../inpatientNurse/nursingRecord/index.vue | 4 +- .../nursingstatistics/criticalrecord.vue | 2 +- .../views/inpatientNurse/tprChart/index.vue | 4 +- .../purchaseDocument/index.vue | 8 +- .../returnedPurchase/index.vue | 1 - .../statisticalManagement/index.vue | 20 - .../statisticalManagement/reconciliation.vue | 2 +- .../westernmedicine/components/api.js | 8 - .../westernmedicine/index.vue | 788 +++++----- .../inhospital/register/components/api.js | 11 + 天天开源软件（社区版）许可协议.pdf | Bin 192295 -> 0 bytes ...PUBLIC.doc_statistics ADD COLUMN definition_id.sql | 4 +- ...LE public.doc_statistics ADD COLUMN time_point.sql | 4 +- .../202509021111add_table_doc_order_process.sql | 38 +- .../202509021111add_table_doc_template.sql | 52 +- .../202507311706 wor_aut_supply_request.sql | 114 +- .../202508011554 adm_device_definition.sql | 6 +- .../202508060915 wor_service_request.sql | 4 +- .../202508081428 med_medication_request.sql | 4 +- .../202508081554 fin_payment_rec_static.sql | 2 +- .../202508081601 fin_payment_rec_static.sql | 14 +- .../202508110809 med_medication_request.sql | 4 +- .../202508111126 wor_service_request.sql | 4 +- .../20250902前变更记录/202508111427 cli_procedure.sql | 26 +- .../202508111501 med_medication_request.sql | 8 +- .../202508111526 wor_service_request.sql | 6 +- .../202508151030 med_medication_dispense.sql | 6 +- .../202508171145 doc_request_form.sql | 32 +- .../202508181333 doc_definition.sql | 54 +- .../202508181410 doc_definition_organization.sql | 32 +- .../202508190837 med_medication_dispense.sql | 4 +- .../202508191056 wor_device_dispense.sql | 4 +- .../202508191408 wor_supply_delivery.sql | 6 +- .../20250902前变更记录/202508191539 cli_procedure.sql | 4 +- .../20250902前变更记录/202508201044 adm_frequency.sql | 52 +- .../20250902前变更记录/202508211125 cli_procedure.sql | 4 +- .../20250902前变更记录/202508221059 doc_record.sql | 48 +- .../202508221231 doc_record_log.sql | 36 +- .../20250902前变更记录/202508221455 频次菜单路由.sql | 2 +- .../20250902前变更记录/202508261129 adm_encounter.sql | 4 +- .../20250902前变更记录/202508261536 adm_patient.sql | 4 +- .../202509011447 doc_statistics_definition.sql | 42 +- .../202509011634 doc_statistics_definition_option.sql | 34 +- .../20250902前变更记录/202509011722 doc_template.sql | 52 +- .../202509031200add_table_doc_statistics.sql | 38 +- ...2509031300alter_table_doc_statistics_definiton.sql | 4 +- .../202509040915alter_table_xx_request.sql | 20 +- .../202509041015add_column_wor_service_request.sql | 4 +- .../202509041017 insert_sys_menu.sql | 2 +- ...202509081020add_table_tmp_orders_group_package.sql | 28 +- ...81022add_table_tmp_orders_group_package_detail.sql | 30 +- .../202509101025add_column_adm_practitioner.sql | 4 +- .../202509101030add_column_wor_service_request.sql | 4 +- ...202509161311 add_column_cli_reservation_record.sql | 4 +- .../202509180852 add_column_wor_device_dispense.sql | 4 +- .../202509191411 add_column_tmp_activity_device.sql | 4 +- ...31011 add_table_nd_review_prescription_records.sql | 32 +- ...09261212 add_column _doc_statistics_definition.sql | 6 +- ...02510131311 add_column_elep_medication_request.sql | 6 +- .../202510131411 add_column_adm_charge_item.sql | 4 +- .../202510151011 alter_table_request.sql | 24 +- ...0151413 add_talble_cli_condition_no_definition.sql | 26 +- ...012 add_column_tmp_orders_group_package_detail.sql | 16 +- ...02510211414 add_column_med_medication_dispense.sql | 4 +- ...2510211414 alter_table_med_medication_dispense.sql | 4 +- .../202510211511 alter_column_wor_supply_delivery.sql | 2 +- ...011 add_column_tmp_orders_group_package_detail.sql | 4 +- ...d_medication_definition&med_medication_request.sql | 8 +- .../202510271311 add_column_requests.sql | 12 +- .../202510281101 add_column_adm_practitioner.sql | 4 +- ...202510301113 add_column adm_healthcare_service.sql | 4 +- ...415 add_column tmp_orders_group_package_detail.sql | 4 +- .../202511031515 add_column adm_charge_item.sql | 8 +- ...2511041214 add_table doc_inventory_item_static.sql | 80 +- ...202511051215 add_table adm_change_price_record.sql | 56 +- ...2511131215 add_table doc_inventory_item_static.sql | 54 +- ...202511171215 add_table tmp_encounter_auto_roll.sql | 32 +- ...TABLE PUBLIC.doc_record ADD COLUMN print_count.sql | 6 +- ...11191303 alter_table doc_statistics_definition.sql | 4 +- .../202511191403 alter_table doc_statistics.sql | 4 +- ...11201011 alter_table doc_inventory_item_static.sql | 2 +- .../202511201214 alter_table wor_inventory_item.sql | 2 +- ...2511201516 alter_table tmp_encounter_auto_roll.sql | 8 +- .../202511211515 alter_table doc_statistics.sql | 4 +- .../202511211815 alter_table doc_statistics.sql | 2 +- ...2511221516 alter_table cli_allergy_intolerance.sql | 12 +- ...11271311 alter_table adm_organization_location.sql | 4 +- .../202511281422 inset_sys_menu.sql | 2 +- .../202512020818 add_column_adm_charge_item.sql | 6 +- ...2041212 add_table fin_three_part_pay_call_back.sql | 68 +- .../202512121015 add_column _wor_supply_request.sql | 4 +- ...512131015 add_column_adm_charge_item_defintion.sql | 4 +- ...512131115 add_column_med_medication_definition.sql | 4 +- ...512151415 add_column_doc_inventory_item_static.sql | 2 +- .../202512241111 add_column_adm_account.sql | 4 +- .../add_organization_fields.sql | 16 - 迁移记录-DB变更记录/新增报表.sql | 34 +- 迁移记录-DB变更记录/注释.sql | 12 +- 234 files changed, 3200 insertions(+), 2831 deletions(-) delete mode 100644 his/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java delete mode 100644 his/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java delete mode 100644 天天开源软件（社区版）许可协议.pdf diff --git a/his/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java b/his/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java deleted file mode 100644 index 52d40b0e..00000000 --- a/his/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/MedicineSummaryAppServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ - /** - * 取消汇总 - * - * @param summaryNo 汇总单号 - * @return 处理结果 - */ - @Override - public R cancelSummary(String summaryNo) { - // 取消汇总申请（软删除） - List requestIdList = supplyRequestService.cancelSummarySupplyRequest(List.of(summaryNo)); - if (requestIdList.isEmpty()) { - return R.fail("取消汇总申请失败"); - } - // 软删除汇总发放 - supplyDeliveryService.deleteSupplyDeliveryByReqId(requestIdList); - // 取消药品汇总 - boolean result = medicationDispenseService.cancelMedicationSummary(List.of(summaryNo)); - if (!result) { - return R.fail("取消汇总申请失败"); - } - return R.ok(MessageUtils.createMessage(PromptMsgConstant.Common.M00004, new Object[]{"取消"})); - } -} \ No newline at end of file diff --git a/his/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java b/his/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java deleted file mode 100644 index 59839479..00000000 --- a/his/openhis-server-new/openhis-application/src/main/java/com/openhis/web/pharmacymanage/appservice/impl/SummaryDispenseMedicineAppServiceImpl.java +++ /dev/null @@ -1,42 +0,0 @@ - @Resource - private IMedicationDispenseService medicationDispenseService; - - @Resource - private ReturnMedicineMapper returnMedicineMapper; - - @Resource - private ISupplyRequestService supplyRequestService; - - @Resource - private ISupplyDeliveryService supplyDeliveryService; - - @Resource - private ITraceNoManageService traceNoManageService; - - @Resource - private IInventoryItemService inventoryItemService; - - @Resource - private IMedicationDefinitionService medicationDefinitionService; - - @Resource - private ReceiptApprovalAppServiceImpl receiptApprovalAppService; - - @Resource - private WesternMedicineDispenseAppServiceImpl westernMedicineDispenseAppService; - - @Resource - private WesternMedicineDispenseMapper westernMedicineDispenseMapper; - - @Resource - private IOrganizationService organizationService; - - @Resource - private AdviceProcessAppMapper adviceProcessAppMapper; - - - - - - @Resource - private MedicationRequestServiceImpl medicationRequestService; diff --git a/openhis-server-new/core-admin/pom.xml b/openhis-server-new/core-admin/pom.xml index 10d95504..83e64046 100644 --- a/openhis-server-new/core-admin/pom.xml +++ b/openhis-server-new/core-admin/pom.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/POM/4.0.0" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.openhis openhis-server @@ -41,7 +41,6 @@ io.swagger swagger-models - 1.6.2 @@ -77,9 +76,8 @@ com.core core-common + compile - - \ No newline at end of file diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java index d2963a77..39059149 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CaptchaController.java @@ -1,18 +1,5 @@ package com.core.web.controller.common; -import java.awt.image.BufferedImage; -import java.io.IOException; -import java.util.concurrent.TimeUnit; - -import javax.annotation.Resource; -import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.FastByteArrayOutputStream; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - import com.core.common.config.CoreConfig; import com.core.common.constant.CacheConstants; import com.core.common.constant.Constants; @@ -22,6 +9,17 @@ import com.core.common.utils.sign.Base64; import com.core.common.utils.uuid.IdUtils; import com.core.system.service.ISysConfigService; import com.google.code.kaptcha.Producer; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.FastByteArrayOutputStream; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.concurrent.TimeUnit; /** * 验证码操作处理 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java index 4da58e79..a6afbc9b 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/CommonController.java @@ -1,11 +1,12 @@ package com.core.web.controller.common; -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.core.common.config.CoreConfig; +import com.core.common.constant.Constants; +import com.core.common.core.domain.AjaxResult; +import com.core.common.utils.StringUtils; +import com.core.common.utils.file.FileUploadUtils; +import com.core.common.utils.file.FileUtils; +import com.core.framework.config.ServerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -16,13 +17,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.core.common.config.CoreConfig; -import com.core.common.constant.Constants; -import com.core.common.core.domain.AjaxResult; -import com.core.common.utils.StringUtils; -import com.core.common.utils.file.FileUploadUtils; -import com.core.common.utils.file.FileUtils; -import com.core.framework.config.ServerConfig; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; /** * 通用请求处理 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/FileUploadController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/FileUploadController.java index 64c6476e..08b8973f 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/FileUploadController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/common/FileUploadController.java @@ -1,13 +1,5 @@ package com.core.web.controller.common; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - import com.core.common.annotation.Anonymous; import com.core.common.config.CoreConfig; import com.core.common.core.domain.AjaxResult; @@ -16,6 +8,13 @@ import com.core.common.utils.StringUtils; import com.core.common.utils.file.FileUploadUtils; import com.core.common.utils.file.FileUtils; import com.core.framework.config.ServerConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; @RestController @RequestMapping("/file") diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/CacheController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/CacheController.java index 5371fe9c..363e67a2 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/CacheController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/CacheController.java @@ -1,17 +1,16 @@ package com.core.web.controller.monitor; -import java.util.*; - +import com.core.common.constant.CacheConstants; +import com.core.common.core.domain.AjaxResult; +import com.core.common.utils.StringUtils; +import com.core.system.domain.SysCache; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; -import com.core.common.constant.CacheConstants; -import com.core.common.core.domain.AjaxResult; -import com.core.common.utils.StringUtils; -import com.core.system.domain.SysCache; +import java.util.*; /** * 缓存监控 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/ServerController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/ServerController.java index 6e95fcc0..7985ffbd 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/ServerController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/ServerController.java @@ -1,13 +1,12 @@ package com.core.web.controller.monitor; +import com.core.common.core.domain.AjaxResult; +import com.core.framework.web.domain.Server; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.core.common.core.domain.AjaxResult; -import com.core.framework.web.domain.Server; - /** * 服务器监控 * diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java index 211e4284..3df917fa 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysLogininforController.java @@ -1,13 +1,5 @@ package com.core.web.controller.monitor; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -17,15 +9,23 @@ import com.core.common.utils.poi.ExcelUtil; import com.core.framework.web.service.SysPasswordService; import com.core.system.domain.SysLogininfor; import com.core.system.service.ISysLogininforService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** - * 系统访问记录 - * + * + * * @author system */ @RestController @RequestMapping("/monitor/logininfor") + public class SysLogininforController extends BaseController { + @Autowired private ISysLogininforService logininforService; diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java index 1ad2bef8..9cff4ec6 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysOperlogController.java @@ -1,13 +1,5 @@ package com.core.web.controller.monitor; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -16,6 +8,12 @@ import com.core.common.enums.BusinessType; import com.core.common.utils.poi.ExcelUtil; import com.core.system.domain.SysOperLog; import com.core.system.service.ISysOperLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 操作日志记录 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysUserOnlineController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysUserOnlineController.java index 1a21fc9f..63a28658 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysUserOnlineController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/monitor/SysUserOnlineController.java @@ -1,14 +1,5 @@ package com.core.web.controller.monitor; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.constant.CacheConstants; import com.core.common.core.controller.BaseController; @@ -20,6 +11,14 @@ import com.core.common.enums.BusinessType; import com.core.common.utils.StringUtils; import com.core.system.domain.SysUserOnline; import com.core.system.service.ISysUserOnlineService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; /** * 在线用户监控 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java index 4aee3c3e..1f35a99d 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysConfigController.java @@ -1,14 +1,5 @@ package com.core.web.controller.system; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -17,6 +8,13 @@ import com.core.common.enums.BusinessType; import com.core.common.utils.poi.ExcelUtil; import com.core.system.domain.SysConfig; import com.core.system.service.ISysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 参数配置 信息操作处理 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDeptController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDeptController.java index 97e375cc..e0191655 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDeptController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDeptController.java @@ -1,13 +1,5 @@ package com.core.web.controller.system; -import java.util.List; - -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.constant.UserConstants; import com.core.common.core.controller.BaseController; @@ -16,6 +8,13 @@ import com.core.common.core.domain.entity.SysDept; import com.core.common.enums.BusinessType; import com.core.common.utils.StringUtils; import com.core.system.service.ISysDeptService; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 部门信息 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java index 40728ed6..def59ab9 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictDataController.java @@ -1,15 +1,5 @@ package com.core.web.controller.system; -import java.util.ArrayList; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -20,6 +10,14 @@ import com.core.common.utils.StringUtils; import com.core.common.utils.poi.ExcelUtil; import com.core.system.service.ISysDictDataService; import com.core.system.service.ISysDictTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.List; /** * 数据字典信息 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java index 48e8eca1..e26b5f0c 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysDictTypeController.java @@ -1,14 +1,5 @@ package com.core.web.controller.system; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -17,6 +8,13 @@ import com.core.common.core.page.TableDataInfo; import com.core.common.enums.BusinessType; import com.core.common.utils.poi.ExcelUtil; import com.core.system.service.ISysDictTypeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 数据字典信息 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysIndexController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysIndexController.java index 4fba9fd5..a668df12 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysIndexController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysIndexController.java @@ -1,11 +1,10 @@ package com.core.web.controller.system; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - import com.core.common.config.CoreConfig; import com.core.common.utils.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 首页 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java index 978e48f6..0d7604cc 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysLoginController.java @@ -1,14 +1,5 @@ package com.core.web.controller.system; -import java.util.List; -import java.util.Set; - -import org.springframework.beans.factory.annotation.Autowired; -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 com.core.common.constant.Constants; import com.core.common.core.domain.AjaxResult; import com.core.common.core.domain.entity.SysMenu; @@ -20,6 +11,14 @@ import com.core.framework.web.service.SysLoginService; import com.core.framework.web.service.SysPermissionService; import com.core.framework.web.service.TokenService; import com.core.system.service.ISysMenuService; +import org.springframework.beans.factory.annotation.Autowired; +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 java.util.List; +import java.util.Set; /**已评审 * 登录验证 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysMenuController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysMenuController.java index 7c3cdb79..d30b9130 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysMenuController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysMenuController.java @@ -1,12 +1,5 @@ package com.core.web.controller.system; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.constant.UserConstants; import com.core.common.core.controller.BaseController; @@ -15,6 +8,12 @@ import com.core.common.core.domain.entity.SysMenu; import com.core.common.enums.BusinessType; import com.core.common.utils.StringUtils; import com.core.system.service.ISysMenuService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 菜单信息 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java index 9a0b6380..f4b4d9e5 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysNoticeController.java @@ -1,12 +1,5 @@ package com.core.web.controller.system; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -14,6 +7,12 @@ import com.core.common.core.page.TableDataInfo; import com.core.common.enums.BusinessType; import com.core.system.domain.SysNotice; import com.core.system.service.ISysNoticeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 公告 信息操作处理 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java index 69db8eb9..a2628c33 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysPostController.java @@ -1,14 +1,5 @@ package com.core.web.controller.system; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -17,6 +8,13 @@ import com.core.common.enums.BusinessType; import com.core.common.utils.poi.ExcelUtil; import com.core.system.domain.SysPost; import com.core.system.service.ISysPostService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 岗位信息操作处理 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysProfileController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysProfileController.java index ea6d971e..1b0c4ae3 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysProfileController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysProfileController.java @@ -1,9 +1,5 @@ package com.core.web.controller.system; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - import com.core.common.annotation.Log; import com.core.common.config.CoreConfig; import com.core.common.core.controller.BaseController; @@ -17,6 +13,9 @@ import com.core.common.utils.file.FileUploadUtils; import com.core.common.utils.file.MimeTypeUtils; import com.core.framework.web.service.TokenService; import com.core.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; /** * 个人信息 业务处理 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRegisterController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRegisterController.java index 1c1b93a8..afdaaab0 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRegisterController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRegisterController.java @@ -1,16 +1,15 @@ package com.core.web.controller.system; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; import com.core.common.core.domain.model.RegisterBody; import com.core.common.utils.StringUtils; import com.core.framework.web.service.SysRegisterService; import com.core.system.service.ISysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; /** * 注册验证 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java index e2adf0de..7138d638 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysRoleController.java @@ -1,14 +1,5 @@ package com.core.web.controller.system; -import java.util.List; - -import javax.servlet.http.HttpServletResponse; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -26,6 +17,13 @@ import com.core.system.domain.SysUserRole; import com.core.system.service.ISysDeptService; import com.core.system.service.ISysRoleService; import com.core.system.service.ISysUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 角色信息 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java index f08e4751..8466e398 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantController.java @@ -1,11 +1,5 @@ package com.core.web.controller.system; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import com.baomidou.mybatisplus.core.metadata.IPage; import com.core.common.annotation.Anonymous; import com.core.common.core.controller.BaseController; @@ -13,6 +7,11 @@ import com.core.common.core.domain.R; import com.core.common.core.domain.entity.SysUser; import com.core.system.domain.SysTenant; import com.core.system.service.ISysTenantService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 租户信息controller diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java index 103f4663..0e8d0d02 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysTenantOptionController.java @@ -1,16 +1,15 @@ package com.core.web.controller.system; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; - import com.core.common.core.controller.BaseController; import com.core.common.core.domain.R; import com.core.system.domain.dto.SaveTenantOptionDetailDto; import com.core.system.domain.dto.TenantOptionDto; import com.core.system.service.ISysTenantOptionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 租户配置项信息controller diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java index 32cfcd13..87592da0 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/system/SysUserController.java @@ -1,17 +1,5 @@ package com.core.web.controller.system; -import java.util.List; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - import com.core.common.annotation.Log; import com.core.common.core.controller.BaseController; import com.core.common.core.domain.AjaxResult; @@ -27,6 +15,16 @@ import com.core.system.service.ISysDeptService; import com.core.system.service.ISysPostService; import com.core.system.service.ISysRoleService; import com.core.system.service.ISysUserService; +import org.apache.commons.lang3.ArrayUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.stream.Collectors; /** * 用户信息 diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java index b3414309..959ee1d7 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/controller/tool/TestController.java @@ -1,18 +1,16 @@ package com.core.web.controller.tool; +import com.core.common.core.controller.BaseController; +import com.core.common.core.domain.R; +import com.core.common.utils.StringUtils; +import io.swagger.annotations.*; +import org.springframework.web.bind.annotation.*; + import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.springframework.web.bind.annotation.*; - -import com.core.common.core.controller.BaseController; -import com.core.common.core.domain.R; -import com.core.common.utils.StringUtils; - -import io.swagger.annotations.*; - /** * swagger 用户测试方法 * diff --git a/openhis-server-new/core-admin/src/main/java/com/core/web/core/config/SwaggerConfig.java b/openhis-server-new/core-admin/src/main/java/com/core/web/core/config/SwaggerConfig.java index 03b490b6..61c499d3 100644 --- a/openhis-server-new/core-admin/src/main/java/com/core/web/core/config/SwaggerConfig.java +++ b/openhis-server-new/core-admin/src/main/java/com/core/web/core/config/SwaggerConfig.java @@ -1,17 +1,12 @@ package com.core.web.core.config; -import java.util.ArrayList; -import java.util.List; - +import com.core.common.config.CoreConfig; +import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; - -import com.core.common.config.CoreConfig; - -import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.RequestHandlerSelectors; @@ -20,6 +15,9 @@ import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.service.contexts.SecurityContext; import springfox.documentation.spring.web.plugins.Docket; +import java.util.ArrayList; +import java.util.List; + /** * Swagger2的接口配置 * diff --git a/openhis-server-new/core-common/pom.xml b/openhis-server-new/core-common/pom.xml index 19132d79..3c971656 100644 --- a/openhis-server-new/core-common/pom.xml +++ b/openhis-server-new/core-common/pom.xml @@ -16,6 +16,31 @@ common通用工具 + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 17 + 17 + UTF-8 + + -parameters + + + + org.projectlombok + lombok + 1.18.34 + + + + + + + @@ -54,6 +79,12 @@ pagehelper-spring-boot-starter + + + javax.annotation + javax.annotation-api + + org.springframework.boot @@ -144,11 +175,6 @@ gson - - com.google.code.gson - gson - - \ No newline at end of file diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/DataSource.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/DataSource.java index a52b7b96..71b1cecc 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/DataSource.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/DataSource.java @@ -1,9 +1,9 @@ package com.core.common.annotation; -import java.lang.annotation.*; - import com.core.common.enums.DataSourceType; +import java.lang.annotation.*; + /** * 自定义多数据源切换注解 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Excel.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Excel.java index 16462df0..f3f2c0d5 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Excel.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Excel.java @@ -1,16 +1,15 @@ package com.core.common.annotation; +import com.core.common.utils.poi.ExcelHandlerAdapter; +import org.apache.poi.ss.usermodel.HorizontalAlignment; +import org.apache.poi.ss.usermodel.IndexedColors; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.math.BigDecimal; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.usermodel.IndexedColors; - -import com.core.common.utils.poi.ExcelHandlerAdapter; - /** * 自定义导出Excel数据注解 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Log.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Log.java index f025cd5f..bf9a95b1 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Log.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Log.java @@ -1,10 +1,10 @@ package com.core.common.annotation; -import java.lang.annotation.*; - import com.core.common.enums.BusinessType; import com.core.common.enums.OperatorType; +import java.lang.annotation.*; + /** * 自定义操作日志记录注解 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/RateLimiter.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/RateLimiter.java index 3c09be86..efa42e16 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/RateLimiter.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/RateLimiter.java @@ -1,10 +1,10 @@ package com.core.common.annotation; -import java.lang.annotation.*; - import com.core.common.constant.CacheConstants; import com.core.common.enums.LimitType; +import java.lang.annotation.*; + /** * 限流注解 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Sensitive.java b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Sensitive.java index 0aadff3f..731a994a 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Sensitive.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/annotation/Sensitive.java @@ -1,15 +1,15 @@ package com.core.common.annotation; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - import com.core.common.config.serializer.SensitiveJsonSerializer; import com.core.common.enums.DesensitizedType; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + /** * 数据脱敏注解 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/config/serializer/SensitiveJsonSerializer.java b/openhis-server-new/core-common/src/main/java/com/core/common/config/serializer/SensitiveJsonSerializer.java index 25a89139..2b475251 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/config/serializer/SensitiveJsonSerializer.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/config/serializer/SensitiveJsonSerializer.java @@ -1,8 +1,5 @@ package com.core.common.config.serializer; -import java.io.IOException; -import java.util.Objects; - import com.core.common.annotation.Sensitive; import com.core.common.core.domain.model.LoginUser; import com.core.common.enums.DesensitizedType; @@ -14,6 +11,9 @@ import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; +import java.io.IOException; +import java.util.Objects; + /** * 数据脱敏序列化过滤 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/constant/Constants.java b/openhis-server-new/core-common/src/main/java/com/core/common/constant/Constants.java index dbf20835..e63a05c3 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/constant/Constants.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/constant/Constants.java @@ -1,9 +1,9 @@ package com.core.common.constant; -import java.util.Locale; - import io.jsonwebtoken.Claims; +import java.util.Locale; + /** * 通用常量信息 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/controller/BaseController.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/controller/BaseController.java index bd7e26a8..c0cb9bf3 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/controller/BaseController.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/controller/BaseController.java @@ -1,14 +1,5 @@ package com.core.common.core.controller; -import java.beans.PropertyEditorSupport; -import java.util.Date; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; - import com.core.common.constant.HttpStatus; import com.core.common.core.domain.AjaxResult; import com.core.common.core.domain.model.LoginUser; @@ -22,6 +13,14 @@ import com.core.common.utils.StringUtils; import com.core.common.utils.sql.SqlUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; + +import java.beans.PropertyEditorSupport; +import java.util.Date; +import java.util.List; /** * web层通用数据处理 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/AjaxResult.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/AjaxResult.java index 52da6e8d..7927818b 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/AjaxResult.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/AjaxResult.java @@ -1,11 +1,11 @@ package com.core.common.core.domain; -import java.util.HashMap; -import java.util.Objects; - import com.core.common.constant.HttpStatus; import com.core.common.utils.StringUtils; +import java.util.HashMap; +import java.util.Objects; + /** * 操作消息提醒 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/BaseEntity.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/BaseEntity.java index d51a2f8e..3afc9bc8 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/BaseEntity.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/BaseEntity.java @@ -1,15 +1,15 @@ package com.core.common.core.domain; -import java.io.Serializable; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; - import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + /** * Entity基类 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java index d6d16901..4abb75ca 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/HisBaseEntity.java @@ -1,16 +1,15 @@ package com.core.common.core.domain; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; - import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; +import java.util.Date; + /** * Entity基类 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/R.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/R.java index 3f18b571..226fd058 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/R.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/R.java @@ -1,9 +1,9 @@ package com.core.common.core.domain; -import java.io.Serializable; - import com.core.common.constant.HttpStatus; +import java.io.Serializable; + /** * 响应信息主体 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/TreeSelect.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/TreeSelect.java index 8f215e1a..f65d26b2 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/TreeSelect.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/TreeSelect.java @@ -1,13 +1,13 @@ package com.core.common.core.domain; -import java.io.Serializable; -import java.util.List; -import java.util.stream.Collectors; - import com.core.common.core.domain.entity.SysDept; import com.core.common.core.domain.entity.SysMenu; import com.fasterxml.jackson.annotation.JsonInclude; +import java.io.Serializable; +import java.util.List; +import java.util.stream.Collectors; + /** * Treeselect树结构实体类 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java index 9ce39bcd..13967749 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDept.java @@ -1,17 +1,15 @@ package com.core.common.core.domain.entity; -import java.util.ArrayList; -import java.util.List; +import com.core.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import com.core.common.core.domain.BaseEntity; +import java.util.ArrayList; +import java.util.List; /** * 部门表 sys_dept diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java index 82eacaff..286a9263 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictData.java @@ -1,15 +1,14 @@ package com.core.common.core.domain.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.annotation.Excel.ColumnType; import com.core.common.constant.UserConstants; import com.core.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; /** * 字典数据表 sys_dict_data diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java index 8795a4e9..1e5c5878 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysDictType.java @@ -1,15 +1,14 @@ package com.core.common.core.domain.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.annotation.Excel.ColumnType; import com.core.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; /** * 字典类型表 sys_dict_type diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java index ad65e99e..81cbfeaa 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysMenu.java @@ -1,16 +1,14 @@ package com.core.common.core.domain.entity; -import java.util.ArrayList; -import java.util.List; +import com.core.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import com.core.common.core.domain.BaseEntity; +import java.util.ArrayList; +import java.util.List; /** * 菜单权限表 sys_menu diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java index dbc28e3a..e50c62b8 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysRole.java @@ -1,17 +1,15 @@ package com.core.common.core.domain.entity; -import java.util.Set; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import com.core.common.annotation.Excel; import com.core.common.annotation.Excel.ColumnType; import com.core.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.util.Set; /** * 角色表 sys_role diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java index 78653b12..b168386d 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/entity/SysUser.java @@ -1,16 +1,8 @@ package com.core.common.core.domain.entity; -import java.util.Date; -import java.util.List; - -import javax.validation.constraints.Email; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; - -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.core.common.annotation.Excel; import com.core.common.annotation.Excel.ColumnType; import com.core.common.annotation.Excel.Type; @@ -19,8 +11,15 @@ import com.core.common.core.domain.BaseEntity; import com.core.common.xss.Xss; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; - import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; /** * 用户对象 sys_user @@ -32,6 +31,7 @@ public class SysUser extends BaseEntity { private static final long serialVersionUID = 1L; /** 用户ID */ + @TableId(type = IdType.ASSIGN_ID) @Excel(name = "用户序号", type = Type.EXPORT, cellType = ColumnType.NUMERIC, prompt = "用户编号") private Long userId; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java index fcf65657..8a81a2d6 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/domain/model/LoginUser.java @@ -1,20 +1,18 @@ package com.core.common.core.domain.model; +import com.alibaba.fastjson2.JSONObject; +import com.alibaba.fastjson2.annotation.JSONField; +import com.core.common.core.domain.entity.SysRole; +import com.core.common.core.domain.entity.SysUser; +import lombok.Data; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Set; -import com.core.common.core.domain.entity.SysRole; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - -import com.alibaba.fastjson2.JSONObject; -import com.alibaba.fastjson2.annotation.JSONField; -import com.core.common.core.domain.entity.SysUser; - -import lombok.Data; - /** * 登录用户身份权限 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/redis/RedisCache.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/redis/RedisCache.java index 66a23b9a..aa3c12e3 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/redis/RedisCache.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/redis/RedisCache.java @@ -1,13 +1,16 @@ package com.core.common.core.redis; -import java.util.*; -import java.util.concurrent.TimeUnit; - import com.core.common.exception.UtilException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.*; +import org.springframework.data.redis.core.BoundSetOperations; +import org.springframework.data.redis.core.HashOperations; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Component; +import java.util.*; +import java.util.concurrent.TimeUnit; + /** * spring redis 工具类 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/text/CharsetKit.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/text/CharsetKit.java index 53bdcb5e..7a0904be 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/text/CharsetKit.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/text/CharsetKit.java @@ -1,10 +1,10 @@ package com.core.common.core.text; +import com.core.common.utils.StringUtils; + import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.core.common.utils.StringUtils; - /** * 字符集工具类 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/core/text/Convert.java b/openhis-server-new/core-common/src/main/java/com/core/common/core/text/Convert.java index 56990e82..65c2bc97 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/core/text/Convert.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/core/text/Convert.java @@ -1,5 +1,8 @@ package com.core.common.core.text; +import com.core.common.utils.StringUtils; +import org.apache.commons.lang3.ArrayUtils; + import java.math.BigDecimal; import java.math.BigInteger; import java.math.RoundingMode; @@ -8,10 +11,6 @@ import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import org.apache.commons.lang3.ArrayUtils; - -import com.core.common.utils.StringUtils; - /** * 类型转换器 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/enums/DelFlag.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/DelFlag.java index a70e1a9e..d81b098b 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/enums/DelFlag.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/enums/DelFlag.java @@ -39,4 +39,17 @@ public enum DelFlag { } return null; } + + // 手动添加 getter 方法以解决 Lombok 兼容性问题 + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getInfo() { + return info; + } } diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/enums/DesensitizedType.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/DesensitizedType.java index 5b3f141e..ec9c1b32 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/enums/DesensitizedType.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/enums/DesensitizedType.java @@ -1,9 +1,9 @@ package com.core.common.enums; -import java.util.function.Function; - import com.core.common.utils.DesensitizedUtil; +import java.util.function.Function; + /** * 脱敏类型 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/enums/HttpMethod.java b/openhis-server-new/core-common/src/main/java/com/core/common/enums/HttpMethod.java index c5a8b348..4273e5b1 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/enums/HttpMethod.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/enums/HttpMethod.java @@ -1,10 +1,10 @@ package com.core.common.enums; +import org.springframework.lang.Nullable; + import java.util.HashMap; import java.util.Map; -import org.springframework.lang.Nullable; - /** * 请求方式 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java index 7218541a..2986b5c9 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatableFilter.java @@ -1,13 +1,11 @@ package com.core.common.filter; -import java.io.IOException; +import com.core.common.utils.StringUtils; +import org.springframework.http.MediaType; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; - -import org.springframework.http.MediaType; - -import com.core.common.utils.StringUtils; +import java.io.IOException; /** * Repeatable 过滤器 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java index 3db454b4..5f08270a 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/filter/RepeatedlyRequestWrapper.java @@ -1,18 +1,17 @@ package com.core.common.filter; -import java.io.BufferedReader; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStreamReader; +import com.core.common.constant.Constants; +import com.core.common.utils.http.HttpHelper; import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; - -import com.core.common.constant.Constants; -import com.core.common.utils.http.HttpHelper; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; /** * 构建可重复读取inputStream的request diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssFilter.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssFilter.java index 98c0446d..36aac9c4 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssFilter.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssFilter.java @@ -1,15 +1,14 @@ package com.core.common.filter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; +import com.core.common.enums.HttpMethod; +import com.core.common.utils.StringUtils; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import com.core.common.enums.HttpMethod; -import com.core.common.utils.StringUtils; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; /** * 防止XSS攻击的过滤器 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java b/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java index 4fd2572d..3afb53a0 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/filter/XssHttpServletRequestWrapper.java @@ -1,19 +1,17 @@ package com.core.common.filter; -import java.io.ByteArrayInputStream; -import java.io.IOException; +import com.core.common.utils.StringUtils; +import com.core.common.utils.html.EscapeUtil; +import org.apache.commons.io.IOUtils; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; - -import org.apache.commons.io.IOUtils; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; - -import com.core.common.utils.StringUtils; -import com.core.common.utils.html.EscapeUtil; +import java.io.ByteArrayInputStream; +import java.io.IOException; /** * XSS过滤处理 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/AssignSeqUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/AssignSeqUtil.java index 2e0c0496..0312f07a 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/AssignSeqUtil.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/AssignSeqUtil.java @@ -3,16 +3,15 @@ */ package com.core.common.utils; -import java.util.ArrayList; -import java.util.List; - +import com.core.common.constant.CacheConstants; +import com.core.common.core.redis.RedisCache; +import com.core.common.exception.UtilException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import com.core.common.constant.CacheConstants; -import com.core.common.core.redis.RedisCache; -import com.core.common.exception.UtilException; +import java.util.ArrayList; +import java.util.List; /** * 排番组件 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/DateUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/DateUtils.java index 891bf3f8..33ffdda3 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/DateUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/DateUtils.java @@ -1,5 +1,7 @@ package com.core.common.utils; +import org.apache.commons.lang3.time.DateFormatUtils; + import java.lang.management.ManagementFactory; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -9,8 +11,6 @@ import java.time.format.DateTimeParseException; import java.util.Calendar; import java.util.Date; -import org.apache.commons.lang3.time.DateFormatUtils; - /** * 时间工具类 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/DictUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/DictUtils.java index 431ddc56..02b0ce8c 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/DictUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/DictUtils.java @@ -1,14 +1,14 @@ package com.core.common.utils; -import java.util.Collection; -import java.util.List; - import com.alibaba.fastjson2.JSONArray; import com.core.common.constant.CacheConstants; import com.core.common.core.domain.entity.SysDictData; import com.core.common.core.redis.RedisCache; import com.core.common.utils.spring.SpringUtils; +import java.util.Collection; +import java.util.List; + /** * 字典工具类 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ExceptionUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ExceptionUtil.java index 523eb7f4..563c852c 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ExceptionUtil.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ExceptionUtil.java @@ -1,10 +1,10 @@ package com.core.common.utils; +import org.apache.commons.lang3.exception.ExceptionUtils; + import java.io.PrintWriter; import java.io.StringWriter; -import org.apache.commons.lang3.exception.ExceptionUtils; - /** * 错误信息处理类。 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/MessageUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/MessageUtils.java index 1be2b0b0..d212c42d 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/MessageUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/MessageUtils.java @@ -1,9 +1,8 @@ package com.core.common.utils; +import com.core.common.utils.spring.SpringUtils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; - -import com.core.common.utils.spring.SpringUtils; import org.springframework.lang.Nullable; import java.util.Locale; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java index b41f18a0..865355f9 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/NewExcelUtil.java @@ -1,18 +1,19 @@ package com.core.common.utils; -import java.io.*; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletResponse; - +import com.core.common.annotation.Excel; +import com.core.common.annotation.Excel.ColumnType; +import com.core.common.annotation.Excel.Type; +import com.core.common.annotation.ExcelExtra; +import com.core.common.annotation.Excels; +import com.core.common.config.CoreConfig; +import com.core.common.core.domain.AjaxResult; +import com.core.common.core.text.Convert; +import com.core.common.exception.UtilException; +import com.core.common.utils.file.FileTypeUtils; +import com.core.common.utils.file.FileUtils; +import com.core.common.utils.file.ImageUtils; +import com.core.common.utils.poi.ExcelHandlerAdapter; +import com.core.common.utils.reflect.ReflectUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.RegExUtils; import org.apache.commons.lang3.reflect.FieldUtils; @@ -29,20 +30,17 @@ import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.core.common.annotation.Excel; -import com.core.common.annotation.Excel.ColumnType; -import com.core.common.annotation.Excel.Type; -import com.core.common.annotation.ExcelExtra; -import com.core.common.annotation.Excels; -import com.core.common.config.CoreConfig; -import com.core.common.core.domain.AjaxResult; -import com.core.common.core.text.Convert; -import com.core.common.exception.UtilException; -import com.core.common.utils.file.FileTypeUtils; -import com.core.common.utils.file.FileUtils; -import com.core.common.utils.file.ImageUtils; -import com.core.common.utils.poi.ExcelHandlerAdapter; -import com.core.common.utils.reflect.ReflectUtils; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.*; +import java.util.stream.Collectors; /** * Excel相关处理 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java index 67b7fd42..b6814bf6 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/SecurityUtils.java @@ -1,19 +1,18 @@ package com.core.common.utils; -import java.util.Collection; -import java.util.List; -import java.util.stream.Collectors; - -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.util.PatternMatchUtils; - import com.core.common.constant.Constants; import com.core.common.constant.HttpStatus; import com.core.common.core.domain.entity.SysRole; import com.core.common.core.domain.model.LoginUser; import com.core.common.exception.ServiceException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.util.PatternMatchUtils; + +import java.util.Collection; +import java.util.List; +import java.util.stream.Collectors; /** * 安全服务工具类 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ServletUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ServletUtils.java index 1ec2d076..ed5db953 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ServletUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ServletUtils.java @@ -1,5 +1,15 @@ package com.core.common.utils; +import com.core.common.constant.Constants; +import com.core.common.core.text.Convert; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -8,18 +18,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.RequestContextHolder; -import org.springframework.web.context.request.ServletRequestAttributes; - -import com.core.common.constant.Constants; -import com.core.common.core.text.Convert; - /** * 客户端工具类 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/StringUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/StringUtils.java index 88a3449e..6775692c 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/StringUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/StringUtils.java @@ -1,11 +1,10 @@ package com.core.common.utils; -import java.util.*; - -import org.springframework.util.AntPathMatcher; - import com.core.common.constant.Constants; import com.core.common.core.text.StrFormatter; +import org.springframework.util.AntPathMatcher; + +import java.util.*; /** * 字符串工具类 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/Threads.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/Threads.java index e6830a8b..5695f441 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/Threads.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/Threads.java @@ -1,10 +1,10 @@ package com.core.common.utils; -import java.util.concurrent.*; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.concurrent.*; + /** * 线程相关工具类. * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/TimeUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/TimeUtils.java index 0fa72194..ec6798d7 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/TimeUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/TimeUtils.java @@ -1,14 +1,10 @@ package com.core.common.utils; -import org.apache.commons.lang3.time.DateFormatUtils; - -import java.lang.management.ManagementFactory; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.*; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeParseException; -import java.util.Calendar; import java.util.Date; diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java index d1853d46..48d44f8d 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/bean/BeanValidators.java @@ -1,10 +1,9 @@ package com.core.common.utils.bean; -import java.util.Set; - import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; import javax.validation.Validator; +import java.util.Set; /** * bean对象属性验证 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileTypeUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileTypeUtils.java index a78f5460..b3ac82fc 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileTypeUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileTypeUtils.java @@ -1,9 +1,9 @@ package com.core.common.utils.file; -import java.io.File; - import org.apache.commons.lang3.StringUtils; +import java.io.File; + /** * 文件类型工具类 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUploadUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUploadUtils.java index 81545c31..e9ecb9f1 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUploadUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUploadUtils.java @@ -1,13 +1,5 @@ package com.core.common.utils.file; -import java.io.File; -import java.io.IOException; -import java.nio.file.Paths; -import java.util.Objects; - -import org.apache.commons.io.FilenameUtils; -import org.springframework.web.multipart.MultipartFile; - import com.core.common.config.CoreConfig; import com.core.common.constant.Constants; import com.core.common.exception.file.FileNameLengthLimitExceededException; @@ -16,6 +8,13 @@ import com.core.common.exception.file.InvalidExtensionException; import com.core.common.utils.DateUtils; import com.core.common.utils.StringUtils; import com.core.common.utils.uuid.Seq; +import org.apache.commons.io.FilenameUtils; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Paths; +import java.util.Objects; /** * 文件上传工具类 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUtils.java index 12972f37..38ffccca 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/FileUtils.java @@ -1,20 +1,18 @@ package com.core.common.utils.file; -import java.io.*; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.io.FilenameUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.ArrayUtils; - import com.core.common.config.CoreConfig; import com.core.common.utils.DateUtils; import com.core.common.utils.StringUtils; import com.core.common.utils.uuid.IdUtils; +import org.apache.commons.io.FilenameUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.ArrayUtils; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; /** * 文件处理工具类 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/ImageUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/ImageUtils.java index 034d4888..fd469e22 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/ImageUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/file/ImageUtils.java @@ -1,5 +1,12 @@ package com.core.common.utils.file; +import com.core.common.config.CoreConfig; +import com.core.common.constant.Constants; +import com.core.common.utils.StringUtils; +import org.apache.poi.util.IOUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.ByteArrayInputStream; import java.io.FileInputStream; import java.io.InputStream; @@ -7,14 +14,6 @@ import java.net.URL; import java.net.URLConnection; import java.util.Arrays; -import org.apache.poi.util.IOUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.core.common.config.CoreConfig; -import com.core.common.constant.Constants; -import com.core.common.utils.StringUtils; - /** * 图片处理工具类 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java index cd3d28e1..2508c8a3 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpHelper.java @@ -1,17 +1,16 @@ package com.core.common.utils.http; +import org.apache.commons.lang3.exception.ExceptionUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.ServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -import javax.servlet.ServletRequest; - -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * 通用http工具封装 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpUtils.java index 793ad5ca..69864807 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/http/HttpUtils.java @@ -1,5 +1,11 @@ package com.core.common.utils.http; +import com.core.common.constant.Constants; +import com.core.common.utils.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.net.ssl.*; import java.io.*; import java.net.ConnectException; import java.net.SocketTimeoutException; @@ -8,14 +14,6 @@ import java.net.URLConnection; import java.nio.charset.StandardCharsets; import java.security.cert.X509Certificate; -import javax.net.ssl.*; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.core.common.constant.Constants; -import com.core.common.utils.StringUtils; - /** * 通用http发送方法 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/AddressUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/AddressUtils.java index 9f1fbf29..da4103a2 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/AddressUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/AddressUtils.java @@ -1,14 +1,13 @@ package com.core.common.utils.ip; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.core.common.config.CoreConfig; import com.core.common.constant.Constants; import com.core.common.utils.StringUtils; import com.core.common.utils.http.HttpUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * 获取地址类 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java index ff6233f4..40c04eb9 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/ip/IpUtils.java @@ -1,13 +1,12 @@ package com.core.common.utils.ip; -import java.net.InetAddress; -import java.net.UnknownHostException; - -import javax.servlet.http.HttpServletRequest; - import com.core.common.utils.ServletUtils; import com.core.common.utils.StringUtils; +import javax.servlet.http.HttpServletRequest; +import java.net.InetAddress; +import java.net.UnknownHostException; + /** * 获取IP方法 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java index 47d3a3b0..37d11183 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/poi/ExcelUtil.java @@ -1,33 +1,5 @@ package com.core.common.utils.poi; -import java.io.*; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.math.BigDecimal; -import java.text.DecimalFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.util.*; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.RegExUtils; -import org.apache.commons.lang3.reflect.FieldUtils; -import org.apache.poi.hssf.usermodel.*; -import org.apache.poi.ooxml.POIXMLDocumentPart; -import org.apache.poi.ss.usermodel.*; -import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.ss.util.CellRangeAddressList; -import org.apache.poi.util.IOUtils; -import org.apache.poi.xssf.streaming.SXSSFWorkbook; -import org.apache.poi.xssf.usermodel.*; -import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.core.common.annotation.Excel; import com.core.common.annotation.Excel.ColumnType; import com.core.common.annotation.Excel.Type; @@ -43,6 +15,32 @@ import com.core.common.utils.file.FileTypeUtils; import com.core.common.utils.file.FileUtils; import com.core.common.utils.file.ImageUtils; import com.core.common.utils.reflect.ReflectUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.RegExUtils; +import org.apache.commons.lang3.reflect.FieldUtils; +import org.apache.poi.hssf.usermodel.*; +import org.apache.poi.ooxml.POIXMLDocumentPart; +import org.apache.poi.ss.usermodel.*; +import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.ss.util.CellRangeAddressList; +import org.apache.poi.util.IOUtils; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.apache.poi.xssf.usermodel.*; +import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.*; +import java.util.stream.Collectors; /** * Excel相关处理 diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/reflect/ReflectUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/reflect/ReflectUtils.java index 00bced6a..8987f317 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/reflect/ReflectUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/reflect/ReflectUtils.java @@ -1,16 +1,15 @@ package com.core.common.utils.reflect; -import java.lang.reflect.*; -import java.util.Date; - +import com.core.common.core.text.Convert; +import com.core.common.utils.DateUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.core.common.core.text.Convert; -import com.core.common.utils.DateUtils; +import java.lang.reflect.*; +import java.util.Date; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/sign/Md5Utils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/sign/Md5Utils.java index 626b5b40..1ea52285 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/sign/Md5Utils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/sign/Md5Utils.java @@ -1,11 +1,11 @@ package com.core.common.utils.sign; -import java.nio.charset.StandardCharsets; -import java.security.MessageDigest; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; + /** * Md5加密方法 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/spring/SpringUtils.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/spring/SpringUtils.java index 43d31b20..6897260f 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/spring/SpringUtils.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/spring/SpringUtils.java @@ -1,5 +1,6 @@ package com.core.common.utils.spring; +import com.core.common.utils.StringUtils; import org.springframework.aop.framework.AopContext; import org.springframework.beans.BeansException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; @@ -9,8 +10,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; -import com.core.common.utils.StringUtils; - /** * spring工具类 方便在非spring管理环境中获取bean * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/Seq.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/Seq.java index d6fd7402..45714c27 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/Seq.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/Seq.java @@ -1,10 +1,10 @@ package com.core.common.utils.uuid; -import java.util.concurrent.atomic.AtomicInteger; - import com.core.common.utils.DateUtils; import com.core.common.utils.StringUtils; +import java.util.concurrent.atomic.AtomicInteger; + /** * @author system 序列生成类 */ diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/UUID.java b/openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/UUID.java index 3b72cba8..d4dbd897 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/UUID.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/utils/uuid/UUID.java @@ -1,13 +1,13 @@ package com.core.common.utils.uuid; +import com.core.common.exception.UtilException; + import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import com.core.common.exception.UtilException; - /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/xss/Xss.java b/openhis-server-new/core-common/src/main/java/com/core/common/xss/Xss.java index 2e8ab06f..1fb646b8 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/xss/Xss.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/xss/Xss.java @@ -1,13 +1,12 @@ package com.core.common.xss; +import javax.validation.Constraint; +import javax.validation.Payload; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; - /** * 自定义xss校验注解 * diff --git a/openhis-server-new/core-common/src/main/java/com/core/common/xss/XssValidator.java b/openhis-server-new/core-common/src/main/java/com/core/common/xss/XssValidator.java index a7b5b043..759e95b0 100644 --- a/openhis-server-new/core-common/src/main/java/com/core/common/xss/XssValidator.java +++ b/openhis-server-new/core-common/src/main/java/com/core/common/xss/XssValidator.java @@ -1,12 +1,11 @@ package com.core.common.xss; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import com.core.common.utils.StringUtils; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; - -import com.core.common.utils.StringUtils; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * 自定义xss校验注解实现 diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java index c745a676..32e0bb40 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/config/MybatisPlusConfig.java @@ -116,37 +116,40 @@ public class MybatisPlusConfig { * 获取当前租户 ID */ private Integer getCurrentTenantId() { + Integer result = null; // 首先尝试从线程局部变量中获取租户ID（适用于定时任务等场景） Integer threadLocalTenantId = TenantContext.getCurrentTenant(); if (threadLocalTenantId != null) { - return threadLocalTenantId; - } - - // 获取当前登录用户的租户ID（优先使用SecurityUtils中储存的LoginUser的租户ID） - try { - if (SecurityUtils.getAuthentication() != null) { - return SecurityUtils.getLoginUser().getTenantId(); + result = threadLocalTenantId; + } else { + // 获取当前登录用户的租户ID（优先使用SecurityUtils中储存的LoginUser的租户ID） + try { + if (SecurityUtils.getAuthentication() != null) { + result = SecurityUtils.getLoginUser().getTenantId(); + } + } catch (Exception e) { + result = 1; // 默认租户ID } - } catch (Exception e) { - return 1; // 默认租户ID - } - // 尝试从请求头中获取租户ID - ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes(); - if (attributes != null) { - HttpServletRequest request = attributes.getRequest(); - // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里 - String tenantIdHeader = request.getHeader("X-Tenant-ID"); - String requestMethodName = request.getHeader("Request-Method-Name"); - // 登录 - if ("login".equals(requestMethodName)) { - if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) { - return Integer.parseInt(tenantIdHeader); + if (result == null) { + // 尝试从请求头中获取租户ID + ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes(); + if (attributes != null) { + HttpServletRequest request = attributes.getRequest(); + // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里 + String tenantIdHeader = request.getHeader("X-Tenant-ID"); + String requestMethodName = request.getHeader("Request-Method-Name"); + // 登录 + if ("login".equals(requestMethodName)) { + if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) { + result = Integer.parseInt(tenantIdHeader); + } + } } } } - return 1; // 默认租户ID + return result != null ? result : 1; // 默认租户ID } } diff --git a/openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java b/openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java index 40cb3302..1146b8ab 100644 --- a/openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java +++ b/openhis-server-new/core-framework/src/main/java/com/core/framework/handler/MybastisColumnsHandler.java @@ -2,12 +2,17 @@ package com.core.framework.handler; import java.util.Date; +import javax.servlet.http.HttpServletRequest; + import org.apache.ibatis.reflection.MetaObject; import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.core.common.core.domain.model.LoginUser; import com.core.common.utils.SecurityUtils; +import com.core.framework.config.TenantContext; @Component public class MybastisColumnsHandler implements MetaObjectHandler { @@ -47,10 +52,40 @@ public class MybastisColumnsHandler implements MetaObjectHandler { * 获取当前租户 ID */ private Integer getCurrentTenantId() { - // 获取当前登录用户的租户 ID - if (SecurityUtils.getAuthentication() != null) { - return SecurityUtils.getLoginUser().getTenantId(); + Integer result = null; + + // 首先尝试从线程局部变量中获取租户ID（适用于定时任务等场景） + Integer threadLocalTenantId = TenantContext.getCurrentTenant(); + if (threadLocalTenantId != null) { + result = threadLocalTenantId; + } else { + // 获取当前登录用户的租户ID（优先使用SecurityUtils中储存的LoginUser的租户ID） + try { + if (SecurityUtils.getAuthentication() != null) { + result = SecurityUtils.getLoginUser().getTenantId(); + } + } catch (Exception e) { + result = 1; // 默认租户ID + } + + if (result == null) { + // 尝试从请求头中获取租户ID + ServletRequestAttributes attributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes(); + if (attributes != null) { + HttpServletRequest request = attributes.getRequest(); + // 从请求头获取租户ID，假设header名称为"X-Tenant-ID" ; 登录接口前端把租户id放到请求头里 + String tenantIdHeader = request.getHeader("X-Tenant-ID"); + String requestMethodName = request.getHeader("Request-Method-Name"); + // 登录 + if ("login".equals(requestMethodName)) { + if (tenantIdHeader != null && !tenantIdHeader.isEmpty()) { + result = Integer.parseInt(tenantIdHeader); + } + } + } + } } - return 0; + + return result != null ? result : 1; // 默认租户ID } } diff --git a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/CronUtils.java b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/CronUtils.java index a4a71e8f..96a56f86 100644 --- a/openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/CronUtils.java +++ b/openhis-server-new/core-quartz/src/main/java/com/core/quartz/util/CronUtils.java @@ -1,10 +1,10 @@ package com.core.quartz.util; +import org.quartz.CronExpression; + import java.text.ParseException; import java.util.Date; -import org.quartz.CronExpression; - /** * cron表达式工具类 * diff --git a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenant.java b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenant.java index 34f828ee..596274ff 100644 --- a/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenant.java +++ b/openhis-server-new/core-system/src/main/java/com/core/system/domain/SysTenant.java @@ -76,4 +76,12 @@ public class SysTenant implements Serializable { */ private String remark; + // 手动添加 getter 方法以解决 Lombok 兼容性问题 + public String getDeleteFlag() { + return deleteFlag; + } + + public void setDeleteFlag(String deleteFlag) { + this.deleteFlag = deleteFlag; + } } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java index a6668cba..e19fe754 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/OpenHisApplication.java @@ -13,6 +13,7 @@ import org.springframework.core.env.Environment; import org.springframework.scheduling.annotation.EnableAsync; import com.openhis.web.ybmanage.config.YbServiceConfig; +import com.openhis.administration.domain.Instrument; /** * 启动程序 @@ -25,6 +26,14 @@ import com.openhis.web.ybmanage.config.YbServiceConfig; public class OpenHisApplication { public static void main(String[] args) throws UnknownHostException { // System.setProperty("spring.devtools.restart.enabled", "false"); + // 测试 Instrument 类加载 + // try { + // Class.forName("com.openhis.administration.domain.Instrument"); + // System.out.println("Instrument class loaded successfully"); + // } catch (ClassNotFoundException e) { + // System.err.println("Failed to load Instrument class: " + e.getMessage()); + // } + ConfigurableApplicationContext application = SpringApplication.run(OpenHisApplication.class, args); Environment env = application.getEnvironment(); String ip = InetAddress.getLocalHost().getHostAddress(); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java index 1a002a06..b6728e2e 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/ybmanage/config/YbServiceConfig.java @@ -4,8 +4,6 @@ package com.openhis.web.ybmanage.config; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.context.properties.ConstructorBinding; -import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @@ -16,10 +14,8 @@ import org.springframework.context.annotation.PropertySource; * @date 2025-04-11 */ @Configuration -@ConstructorBinding @PropertySource("classpath:properties/yb.properties") @ConfigurationProperties(prefix = "ybapp.config") -@EnableConfigurationProperties public class YbServiceConfig { private String url; diff --git a/openhis-server-new/openhis-application/src/main/resources/application.yml b/openhis-server-new/openhis-application/src/main/resources/application.yml index a8228c06..c3b57498 100644 --- a/openhis-server-new/openhis-application/src/main/resources/application.yml +++ b/openhis-server-new/openhis-application/src/main/resources/application.yml @@ -1,7 +1,7 @@ # 项目相关配置 core: # 名称 - name: OpenHis + name: HEALTHLINK-HIS # 版本 version: 0.0.1 # 版权年份 diff --git a/openhis-server-new/openhis-application/src/main/resources/banner.txt b/openhis-server-new/openhis-application/src/main/resources/banner.txt index f95701d8..bdddf844 100644 --- a/openhis-server-new/openhis-application/src/main/resources/banner.txt +++ b/openhis-server-new/openhis-application/src/main/resources/banner.txt @@ -1,10 +1,10 @@ + _ _ ______ _ _______ _ _ _ _____ _ _ _ __ _ _ _____ _____ + | | | | ____| /\ | | |__ __| | | | | |_ _| \ | | |/ / | | | |_ _|/ ____| + | |__| | |__ / \ | | | | | |__| | | | | | \| | ' /_____| |__| | | | | (___ + | __ | __| / /\ \ | | | | | __ | | | | | . ` | <______| __ | | | \___ \ + | | | | |____ / ____ \| |____| | | | | | |____ _| |_| |\ | . \ | | | |_| |_ ____) | + |_| |_|______/_/ \_\______|_| |_| |_|______|_____|_| \_|_|\_\ |_| |_|_____|_____/ + - :::::::: ::::::::: :::::::::: :::: ::: ::: ::: ::::::::::: :::::::: - :+: :+: :+: :+: :+: :+:+: :+: :+: :+: :+: :+: :+: - +:+ +:+ +:+ +:+ +:+ :+:+:+ +:+ +:+ +:+ +:+ +:+ - +#+ +:+ +#++:++#+ +#++:++# +#+ +:+ +#+ +#++:++#++ +#+ +#++:++#++ - +#+ +#+ +#+ +#+ +#+ +#+#+# +#+ +#+ +#+ +#+ -#+# #+# #+# #+# #+# #+#+# #+# #+# #+# #+# #+# -######## ### ########## ### #### ### ### ########### ######## Application Version: ${core.version} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java index 9980d0fa..3c830920 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUser.java @@ -2,6 +2,8 @@ package com.openhis.administration.domain; import java.util.Date; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; @@ -22,7 +24,7 @@ import lombok.experimental.Accessors; public class BizUser extends HisBaseEntity { /** 用户ID */ - // @TableId(type = IdType.ASSIGN_ID) + @TableId(type = IdType.ASSIGN_ID) private Long userId; /** 部门ID */ diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java index 6c9af566..95112ea8 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/BizUserRole.java @@ -1,5 +1,7 @@ package com.openhis.administration.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -19,6 +21,7 @@ import lombok.experimental.Accessors; public class BizUserRole { /** 用户ID */ + @TableId(type = IdType.INPUT) private Long userId; /** 角色ID */ diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java index 69714272..68596b2f 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.core.common.core.domain.HisBaseEntity; import com.openhis.common.enums.InvoiceStatus; + import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -25,58 +26,100 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = false) public class Invoice extends HisBaseEntity { - /** ID */ + /** + * ID + */ @TableId(type = IdType.ASSIGN_ID) private Long id; - /** 患者ID */ + /** + * 患者ID + */ private Long patientId; - /** 付款ID */ + /** + * 付款ID + */ private Long reconciliationId; - /** 状态 */ + /** + * 状态 + */ private InvoiceStatus statusEnum; - /** 类别 */ + /** + * 类别 + */ private String typeCode; - /** 取消原因 */ + /** + * 取消原因 + */ private String cancelledReason; - /** 收费项 */ + /** + * 收费项 + */ private String chargeItemIds; - /** 发票净额总记 */ + /** + * 发票净额总记 + */ private BigDecimal totalNet; - /** 发票总计金额 */ + /** + * 发票总计金额 + */ private BigDecimal totalGross; - /** 付款详情 */ + /** + * 付款详情 + */ private String paymentTerms; - /** 发票编号 */ + /** + * 发票编号 + */ private String busNo; - /** 开票员 */ + /** + * 开票员 + */ private Long invoicingStaffId; - /** 电子票据代码 */ + /** + * 电子票据代码 + */ private String billBatchCode; - /** 电子票据号码 */ + /** + * 电子票据号码 + */ private String billNo; - /** 电子校验码 */ + /** + * 电子校验码 + */ private String random; - /** 电子票据生成时间 */ + /** + * 电子票据生成时间 + */ private String billCreateTime; - /** 电子票据二维码图片数据 */ + /** + * 电子票据二维码图片数据 + */ private String billQrCode; - /** 电子票据H5页面URL */ + /** + * 电子票据H5页面URL + */ private String pictureUrl; - /** 电子票据外网H5页面URL */ + /** + * 电子票据外网H5页面URL + */ private String pictureNetUrl; - /** 微信插卡URL */ + /** + * 微信插卡URL + */ private String wxCardUrl; - /** 票据营业日期 */ + /** + * 票据营业日期 + */ private Date billBusDate; } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java index 44934d45..5b996e87 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/InvoiceSegment.java @@ -1,15 +1,10 @@ package com.openhis.administration.domain; import java.util.Date; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; - import com.core.common.core.domain.HisBaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; /** * 发票段管理Entity实体 @@ -17,43 +12,217 @@ import lombok.experimental.Accessors; * @author system * @date 2025-11-18 */ -@Data @TableName("adm_invoice_segment") -@Accessors(chain = true) -@EqualsAndHashCode(callSuper = false) public class InvoiceSegment extends HisBaseEntity { - /** ID */ + /** + * ID + */ @TableId(type = IdType.ASSIGN_ID) private Long id; - - /** 段ID */ + + /** + * 段ID + */ private Long segmentId; - /** 开始号码 */ + /** + * 开始号码 + */ private String beginNumber; - - /** 结束号码 */ + + /** + * 结束号码 + */ private String endNumber; - - /** 员工ID */ + + /** + * 员工ID + */ private Long employeeId; - - /** 员工姓名 */ + + /** + * 员工姓名 + */ private String employeeName; - - /** 开票员ID */ + + /** + * 开票员ID + */ private Long invoicingStaffId; - - /** 开票员姓名 */ + + /** + * 开票员姓名 + */ private String invoicingStaffName; - - /** 创建日期 */ + + /** + * 创建日期 + */ private Date createDate; - - /** 状态 */ + + /** + * 状态 + */ private String status; - - /** 备注 */ + + /** + * 备注 + */ private String remark; -} \ No newline at end of file + + // ===== 标准getter/setter方法 ===== + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getSegmentId() { + return segmentId; + } + + public void setSegmentId(Long segmentId) { + this.segmentId = segmentId; + } + + public String getBeginNumber() { + return beginNumber; + } + + public void setBeginNumber(String beginNumber) { + this.beginNumber = beginNumber; + } + + public String getEndNumber() { + return endNumber; + } + + public void setEndNumber(String endNumber) { + this.endNumber = endNumber; + } + + public Long getEmployeeId() { + return employeeId; + } + + public void setEmployeeId(Long employeeId) { + this.employeeId = employeeId; + } + + public String getEmployeeName() { + return employeeName; + } + + public void setEmployeeName(String employeeName) { + this.employeeName = employeeName; + } + + public Long getInvoicingStaffId() { + return invoicingStaffId; + } + + public void setInvoicingStaffId(Long invoicingStaffId) { + this.invoicingStaffId = invoicingStaffId; + } + + public String getInvoicingStaffName() { + return invoicingStaffName; + } + + public void setInvoicingStaffName(String invoicingStaffName) { + this.invoicingStaffName = invoicingStaffName; + } + + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + // ===== 业务验证方法 ===== + /** + * 验证发票段数据完整性 + * + * @return 验证结果，true表示通过 + */ + public boolean isValidInvoiceSegment() { + return id != null + && segmentId != null + && beginNumber != null && !beginNumber.trim().isEmpty() + && endNumber != null && !endNumber.trim().isEmpty(); + } + + /** + * 检查号码范围是否有效 + * + * @return true如果开始号码不大于结束号码 + */ + public boolean isNumberRangeValid() { + if (beginNumber == null || endNumber == null) { + return false; + } + try { + long begin = Long.parseLong(beginNumber.trim()); + long end = Long.parseLong(endNumber.trim()); + return begin <= end; + } catch (NumberFormatException e) { + return false; + } + } + + // ===== 重写equals和hashCode方法 ===== + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj == null || getClass() != obj.getClass()) { + return false; + } + + InvoiceSegment that = (InvoiceSegment) obj; + + return id != null ? id.equals(that.id) : that.id == null + && segmentId != null ? segmentId.equals(that.segmentId) : that.segmentId == null; + } + + @Override + public int hashCode() { + int result = id != null ? id.hashCode() : 0; + result = 31 * result + (segmentId != null ? segmentId.hashCode() : 0); + return result; + } + + @Override + public String toString() { + return "InvoiceSegment{" + + "id=" + id + + ", segmentId=" + segmentId + + ", beginNumber='" + beginNumber + '\'' + + ", endNumber='" + endNumber + '\'' + + ", employeeName='" + employeeName + '\'' + + ", status='" + status + '\'' + + '}'; + } +} diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java index 6b11f393..805fb760 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceSegmentServiceImpl.java @@ -1,7 +1,6 @@ package com.openhis.administration.service.impl; import java.util.List; -import java.util.Objects; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java index 3e1f1735..9bd80fa8 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/service/impl/InvoiceServiceImpl.java @@ -1,18 +1,13 @@ package com.openhis.administration.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.core.common.enums.DelFlag; -import com.core.common.exception.ServiceException; import com.openhis.administration.domain.Invoice; import com.openhis.administration.mapper.InvoiceMapper; import com.openhis.administration.service.IInvoiceService; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import java.util.List; /** @@ -28,22 +23,20 @@ public class InvoiceServiceImpl extends ServiceImpl impl * 新增发票 * * @param invoice 发票实体 - * @return 发票ID - * @throws ServiceException 当发票已存在或插入失败时抛出异常 + * @return */ @Override - @Transactional(rollbackFor = Exception.class) public Long addInvoice(Invoice invoice) { - // 根据编码判断发票是否存在 - 使用count查询优化性能 - long count = baseMapper.selectCount(new LambdaQueryWrapper().eq(Invoice::getBusNo, invoice.getBusNo())); - if (count > 0) { - throw new ServiceException("发票编码已存在: " + invoice.getBusNo()); + // 根据编码判断发票是否存在 + List invoices + = baseMapper.selectList(new LambdaQueryWrapper().eq(Invoice::getBusNo, invoice.getBusNo())); + if (invoices.size() > 0) { + return null; } - // 新增发票 int insert = baseMapper.insert(invoice); if (insert != 1) { - throw new ServiceException("发票新增失败，请检查输入数据"); + return null; } return invoice.getId(); @@ -55,16 +48,14 @@ public class InvoiceServiceImpl extends ServiceImpl impl .eq(Invoice::getDeleteFlag, DelFlag.NO.getCode())); } + /** + * 分页查询发票列表 + */ @Override - public IPage selectInvoicePage(Page page, boolean isAdmin, Long userId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() - .eq(Invoice::getDeleteFlag, DelFlag.NO.getCode()); - - // 非管理员用户只能查看自己创建的发票 - if (!isAdmin) { - queryWrapper.eq(Invoice::getInvoicingStaffId, userId); - } - + public Page selectInvoicePage(Page page, boolean isAdmin, Long userId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + // 可以根据需要添加查询条件，目前按创建时间倒序排列 + queryWrapper.orderByDesc(Invoice::getCreateTime); return baseMapper.selectPage(page, queryWrapper); } } diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InstrumentMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InstrumentMapper.xml index bacc4e8a..5bbc3154 100644 --- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InstrumentMapper.xml +++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InstrumentMapper.xml @@ -2,10 +2,6 @@ -<<<<<<<< HEAD:openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml - -======== ->>>>>>>> v1.3:openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InstrumentMapper.xml \ No newline at end of file diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml index bacc4e8a..ef22ba84 100644 --- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml +++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml @@ -2,10 +2,6 @@ -<<<<<<<< HEAD:openhis-server-new/openhis-domain/src/main/resources/mapper/administration/PatientStudentMapper.xml -======== - ->>>>>>>> v1.3:openhis-server-new/openhis-domain/src/main/resources/mapper/administration/InstrumentMapper.xml \ No newline at end of file diff --git a/openhis-server-new/openhis-miniapp/pom.xml b/openhis-server-new/openhis-miniapp/pom.xml index 7b251573..92c2c0d7 100644 --- a/openhis-server-new/openhis-miniapp/pom.xml +++ b/openhis-server-new/openhis-miniapp/pom.xml @@ -56,12 +56,12 @@ org.apache.maven.plugins maven-compiler-plugin - 8 - 8 + 17 + 17 ${project.artifactId} - + \ No newline at end of file diff --git a/openhis-server-new/pom.xml b/openhis-server-new/pom.xml index 51de9eb4..b7ffedd0 100644 --- a/openhis-server-new/pom.xml +++ b/openhis-server-new/pom.xml @@ -23,8 +23,8 @@ 0.0.1-SNAPSHOT UTF-8 UTF-8 - 17 - 3.13.0 + 17 + 3.8.1 3.1.1 1.2.27 1.21 @@ -39,7 +39,7 @@ 9.0.96 1.2.13 - 1.18.42 + 1.18.34 3.5.3 6.8.0 42.2.27 @@ -55,6 +55,7 @@ 5.5.12 5.2.0 9.4.0 + 1.3.2 @@ -325,6 +326,13 @@ ${postgresql.version} + + + javax.annotation + javax.annotation-api + ${jsr250.version} + + org.jetbrains.kotlin @@ -347,7 +355,7 @@ core-generator core-common core-flowable - openhis-einvoiceapp + pom @@ -361,6 +369,10 @@ ${java.version} ${java.version} ${project.build.sourceEncoding} + + -parameters + -Xlint:unchecked + org.projectlombok diff --git a/openhis-ui-vue3/index.html b/openhis-ui-vue3/index.html index 8c84232c..003a4ea3 100644 --- a/openhis-ui-vue3/index.html +++ b/openhis-ui-vue3/index.html @@ -13,7 +13,7 @@ - + diff --git a/openhis-ui-vue3/package-lock.json b/openhis-ui-vue3/package-lock.json index 95d075ef..28d76add 100644 --- a/openhis-ui-vue3/package-lock.json +++ b/openhis-ui-vue3/package-lock.json @@ -9,7 +9,7 @@ "version": "3.8.7", "license": "MIT", "dependencies": { - "@element-plus/icons-vue": "2.3.1", + "@element-plus/icons-vue": "^2.3.2", "@vueup/vue-quill": "1.2.0", "@vueuse/core": "10.6.1", "axios": "0.27.2", @@ -17,28 +17,31 @@ "d3": "^7.9.0", "dayjs": "^1.11.19", "decimal.js": "^10.5.0", - "echarts": "5.4.3", + "echarts": "^5.4.3", "element-china-area-data": "^6.1.0", - "element-plus": "2.9.11", - "file-saver": "2.0.5", - "fuse.js": "6.6.2", + "element-plus": "^2.12.0", + "file-saver": "^2.0.5", + "fuse.js": "^7.0.0", "html2pdf.js": "^0.10.3", - "js-cookie": "3.0.5", - "jsencrypt": "3.3.2", + "js-cookie": "^3.0.5", + "jsencrypt": "^3.3.2", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "moment": "^2.30.1", - "nprogress": "0.2.0", - "pinia": "2.1.7", + "next": "^16.1.0", + "nprogress": "^0.2.0", + "pinia": "^2.2.0", "pinyin": "^4.0.0-alpha.2", "province-city-china": "^8.5.8", + "react": "18.2.0", + "react-dom": "18.2.0", "segmentit": "^2.0.3", "v-region": "^3.3.0", "vue": "^3.5.13", "vue-area-linkage": "^5.1.0", - "vue-cropper": "1.1.1", - "vue-plugin-hiprint": "^0.0.60", - "vue-router": "4.2.5" + "vue-cropper": "^1.1.1", + "vue-plugin-hiprint": "^0.0.19", + "vue-router": "^4.3.0" }, "devDependencies": { "@types/node": "^25.0.1", @@ -133,15 +136,6 @@ "node": ">=6.9.0" } }, - "node_modules/@claviska/jquery-minicolors": { - "version": "2.3.6", - "resolved": "https://registry.npmmirror.com/@claviska/jquery-minicolors/-/jquery-minicolors-2.3.6.tgz", - "integrity": "sha512-8Ro6D4GCrmOl41+6w4NFhEOpx8vjxwVRI69bulXsFDt49uVRKhLU5TnzEV7AmOJrylkVq+ugnYNMiGHBieeKUQ==", - "license": "MIT", - "peerDependencies": { - "jquery": ">= 1.7.x" - } - }, "node_modules/@ctrl/tinycolor": { "version": "3.6.1", "resolved": "https://registry.npmmirror.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz", @@ -152,14 +146,31 @@ } }, "node_modules/@element-plus/icons-vue": { - "version": "2.3.1", - "resolved": "https://registry.npmmirror.com/@element-plus/icons-vue/-/icons-vue-2.3.1.tgz", - "integrity": "sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@element-plus/icons-vue/-/icons-vue-2.3.2.tgz", + "integrity": "sha512-OzIuTaIfC8QXEPmJvB4Y4kw34rSXdCJzxcD1kFStBvr8bK6X1zQAYDo0CNMjojnfTqRQCJ0I7prlErcoRiET2A==", "license": "MIT", "peerDependencies": { "vue": "^3.2.0" } }, + "node_modules/@emnapi/runtime": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz", + "integrity": "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==", + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/runtime/node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD", + "optional": true + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.19.12", "resolved": "https://registry.npmmirror.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", @@ -576,12 +587,612 @@ "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==", "license": "MIT" }, + "node_modules/@img/colour": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@img/colour/-/colour-1.0.0.tgz", + "integrity": "sha512-A5P/LfWGFSl6nsckYtjw9da+19jB8hkJ6ACTGcDfEJ0aE+l2n2El7dsVM7UVHZQ9s2lmYMWlrS21YLy2IR1LUw==", + "license": "MIT", + "optional": true, + "engines": { + "node": ">=18" + } + }, + "node_modules/@img/sharp-darwin-arm64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-arm64/-/sharp-darwin-arm64-0.34.5.tgz", + "integrity": "sha512-imtQ3WMJXbMY4fxb/Ndp6HBTNVtWCUI0WdobyheGf5+ad6xX8VIDO8u2xE4qc/fr08CKG/7dDseFtn6M6g/r3w==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-darwin-arm64": "1.2.4" + } + }, + "node_modules/@img/sharp-darwin-x64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-darwin-x64/-/sharp-darwin-x64-0.34.5.tgz", + "integrity": "sha512-YNEFAF/4KQ/PeW0N+r+aVVsoIY0/qxxikF2SWdp+NRkmMB7y9LBZAVqQ4yhGCm/H3H270OSykqmQMKLBhBJDEw==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-darwin-x64": "1.2.4" + } + }, + "node_modules/@img/sharp-libvips-darwin-arm64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-arm64/-/sharp-libvips-darwin-arm64-1.2.4.tgz", + "integrity": "sha512-zqjjo7RatFfFoP0MkQ51jfuFZBnVE2pRiaydKJ1G/rHZvnsrHAOcQALIi9sA5co5xenQdTugCvtb1cuf78Vf4g==", + "cpu": [ + "arm64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "darwin" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-darwin-x64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-darwin-x64/-/sharp-libvips-darwin-x64-1.2.4.tgz", + "integrity": "sha512-1IOd5xfVhlGwX+zXv2N93k0yMONvUlANylbJw1eTah8K/Jtpi15KC+WSiaX/nBmbm2HxRM1gZ0nSdjSsrZbGKg==", + "cpu": [ + "x64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "darwin" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-arm": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm/-/sharp-libvips-linux-arm-1.2.4.tgz", + "integrity": "sha512-bFI7xcKFELdiNCVov8e44Ia4u2byA+l3XtsAj+Q8tfCwO6BQ8iDojYdvoPMqsKDkuoOo+X6HZA0s0q11ANMQ8A==", + "cpu": [ + "arm" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-arm64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-arm64/-/sharp-libvips-linux-arm64-1.2.4.tgz", + "integrity": "sha512-excjX8DfsIcJ10x1Kzr4RcWe1edC9PquDRRPx3YVCvQv+U5p7Yin2s32ftzikXojb1PIFc/9Mt28/y+iRklkrw==", + "cpu": [ + "arm64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-ppc64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-ppc64/-/sharp-libvips-linux-ppc64-1.2.4.tgz", + "integrity": "sha512-FMuvGijLDYG6lW+b/UvyilUWu5Ayu+3r2d1S8notiGCIyYU/76eig1UfMmkZ7vwgOrzKzlQbFSuQfgm7GYUPpA==", + "cpu": [ + "ppc64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-riscv64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-riscv64/-/sharp-libvips-linux-riscv64-1.2.4.tgz", + "integrity": "sha512-oVDbcR4zUC0ce82teubSm+x6ETixtKZBh/qbREIOcI3cULzDyb18Sr/Wcyx7NRQeQzOiHTNbZFF1UwPS2scyGA==", + "cpu": [ + "riscv64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-s390x": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-s390x/-/sharp-libvips-linux-s390x-1.2.4.tgz", + "integrity": "sha512-qmp9VrzgPgMoGZyPvrQHqk02uyjA0/QrTO26Tqk6l4ZV0MPWIW6LTkqOIov+J1yEu7MbFQaDpwdwJKhbJvuRxQ==", + "cpu": [ + "s390x" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linux-x64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linux-x64/-/sharp-libvips-linux-x64-1.2.4.tgz", + "integrity": "sha512-tJxiiLsmHc9Ax1bz3oaOYBURTXGIRDODBqhveVHonrHJ9/+k89qbLl0bcJns+e4t4rvaNBxaEZsFtSfAdquPrw==", + "cpu": [ + "x64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linuxmusl-arm64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-arm64/-/sharp-libvips-linuxmusl-arm64-1.2.4.tgz", + "integrity": "sha512-FVQHuwx1IIuNow9QAbYUzJ+En8KcVm9Lk5+uGUQJHaZmMECZmOlix9HnH7n1TRkXMS0pGxIJokIVB9SuqZGGXw==", + "cpu": [ + "arm64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-libvips-linuxmusl-x64": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@img/sharp-libvips-linuxmusl-x64/-/sharp-libvips-linuxmusl-x64-1.2.4.tgz", + "integrity": "sha512-+LpyBk7L44ZIXwz/VYfglaX/okxezESc6UxDSoyo2Ks6Jxc4Y7sGjpgU9s4PMgqgjj1gZCylTieNamqA1MF7Dg==", + "cpu": [ + "x64" + ], + "license": "LGPL-3.0-or-later", + "optional": true, + "os": [ + "linux" + ], + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-linux-arm": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm/-/sharp-linux-arm-0.34.5.tgz", + "integrity": "sha512-9dLqsvwtg1uuXBGZKsxem9595+ujv0sJ6Vi8wcTANSFpwV/GONat5eCkzQo/1O6zRIkh0m/8+5BjrRr7jDUSZw==", + "cpu": [ + "arm" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm": "1.2.4" + } + }, + "node_modules/@img/sharp-linux-arm64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-arm64/-/sharp-linux-arm64-0.34.5.tgz", + "integrity": "sha512-bKQzaJRY/bkPOXyKx5EVup7qkaojECG6NLYswgktOZjaXecSAeCWiZwwiFf3/Y+O1HrauiE3FVsGxFg8c24rZg==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-arm64": "1.2.4" + } + }, + "node_modules/@img/sharp-linux-ppc64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-ppc64/-/sharp-linux-ppc64-0.34.5.tgz", + "integrity": "sha512-7zznwNaqW6YtsfrGGDA6BRkISKAAE1Jo0QdpNYXNMHu2+0dTrPflTLNkpc8l7MUP5M16ZJcUvysVWWrMefZquA==", + "cpu": [ + "ppc64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-ppc64": "1.2.4" + } + }, + "node_modules/@img/sharp-linux-riscv64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-riscv64/-/sharp-linux-riscv64-0.34.5.tgz", + "integrity": "sha512-51gJuLPTKa7piYPaVs8GmByo7/U7/7TZOq+cnXJIHZKavIRHAP77e3N2HEl3dgiqdD/w0yUfiJnII77PuDDFdw==", + "cpu": [ + "riscv64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-riscv64": "1.2.4" + } + }, + "node_modules/@img/sharp-linux-s390x": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-s390x/-/sharp-linux-s390x-0.34.5.tgz", + "integrity": "sha512-nQtCk0PdKfho3eC5MrbQoigJ2gd1CgddUMkabUj+rBevs8tZ2cULOx46E7oyX+04WGfABgIwmMC0VqieTiR4jg==", + "cpu": [ + "s390x" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-s390x": "1.2.4" + } + }, + "node_modules/@img/sharp-linux-x64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linux-x64/-/sharp-linux-x64-0.34.5.tgz", + "integrity": "sha512-MEzd8HPKxVxVenwAa+JRPwEC7QFjoPWuS5NZnBt6B3pu7EG2Ge0id1oLHZpPJdn3OQK+BQDiw9zStiHBTJQQQQ==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linux-x64": "1.2.4" + } + }, + "node_modules/@img/sharp-linuxmusl-arm64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-arm64/-/sharp-linuxmusl-arm64-0.34.5.tgz", + "integrity": "sha512-fprJR6GtRsMt6Kyfq44IsChVZeGN97gTD331weR1ex1c1rypDEABN6Tm2xa1wE6lYb5DdEnk03NZPqA7Id21yg==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-arm64": "1.2.4" + } + }, + "node_modules/@img/sharp-linuxmusl-x64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-linuxmusl-x64/-/sharp-linuxmusl-x64-0.34.5.tgz", + "integrity": "sha512-Jg8wNT1MUzIvhBFxViqrEhWDGzqymo3sV7z7ZsaWbZNDLXRJZoRGrjulp60YYtV4wfY8VIKcWidjojlLcWrd8Q==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-libvips-linuxmusl-x64": "1.2.4" + } + }, + "node_modules/@img/sharp-wasm32": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-wasm32/-/sharp-wasm32-0.34.5.tgz", + "integrity": "sha512-OdWTEiVkY2PHwqkbBI8frFxQQFekHaSSkUIJkwzclWZe64O1X4UlUjqqqLaPbUpMOQk6FBu/HtlGXNblIs0huw==", + "cpu": [ + "wasm32" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later AND MIT", + "optional": true, + "dependencies": { + "@emnapi/runtime": "^1.7.0" + }, + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-arm64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-arm64/-/sharp-win32-arm64-0.34.5.tgz", + "integrity": "sha512-WQ3AgWCWYSb2yt+IG8mnC6Jdk9Whs7O0gxphblsLvdhSpSTtmu69ZG1Gkb6NuvxsNACwiPV6cNSZNzt0KPsw7g==", + "cpu": [ + "arm64" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-ia32": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-ia32/-/sharp-win32-ia32-0.34.5.tgz", + "integrity": "sha512-FV9m/7NmeCmSHDD5j4+4pNI8Cp3aW+JvLoXcTUo0IqyjSfAZJ8dIUmijx1qaJsIiU+Hosw6xM5KijAWRJCSgNg==", + "cpu": [ + "ia32" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, + "node_modules/@img/sharp-win32-x64": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/@img/sharp-win32-x64/-/sharp-win32-x64-0.34.5.tgz", + "integrity": "sha512-+29YMsqY2/9eFEiW93eqWnuLcWcufowXewwSNIT6UwZdUUCrM3oFjMWH/Z6/TMmb4hlFenmfAVbpWeup2jryCw==", + "cpu": [ + "x64" + ], + "license": "Apache-2.0 AND LGPL-3.0-or-later", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + } + }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.5.5", "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", "license": "MIT" }, + "node_modules/@next/env": { + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/@next/env/-/env-16.1.1.tgz", + "integrity": "sha512-3oxyM97Sr2PqiVyMyrZUtrtM3jqqFxOQJVuKclDsgj/L728iZt/GyslkN4NwarledZATCenbk4Offjk1hQmaAA==", + "license": "MIT" + }, + "node_modules/@next/swc-darwin-arm64": { + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.1.tgz", + "integrity": "sha512-JS3m42ifsVSJjSTzh27nW+Igfha3NdBOFScr9C80hHGrWx55pTrVL23RJbqir7k7/15SKlrLHhh/MQzqBBYrQA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-darwin-x64": { + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.1.tgz", + "integrity": "sha512-hbyKtrDGUkgkyQi1m1IyD3q4I/3m9ngr+V93z4oKHrPcmxwNL5iMWORvLSGAf2YujL+6HxgVvZuCYZfLfb4bGw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-gnu": { + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.1.tgz", + "integrity": "sha512-/fvHet+EYckFvRLQ0jPHJCUI5/B56+2DpI1xDSvi80r/3Ez+Eaa2Yq4tJcRTaB1kqj/HrYKn8Yplm9bNoMJpwQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-arm64-musl": { + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.1.tgz", + "integrity": "sha512-MFHrgL4TXNQbBPzkKKur4Fb5ICEJa87HM7fczFs2+HWblM7mMLdco3dvyTI+QmLBU9xgns/EeeINSZD6Ar+oLg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-gnu": { + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.1.1.tgz", + "integrity": "sha512-20bYDfgOQAPUkkKBnyP9PTuHiJGM7HzNBbuqmD0jiFVZ0aOldz+VnJhbxzjcSabYsnNjMPsE0cyzEudpYxsrUQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-linux-x64-musl": { + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.1.1.tgz", + "integrity": "sha512-9pRbK3M4asAHQRkwaXwu601oPZHghuSC8IXNENgbBSyImHv/zY4K5udBusgdHkvJ/Tcr96jJwQYOll0qU8+fPA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-arm64-msvc": { + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.1.tgz", + "integrity": "sha512-bdfQkggaLgnmYrFkSQfsHfOhk/mCYmjnrbRCGgkMcoOBZ4n+TRRSLmT/CU5SATzlBJ9TpioUyBW/vWFXTqQRiA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@next/swc-win32-x64-msvc": { + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.1.1.tgz", + "integrity": "sha512-Ncwbw2WJ57Al5OX0k4chM68DKhEPlrXBaSXDCi2kPi5f4d8b3ejr3RRJGfKBLrn2YJL5ezNS7w2TZLHSti8CMw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -981,11 +1592,20 @@ "win32" ] }, - "node_modules/@socket.io/component-emitter": { - "version": "3.1.2", - "resolved": "https://registry.npmmirror.com/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz", - "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==", - "license": "MIT" + "node_modules/@swc/helpers": { + "version": "0.5.15", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.15.tgz", + "integrity": "sha512-JQ5TuMi45Owi4/BIMAJBoSQoOJu12oOk/gADqlcUL9JEdHB8vyjUSsxqeNXnmXHjYKMi2WcYtezGEEhqUI/E2g==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.8.0" + } + }, + "node_modules/@swc/helpers/node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" }, "node_modules/@trysound/sax": { "version": "0.2.0", @@ -1015,6 +1635,7 @@ "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz", "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==", "license": "MIT", + "peer": true, "dependencies": { "@types/lodash": "*" } @@ -1025,6 +1646,7 @@ "integrity": "sha512-gWEkeiyYE4vqjON/+Obqcoeffmk0NF15WSBwSs7zwVA2bAbTaE0SJ7P0WNGoJn8uE7fiaV5a7dKYIJriEqOrmA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "undici-types": "~7.16.0" } @@ -1045,7 +1667,8 @@ "version": "3.4.3", "resolved": "https://registry.npmmirror.com/@types/raf/-/raf-3.4.3.tgz", "integrity": "sha512-c4YAvMedbPZ5tEyxzQdMoOhhJ4RD3rngZIdwC2/qDN3d7JpEhB6fiBRKVY1lg5B7Wk+uPBjn5f39j1/2MY1oOw==", - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/@types/svgo": { "version": "2.6.4", @@ -1490,19 +2113,6 @@ } } }, - "node_modules/@wtto00/html2canvas": { - "version": "1.4.3", - "resolved": "https://registry.npmmirror.com/@wtto00/html2canvas/-/html2canvas-1.4.3.tgz", - "integrity": "sha512-jwsb+xL8N+gjrSNABSaFdxmWtE4c7RNFjP20lo1G7gs63Qqo1phhxVBTzxc/apDVh6LgXsU2l5bwKtXd9uz65w==", - "license": "MIT", - "dependencies": { - "css-line-break": "^2.1.0", - "text-segmentation": "^1.0.3" - }, - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/acorn": { "version": "8.15.0", "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.15.0.tgz", @@ -1553,7 +2163,7 @@ "version": "3.1.3", "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, + "devOptional": true, "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", @@ -1685,6 +2295,7 @@ "version": "2.1.2", "resolved": "https://registry.npmmirror.com/atob/-/atob-2.1.2.tgz", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "dev": true, "license": "(MIT OR Apache-2.0)", "bin": { "atob": "bin/atob.js" @@ -1790,6 +2401,15 @@ "node": ">= 0.6.0" } }, + "node_modules/baseline-browser-mapping": { + "version": "2.9.11", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.11.tgz", + "integrity": "sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==", + "license": "Apache-2.0", + "bin": { + "baseline-browser-mapping": "dist/cli.js" + } + }, "node_modules/big.js": { "version": "5.2.2", "resolved": "https://registry.npmmirror.com/big.js/-/big.js-5.2.2.tgz", @@ -1804,7 +2424,7 @@ "version": "2.3.0", "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=8" @@ -1841,7 +2461,7 @@ "version": "3.0.3", "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "fill-range": "^7.1.1" @@ -1850,27 +2470,6 @@ "node": ">=8" } }, - "node_modules/btoa": { - "version": "1.2.1", - "resolved": "https://registry.npmmirror.com/btoa/-/btoa-1.2.1.tgz", - "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==", - "license": "(MIT OR Apache-2.0)", - "bin": { - "btoa": "bin/btoa.js" - }, - "engines": { - "node": ">= 0.4.0" - } - }, - "node_modules/bwip-js": { - "version": "4.8.0", - "resolved": "https://registry.npmmirror.com/bwip-js/-/bwip-js-4.8.0.tgz", - "integrity": "sha512-gUDkDHSTv8/DJhomSIbO0fX/Dx0MO/sgllLxJyJfu4WixCQe9nfGJzmHm64ZCbxo+gUYQEsQcRmqcwcwPRwUkg==", - "license": "MIT", - "bin": { - "bwip-js": "bin/bwip-js.js" - } - }, "node_modules/cache-base": { "version": "1.0.1", "resolved": "https://registry.npmmirror.com/cache-base/-/cache-base-1.0.1.tgz", @@ -1958,11 +2557,32 @@ "node": ">=6" } }, + "node_modules/caniuse-lite": { + "version": "1.0.30001761", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001761.tgz", + "integrity": "sha512-JF9ptu1vP2coz98+5051jZ4PwQgd2ni8A+gYSN7EA7dPKIMf0pDlSUxhdmVOaV3/fYK5uWBkgSXJaRLr4+3A6g==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0" + }, "node_modules/canvg": { "version": "3.0.11", "resolved": "https://registry.npmmirror.com/canvg/-/canvg-3.0.11.tgz", "integrity": "sha512-5ON+q7jCTgMp9cjpu4Jo6XbvfYwSB2Ow3kzHKfIyJfaCAOHLbdKPQqGKgfED/R5B+3TFFfe8pegYA+b423SRyA==", "license": "MIT", + "optional": true, "dependencies": { "@babel/runtime": "^7.12.5", "@types/raf": "^3.4.0", @@ -2004,7 +2624,7 @@ "version": "3.6.0", "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "anymatch": "~3.1.2", @@ -2078,6 +2698,12 @@ "node": ">=0.10.0" } }, + "node_modules/client-only": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/client-only/-/client-only-0.0.1.tgz", + "integrity": "sha512-IV3Ou0jSMzZrd3pZ48nLkT9DA7Ag1pnPzaiQhpW7c3RbcqqzvzzVu+L8gfqMp/8IM2MQtSiqaCxrrcfu8I8rMA==", + "license": "MIT" + }, "node_modules/clone": { "version": "2.1.2", "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz", @@ -2175,6 +2801,7 @@ "integrity": "sha512-c3Q2VVkGAUyupsjRnaNX6u8Dq2vAdzm9iuPj5FW0fRxzlxgq9Q39MDq10IvmQSpLgHQNyQzQmOo6bgGHmH3NNg==", "hasInstallScript": true, "license": "MIT", + "optional": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/core-js" @@ -2668,6 +3295,7 @@ "resolved": "https://registry.npmmirror.com/d3-selection/-/d3-selection-3.0.0.tgz", "integrity": "sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==", "license": "ISC", + "peer": true, "engines": { "node": ">=12" } @@ -2931,6 +3559,16 @@ "node": ">=0.4.0" } }, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "license": "Apache-2.0", + "optional": true, + "engines": { + "node": ">=8" + } + }, "node_modules/dom-serializer": { "version": "0.2.2", "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-0.2.2.tgz", @@ -3037,47 +3675,40 @@ } }, "node_modules/element-plus": { - "version": "2.9.11", - "resolved": "https://registry.npmmirror.com/element-plus/-/element-plus-2.9.11.tgz", - "integrity": "sha512-x4L/6YC8de4JtuE3vpaEugJdQIeHQaHtIYKyk67IeF6dTIiVax45aX4nWOygnh+xX+0gTvL6xO+9BZhPA3G82w==", + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.13.0.tgz", + "integrity": "sha512-qjxS+SBChvqCl6lU6ShiliLMN6WqFHiXQENYbAY3GKNflG+FS3jqn8JmQq0CBZq4koFqsi95NT1M6SL4whZfrA==", "license": "MIT", "dependencies": { "@ctrl/tinycolor": "^3.4.1", - "@element-plus/icons-vue": "^2.3.1", + "@element-plus/icons-vue": "^2.3.2", "@floating-ui/dom": "^1.0.1", "@popperjs/core": "npm:@sxzz/popperjs-es@^2.11.7", - "@types/lodash": "^4.14.182", - "@types/lodash-es": "^4.17.6", - "@vueuse/core": "^9.1.0", + "@types/lodash": "^4.17.20", + "@types/lodash-es": "^4.17.12", + "@vueuse/core": "^10.11.0", "async-validator": "^4.2.5", - "dayjs": "^1.11.13", - "escape-html": "^1.0.3", + "dayjs": "^1.11.19", "lodash": "^4.17.21", "lodash-es": "^4.17.21", - "lodash-unified": "^1.0.2", + "lodash-unified": "^1.0.3", "memoize-one": "^6.0.0", "normalize-wheel-es": "^1.2.0" }, "peerDependencies": { - "vue": "^3.2.0" + "vue": "^3.3.0" } }, - "node_modules/element-plus/node_modules/@types/web-bluetooth": { - "version": "0.0.16", - "resolved": "https://registry.npmmirror.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz", - "integrity": "sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==", - "license": "MIT" - }, "node_modules/element-plus/node_modules/@vueuse/core": { - "version": "9.13.0", - "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz", - "integrity": "sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==", + "version": "10.11.1", + "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.11.1.tgz", + "integrity": "sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==", "license": "MIT", "dependencies": { - "@types/web-bluetooth": "^0.0.16", - "@vueuse/metadata": "9.13.0", - "@vueuse/shared": "9.13.0", - "vue-demi": "*" + "@types/web-bluetooth": "^0.0.20", + "@vueuse/metadata": "10.11.1", + "@vueuse/shared": "10.11.1", + "vue-demi": ">=0.14.8" }, "funding": { "url": "https://github.com/sponsors/antfu" @@ -3085,7 +3716,7 @@ }, "node_modules/element-plus/node_modules/@vueuse/core/node_modules/vue-demi": { "version": "0.14.10", - "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz", "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", "hasInstallScript": true, "license": "MIT", @@ -3110,21 +3741,21 @@ } }, "node_modules/element-plus/node_modules/@vueuse/metadata": { - "version": "9.13.0", - "resolved": "https://registry.npmmirror.com/@vueuse/metadata/-/metadata-9.13.0.tgz", - "integrity": "sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==", + "version": "10.11.1", + "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.1.tgz", + "integrity": "sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/antfu" } }, "node_modules/element-plus/node_modules/@vueuse/shared": { - "version": "9.13.0", - "resolved": "https://registry.npmmirror.com/@vueuse/shared/-/shared-9.13.0.tgz", - "integrity": "sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==", + "version": "10.11.1", + "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.11.1.tgz", + "integrity": "sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==", "license": "MIT", "dependencies": { - "vue-demi": "*" + "vue-demi": ">=0.14.8" }, "funding": { "url": "https://github.com/sponsors/antfu" @@ -3132,7 +3763,7 @@ }, "node_modules/element-plus/node_modules/@vueuse/shared/node_modules/vue-demi": { "version": "0.14.10", - "resolved": "https://registry.npmmirror.com/vue-demi/-/vue-demi-0.14.10.tgz", + "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.10.tgz", "integrity": "sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==", "hasInstallScript": true, "license": "MIT", @@ -3166,45 +3797,6 @@ "node": ">= 4" } }, - "node_modules/engine.io-client": { - "version": "6.6.3", - "resolved": "https://registry.npmmirror.com/engine.io-client/-/engine.io-client-6.6.3.tgz", - "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==", - "license": "MIT", - "dependencies": { - "@socket.io/component-emitter": "~3.1.0", - "debug": "~4.3.1", - "engine.io-parser": "~5.2.1", - "ws": "~8.17.1", - "xmlhttprequest-ssl": "~2.1.1" - } - }, - "node_modules/engine.io-client/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/engine.io-parser": { - "version": "5.2.3", - "resolved": "https://registry.npmmirror.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz", - "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==", - "license": "MIT", - "engines": { - "node": ">=10.0.0" - } - }, "node_modules/entities": { "version": "1.1.2", "resolved": "https://registry.npmmirror.com/entities/-/entities-1.1.2.tgz", @@ -3398,12 +3990,6 @@ "@esbuild/win32-x64": "0.19.12" } }, - "node_modules/escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "license": "MIT" - }, "node_modules/escape-string-regexp": { "version": "5.0.0", "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", @@ -3608,7 +4194,7 @@ "version": "7.1.1", "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -3762,9 +4348,9 @@ } }, "node_modules/fuse.js": { - "version": "6.6.2", - "resolved": "https://registry.npmmirror.com/fuse.js/-/fuse.js-6.6.2.tgz", - "integrity": "sha512-cJaJkxCCxC8qIIcPBF9yGxY0W/tVZS3uEISDxhYIdtk8OL93pe+6Zj7LjCqVV4dzbqcriOZ+kQ/NE4RXZHsIGA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.1.0.tgz", + "integrity": "sha512-trLf4SzuuUxfusZADLINj+dE8clK1frKdmqiJNb1Es75fmI5oY6X2mxLVUciLLjxqw/xr72Dhy+lER6dGd02FQ==", "license": "Apache-2.0", "engines": { "node": ">=10" @@ -3849,7 +4435,7 @@ "version": "5.1.2", "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, + "devOptional": true, "license": "ISC", "dependencies": { "is-glob": "^4.0.1" @@ -4153,7 +4739,7 @@ "version": "4.3.7", "resolved": "https://registry.npmmirror.com/immutable/-/immutable-4.3.7.tgz", "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", - "dev": true, + "devOptional": true, "license": "MIT" }, "node_modules/import-fresh": { @@ -4302,7 +4888,7 @@ "version": "2.1.0", "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" @@ -4438,7 +5024,7 @@ "version": "2.1.1", "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -4484,7 +5070,7 @@ "version": "4.0.3", "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -4523,7 +5109,7 @@ "version": "7.0.0", "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.12.0" @@ -4753,12 +5339,6 @@ "node": ">=0.10.0" } }, - "node_modules/jquery": { - "version": "3.7.1", - "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz", - "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==", - "license": "MIT" - }, "node_modules/js-base64": { "version": "2.6.4", "resolved": "https://registry.npmmirror.com/js-base64/-/js-base64-2.6.4.tgz", @@ -4781,12 +5361,6 @@ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "license": "MIT" }, - "node_modules/jsbarcode": { - "version": "3.12.1", - "resolved": "https://registry.npmmirror.com/jsbarcode/-/jsbarcode-3.12.1.tgz", - "integrity": "sha512-QZQSqIknC2Rr/YOUyOkCBqsoiBAOTYK+7yNN3JsqfoUtJtkazxNw1dmPpxuv7VVvqW13kA3/mKiLq+s/e3o9hQ==", - "license": "MIT" - }, "node_modules/jsencrypt": { "version": "3.3.2", "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.2.tgz", @@ -4900,13 +5474,15 @@ "version": "4.17.21", "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/lodash-es": { "version": "4.17.21", "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz", "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/lodash-unified": { "version": "1.0.3", @@ -4938,6 +5514,18 @@ "deprecated": "This package is deprecated. Use require('node:util').isDeepStrictEqual instead.", "license": "MIT" }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "license": "MIT", + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, "node_modules/magic-string": { "version": "0.30.21", "resolved": "https://registry.npmmirror.com/magic-string/-/magic-string-0.30.21.tgz", @@ -5129,6 +5717,7 @@ "version": "2.1.3", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, "license": "MIT" }, "node_modules/muggle-string": { @@ -5240,11 +5829,92 @@ "node": ">=0.10.0" } }, + "node_modules/next": { + "version": "16.1.1", + "resolved": "https://registry.npmjs.org/next/-/next-16.1.1.tgz", + "integrity": "sha512-QI+T7xrxt1pF6SQ/JYFz95ro/mg/1Znk5vBebsWwbpejj1T0A23hO7GYEaVac9QUOT2BIMiuzm0L99ooq7k0/w==", + "license": "MIT", + "dependencies": { + "@next/env": "16.1.1", + "@swc/helpers": "0.5.15", + "baseline-browser-mapping": "^2.8.3", + "caniuse-lite": "^1.0.30001579", + "postcss": "8.4.31", + "styled-jsx": "5.1.6" + }, + "bin": { + "next": "dist/bin/next" + }, + "engines": { + "node": ">=20.9.0" + }, + "optionalDependencies": { + "@next/swc-darwin-arm64": "16.1.1", + "@next/swc-darwin-x64": "16.1.1", + "@next/swc-linux-arm64-gnu": "16.1.1", + "@next/swc-linux-arm64-musl": "16.1.1", + "@next/swc-linux-x64-gnu": "16.1.1", + "@next/swc-linux-x64-musl": "16.1.1", + "@next/swc-win32-arm64-msvc": "16.1.1", + "@next/swc-win32-x64-msvc": "16.1.1", + "sharp": "^0.34.4" + }, + "peerDependencies": { + "@opentelemetry/api": "^1.1.0", + "@playwright/test": "^1.51.1", + "babel-plugin-react-compiler": "*", + "react": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", + "react-dom": "^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0", + "sass": "^1.3.0" + }, + "peerDependenciesMeta": { + "@opentelemetry/api": { + "optional": true + }, + "@playwright/test": { + "optional": true + }, + "babel-plugin-react-compiler": { + "optional": true + }, + "sass": { + "optional": true + } + } + }, + "node_modules/next/node_modules/postcss": { + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.6", + "picocolors": "^1.0.0", + "source-map-js": "^1.0.2" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, "node_modules/normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -5275,12 +5945,6 @@ "url": "https://github.com/fb55/nth-check?sponsor=1" } }, - "node_modules/nzh": { - "version": "1.0.14", - "resolved": "https://registry.npmmirror.com/nzh/-/nzh-1.0.14.tgz", - "integrity": "sha512-wKgaqCSZdrySvB4RWop5g+v6IDv2IErsT6rjq06Bg0yiT9hiHYZO12GMGx/xweGVLcO2lDjX5RqWD0S/Jy9z5Q==", - "license": "BSD-2-Clause" - }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmmirror.com/object-assign/-/object-assign-4.1.1.tgz", @@ -5554,7 +6218,8 @@ "version": "2.1.0", "resolved": "https://registry.npmmirror.com/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/picocolors": { "version": "1.1.1", @@ -5566,7 +6231,7 @@ "version": "2.3.1", "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, + "devOptional": true, "license": "MIT", "engines": { "node": ">=8.6" @@ -5576,26 +6241,22 @@ } }, "node_modules/pinia": { - "version": "2.1.7", - "resolved": "https://registry.npmmirror.com/pinia/-/pinia-2.1.7.tgz", - "integrity": "sha512-+C2AHFtcFqjPih0zpYuvof37SFxMQ7OEG2zV9jRI12i9BOy3YQVAHwdKtyyc8pDcDyIc33WCIsZaCFWU7WWxGQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.3.1.tgz", + "integrity": "sha512-khUlZSwt9xXCaTbbxFYBKDc/bWAGWJjOgvxETwkTN7KRm66EeT1ZdZj6i2ceh9sP2Pzqsbc704r2yngBrxBVug==", "license": "MIT", "dependencies": { - "@vue/devtools-api": "^6.5.0", - "vue-demi": ">=0.14.5" + "@vue/devtools-api": "^6.6.3", + "vue-demi": "^0.14.10" }, "funding": { "url": "https://github.com/sponsors/posva" }, "peerDependencies": { - "@vue/composition-api": "^1.4.0", "typescript": ">=4.4.4", - "vue": "^2.6.14 || ^3.3.0" + "vue": "^2.7.0 || ^3.5.11" }, "peerDependenciesMeta": { - "@vue/composition-api": { - "optional": true - }, "typescript": { "optional": true } @@ -5720,6 +6381,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -5927,10 +6589,38 @@ "resolved": "https://registry.npmmirror.com/raf/-/raf-3.4.1.tgz", "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==", "license": "MIT", + "optional": true, "dependencies": { "performance-now": "^2.1.0" } }, + "node_modules/react": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", + "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "license": "MIT", + "peer": true, + "dependencies": { + "loose-envify": "^1.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-dom": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", + "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "license": "MIT", + "peer": true, + "dependencies": { + "loose-envify": "^1.1.0", + "scheduler": "^0.23.0" + }, + "peerDependencies": { + "react": "^18.2.0" + } + }, "node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz", @@ -5950,7 +6640,7 @@ "version": "3.6.0", "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "picomatch": "^2.2.1" @@ -5986,7 +6676,8 @@ "version": "0.13.11", "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==", - "license": "MIT" + "license": "MIT", + "optional": true }, "node_modules/regex-not": { "version": "1.0.2", @@ -6141,6 +6832,7 @@ "resolved": "https://registry.npmmirror.com/rgbcolor/-/rgbcolor-1.0.1.tgz", "integrity": "sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==", "license": "MIT OR SEE LICENSE IN FEEL-FREE.md", + "optional": true, "engines": { "node": ">= 0.8.15" } @@ -6157,6 +6849,7 @@ "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@types/estree": "1.0.8" }, @@ -6333,8 +7026,9 @@ "version": "1.69.5", "resolved": "https://registry.npmmirror.com/sass/-/sass-1.69.5.tgz", "integrity": "sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ==", - "dev": true, + "devOptional": true, "license": "MIT", + "peer": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", "immutable": "^4.0.0", @@ -6347,6 +7041,15 @@ "node": ">=14.0.0" } }, + "node_modules/scheduler": { + "version": "0.23.2", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", + "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", + "license": "MIT", + "dependencies": { + "loose-envify": "^1.1.0" + } + }, "node_modules/scule": { "version": "1.3.0", "resolved": "https://registry.npmmirror.com/scule/-/scule-1.3.0.tgz", @@ -6358,10 +7061,24 @@ "version": "2.0.3", "resolved": "https://registry.npmmirror.com/segmentit/-/segmentit-2.0.3.tgz", "integrity": "sha512-7mn2XL3OdTUQ+AhHz7SbgyxLTaQRzTWQNVwiK+UlTO8aePGbSwvKUzTwE4238+OUY9MoR6ksAg35zl8sfTunQQ==", + "peer": true, "dependencies": { "preval.macro": "^4.0.0" } }, + "node_modules/semver": { + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", + "license": "ISC", + "optional": true, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/set-function-length": { "version": "1.2.2", "resolved": "https://registry.npmmirror.com/set-function-length/-/set-function-length-1.2.2.tgz", @@ -6425,6 +7142,51 @@ "node": ">=0.10.0" } }, + "node_modules/sharp": { + "version": "0.34.5", + "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.34.5.tgz", + "integrity": "sha512-Ou9I5Ft9WNcCbXrU9cMgPBcCK8LiwLqcbywW3t4oDV37n1pzpuNLsYiAV8eODnjbtQlSDwZ2cUEeQz4E54Hltg==", + "hasInstallScript": true, + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "@img/colour": "^1.0.0", + "detect-libc": "^2.1.2", + "semver": "^7.7.3" + }, + "engines": { + "node": "^18.17.0 || ^20.3.0 || >=21.0.0" + }, + "funding": { + "url": "https://opencollective.com/libvips" + }, + "optionalDependencies": { + "@img/sharp-darwin-arm64": "0.34.5", + "@img/sharp-darwin-x64": "0.34.5", + "@img/sharp-libvips-darwin-arm64": "1.2.4", + "@img/sharp-libvips-darwin-x64": "1.2.4", + "@img/sharp-libvips-linux-arm": "1.2.4", + "@img/sharp-libvips-linux-arm64": "1.2.4", + "@img/sharp-libvips-linux-ppc64": "1.2.4", + "@img/sharp-libvips-linux-riscv64": "1.2.4", + "@img/sharp-libvips-linux-s390x": "1.2.4", + "@img/sharp-libvips-linux-x64": "1.2.4", + "@img/sharp-libvips-linuxmusl-arm64": "1.2.4", + "@img/sharp-libvips-linuxmusl-x64": "1.2.4", + "@img/sharp-linux-arm": "0.34.5", + "@img/sharp-linux-arm64": "0.34.5", + "@img/sharp-linux-ppc64": "0.34.5", + "@img/sharp-linux-riscv64": "0.34.5", + "@img/sharp-linux-s390x": "0.34.5", + "@img/sharp-linux-x64": "0.34.5", + "@img/sharp-linuxmusl-arm64": "0.34.5", + "@img/sharp-linuxmusl-x64": "0.34.5", + "@img/sharp-wasm32": "0.34.5", + "@img/sharp-win32-arm64": "0.34.5", + "@img/sharp-win32-ia32": "0.34.5", + "@img/sharp-win32-x64": "0.34.5" + } + }, "node_modules/side-channel": { "version": "1.1.0", "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.1.0.tgz", @@ -6626,68 +7388,6 @@ "node": ">=0.10.0" } }, - "node_modules/socket.io-client": { - "version": "4.8.1", - "resolved": "https://registry.npmmirror.com/socket.io-client/-/socket.io-client-4.8.1.tgz", - "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==", - "license": "MIT", - "dependencies": { - "@socket.io/component-emitter": "~3.1.0", - "debug": "~4.3.2", - "engine.io-client": "~6.6.1", - "socket.io-parser": "~4.2.4" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/socket.io-client/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, - "node_modules/socket.io-parser": { - "version": "4.2.4", - "resolved": "https://registry.npmmirror.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz", - "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==", - "license": "MIT", - "dependencies": { - "@socket.io/component-emitter": "~3.1.0", - "debug": "~4.3.1" - }, - "engines": { - "node": ">=10.0.0" - } - }, - "node_modules/socket.io-parser/node_modules/debug": { - "version": "4.3.7", - "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.7.tgz", - "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==", - "license": "MIT", - "dependencies": { - "ms": "^2.1.3" - }, - "engines": { - "node": ">=6.0" - }, - "peerDependenciesMeta": { - "supports-color": { - "optional": true - } - } - }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmmirror.com/source-map/-/source-map-0.6.1.tgz", @@ -6791,6 +7491,7 @@ "resolved": "https://registry.npmmirror.com/stackblur-canvas/-/stackblur-canvas-2.7.0.tgz", "integrity": "sha512-yf7OENo23AGJhBriGx0QivY5JP6Y1HbrrDI6WLt6C5auYZXlQrheoY8hD4ibekFKz1HOfE48Ww8kMWMnJD/zcQ==", "license": "MIT", + "optional": true, "engines": { "node": ">=0.1.14" } @@ -6962,6 +7663,29 @@ "dev": true, "license": "MIT" }, + "node_modules/styled-jsx": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/styled-jsx/-/styled-jsx-5.1.6.tgz", + "integrity": "sha512-qSVyDTeMotdvQYoHWLNGwRFJHC+i+ZvdBRYosOFgC+Wg1vx4frN2/RG/NA7SYqqvKNLf39P2LSRA2pu6n0XYZA==", + "license": "MIT", + "dependencies": { + "client-only": "0.0.1" + }, + "engines": { + "node": ">= 12.0.0" + }, + "peerDependencies": { + "react": ">= 16.8.0 || 17.x.x || ^18.0.0-0 || ^19.0.0-0" + }, + "peerDependenciesMeta": { + "@babel/core": { + "optional": true + }, + "babel-plugin-macros": { + "optional": true + } + } + }, "node_modules/supports-color": { "version": "7.2.0", "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz", @@ -7223,6 +7947,7 @@ "resolved": "https://registry.npmmirror.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz", "integrity": "sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==", "license": "MIT", + "optional": true, "engines": { "node": ">=12.0.0" } @@ -7304,7 +8029,7 @@ "version": "5.0.1", "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, + "devOptional": true, "license": "MIT", "dependencies": { "is-number": "^7.0.0" @@ -7495,6 +8220,7 @@ "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "devOptional": true, "license": "Apache-2.0", + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -7856,6 +8582,7 @@ "integrity": "sha512-RzAr8LSvM8lmhB4tQ5OPcBhpjOZRZjuxv9zO5UcxeoY2bd3kP3Ticd40Qma9/BqZ8JS96Ll/jeBX9u+LJZrhVg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.19.3", "postcss": "^8.4.31", @@ -7960,6 +8687,7 @@ "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.25.tgz", "integrity": "sha512-YLVdgv2K13WJ6n+kD5owehKtEXwdwXuj2TTyJMsO7pSeKw2bfRNZGjhB7YzrpbMYj5b5QsUebHpOqR3R3ziy/g==", "license": "MIT", + "peer": true, "dependencies": { "@vue/compiler-dom": "3.5.25", "@vue/compiler-sfc": "3.5.25", @@ -8000,64 +8728,24 @@ "license": "ISC" }, "node_modules/vue-plugin-hiprint": { - "version": "0.0.60", - "resolved": "https://registry.npmmirror.com/vue-plugin-hiprint/-/vue-plugin-hiprint-0.0.60.tgz", - "integrity": "sha512-a5uOMn6Nr4qlYYaVNbQKwRZJa8UcNMTflfi6J430/NDtySJB+5ArE8I8+NLjgVV56x3/qdUBs/GWuZCX5Umv1w==", - "license": "MIT", - "dependencies": { - "@claviska/jquery-minicolors": "^2.3.6", - "@wtto00/html2canvas": "^1.4.3", - "bwip-js": "^4.0.0", - "canvg": "^3.0.10", - "jquery": "^3.6.0", - "jsbarcode": "^3.11.5", - "jspdf": "^2.5.1", - "lodash": "^4.17.21", - "nzh": "^1.0.8", - "socket.io-client": "^4.5.1" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/vue-plugin-hiprint/node_modules/dompurify": { - "version": "2.5.8", - "resolved": "https://registry.npmmirror.com/dompurify/-/dompurify-2.5.8.tgz", - "integrity": "sha512-o1vSNgrmYMQObbSSvF/1brBYEQPHhV1+gsmrusO7/GXtp1T9rCS8cXFqVxK/9crT1jA6Ccv+5MTSjBNqr7Sovw==", - "license": "(MPL-2.0 OR Apache-2.0)", - "optional": true - }, - "node_modules/vue-plugin-hiprint/node_modules/jspdf": { - "version": "2.5.2", - "resolved": "https://registry.npmmirror.com/jspdf/-/jspdf-2.5.2.tgz", - "integrity": "sha512-myeX9c+p7znDWPk0eTrujCzNjT+CXdXyk7YmJq5nD5V7uLLKmSXnlQ/Jn/kuo3X09Op70Apm0rQSnFWyGK8uEQ==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.23.2", - "atob": "^2.1.2", - "btoa": "^1.2.1", - "fflate": "^0.8.1" - }, - "optionalDependencies": { - "canvg": "^3.0.6", - "core-js": "^3.6.0", - "dompurify": "^2.5.4", - "html2canvas": "^1.0.0-rc.5" - } + "version": "0.0.19", + "resolved": "https://registry.npmjs.org/vue-plugin-hiprint/-/vue-plugin-hiprint-0.0.19.tgz", + "integrity": "sha512-X1sSqTnFiCS9tioxPqSYA0eCi16rOnonvYSC2mesmM63wOgks41sZQT+1QxXpW1Sjke3saMf/R73OGl7b6bn0Q==", + "license": "MIT" }, "node_modules/vue-router": { - "version": "4.2.5", - "resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.2.5.tgz", - "integrity": "sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==", + "version": "4.6.4", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.6.4.tgz", + "integrity": "sha512-Hz9q5sa33Yhduglwz6g9skT8OBPii+4bFn88w6J+J4MfEo4KRRpmiNG/hHHkdbRFlLBOqxN8y8gf2Fb0MTUgVg==", "license": "MIT", "dependencies": { - "@vue/devtools-api": "^6.5.0" + "@vue/devtools-api": "^6.6.4" }, "funding": { "url": "https://github.com/sponsors/posva" }, "peerDependencies": { - "vue": "^3.2.0" + "vue": "^3.5.0" } }, "node_modules/vue-tsc": { @@ -8248,35 +8936,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/ws": { - "version": "8.17.1", - "resolved": "https://registry.npmmirror.com/ws/-/ws-8.17.1.tgz", - "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, - "node_modules/xmlhttprequest-ssl": { - "version": "2.1.2", - "resolved": "https://registry.npmmirror.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz", - "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/yaml": { "version": "1.10.2", "resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz", diff --git a/openhis-ui-vue3/src/api/public.js b/openhis-ui-vue3/src/api/public.js index 3caa3b3b..3060fc2b 100644 --- a/openhis-ui-vue3/src/api/public.js +++ b/openhis-ui-vue3/src/api/public.js @@ -2,121 +2,97 @@ import request from '@/utils/request'; // 获取追溯码 export function searchTraceNo(data) { - return request({ - url: '/app-common/search-trace-no', - method: 'get', - params: data, - }); + return request({ + url: '/app-common/search-trace-no', + method: 'get', + params: data, + }); } // 获取处方打印数据 export function advicePrint(data) { - return request({ - url: '/app-common/advice-print', - method: 'get', - params: data, - }); + return request({ + url: '/app-common/advice-print', + method: 'get', + params: data, + }); } // 获取全部科室列表 export function getOrgList(data) { - return request({ - url: '/app-common/department-list', - method: 'get', - params: data, - }); + return request({ + url: '/app-common/department-list', + method: 'get', + params: data, + }); } // 获取全部病区列表 export function getWardList(data) { - return request({ - url: '/app-common/ward-list', - method: 'get', - params: data, - }); + return request({ + url: '/app-common/ward-list', + method: 'get', + params: data, + }); } // 获取全部供应商列表 export function getSupplierList(data) { - return request({ - url: '/app-common/supplier', - method: 'get', - params: data, - }); + return request({ + url: '/app-common/supplier', + method: 'get', + params: data, + }); } /** * 获取项目定价方式,批次售价/统一售价 */ export function getAdjustPriceSwitchState(params) { - return request({ - url: '/change/price/getAdjustPriceSwitchState', - method: 'get', - params: params, - }); + return request({ + url: '/change/price/getAdjustPriceSwitchState', + method: 'get', + params: params, + }); } /** * 批次号匹配 */ export function lotNumberMatch(params) { - return request({ - url: '/app-common/lot-number-match', - method: 'get', - params: params, - }); + return request({ + url: '/app-common/lot-number-match', + method: 'get', + params: params, + }); } -// 获取全部科室列表 -export function getOrgList(data) { - return request({ - url:'/app-common/department-list', - method: 'get', - params: data, - }) -} - -// 获取全部病区列表 -export function getWardList(data) { - return request({ - url:'/app-common/ward-list', - method: 'get', - params: data, - }) -} - -// 获取全部供应商列表 -export function getSupplierList(data) { - return request({ - url:'/app-common/supplier', - method: 'get', - params: data, - }) -} import axios from 'axios'; const env = import.meta.env.MODE; + export function invokeYbPlugin5001(data) { return axios - .create({ - // axios中请求配置有baseURL选项，表示请求URL公共部分 - baseURL: '', - // 超时 - timeout: 60000, - }) - .post('http://localhost:5001/api/data/', data); - } + .create({ + // axios中请求配置有baseURL选项，表示请求URL公共部分 + baseURL: '', + // 超时 + timeout: 60000, + }) + .post('http://localhost:5001/api/data/', data); +} + // } export function invokeYbPlugin5000(data) { - return axios - .create({ - // axios中请求配置有baseURL选项，表示请求URL公共部分 - baseURL: '', - // 超时 - timeout: 60000, - }) - .post('http://localhost:5000/api/data/', data); + return axios + .create({ + // axios中请求配置有baseURL选项，表示请求URL公共部分 + baseURL: '', + // 超时 + timeout: 60000, + }) + .post('http://localhost:5000/api/data/', data); } diff --git a/openhis-ui-vue3/src/main.js b/openhis-ui-vue3/src/main.js index 98d61ce2..ac7b302b 100644 --- a/openhis-ui-vue3/src/main.js +++ b/openhis-ui-vue3/src/main.js @@ -41,8 +41,6 @@ import { import { formatDateStr } from '@/utils/index'; -import { formatDateStr } from '@/utils/index'; - // 分页组件 import Pagination from '@/components/Pagination'; // 自定义表格工具组件 diff --git a/openhis-ui-vue3/src/utils/validate.js b/openhis-ui-vue3/src/utils/validate.js index 3719d492..61b430de 100644 --- a/openhis-ui-vue3/src/utils/validate.js +++ b/openhis-ui-vue3/src/utils/validate.js @@ -116,7 +116,7 @@ export function getGenderAndAge(idCard) { const day = birthDate.substr(6, 2); const dateOfBirth = new Date(`${year}-${month}-${day}`); // 计算年龄 - const age = new Date().getFullYear() - dateOfBirth.getFullYear(); + let age = new Date().getFullYear() - dateOfBirth.getFullYear(); const m = new Date().getMonth() - dateOfBirth.getMonth(); if (m < 0 || (m === 0 && new Date().getDate() < dateOfBirth.getDate())) { age--; diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js index 18f158eb..46a1fb48 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js @@ -253,3 +253,14 @@ export function WxPayResult(data) { data: data, }); } + +/** + * 补打挂号 + */ +export function reprintRegistration(data) { + return request({ + url: '/charge-manage/register/reprint', + method: 'post', + data: data, + }); +} diff --git a/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue index f219722f..20d7dfdf 100644 --- a/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue +++ b/openhis-ui-vue3/src/views/clinicmanagement/disposal/index.vue @@ -469,44 +469,6 @@ function getAllList(row) { loading.value = false; }); } -// 批量操作校验 -function handleBatchValidate(type) { - let params = []; - // 是否批量选择了数据 - if (isMultiple.value) { - proxy.$modal.msgError('请选择要执行的项目'); - return; - } - if (type === 'execute') { - let activityList = activitySelectedList.value - .filter((item) => { - return item.chargeStatus === 5; - }) - .map((item) => { - return { - requestId: item.requestId, - dispenseId: item.dispenseId, - requestTable: item.requestTable, - chargeStatus: item.chargeStatus_enumText, - dispenseStatus: item.dispenseStatus_enumText, - name: item.itemName, - }; - }); - let deviceList = deviceSelectedList.value - .filter((item) => { - return item.dispenseStatus === 2; - }) - .map((item) => { - return { - requestId: item.requestId, - dispenseId: item.dispenseId, - requestTable: item.requestTable, - chargeStatus: item.chargeStatus_enumText, - dispenseStatus: item.dispenseStatus_enumText, - name: item.itemName, - }; - }); - // 批量操作校验 function handleBatchValidate(type) { let params = []; @@ -1033,20 +995,8 @@ function handleSelectionChange(selection, row) { .filter((item) => { return item.groupId && item.groupId == row?.groupId; }) - .forEach((row) => { - activityListRef.value.toggleRowSelection(row, isSelected); - }); -} - -// 选择框改变时的处理 -function handleSelectionChange(selection, row) { - const isSelected = selection.some((item) => item.requestId === row.requestId); - activityList.value - .filter((item) => { - return item.groupId && item.groupId == row?.groupId; - }) - .forEach((row) => { - activityListRef.value.toggleRowSelection(row, isSelected); + .forEach((item) => { + activityListRef.value.toggleRowSelection(item, isSelected); }); } diff --git a/openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue b/openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue index 7dd22fbb..c8f0d7a8 100644 --- a/openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue +++ b/openhis-ui-vue3/src/views/clinicmanagement/returnDrug/index.vue @@ -472,7 +472,7 @@ function handelSpanMethod({ row, column, rowIndex, columnIndex }) { } } -::v-deep.el-textarea .el-textarea__inner { +:deep(.el-textarea .el-textarea__inner) { resize: none !important; } diff --git a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue index 1967ab61..e8aaa029 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue @@ -212,25 +212,6 @@ watch( ); getList(); -function getList() { - queryParams.value.organizationId = props.patientInfo.orgId; - getAdviceBaseInfo(queryParams.value).then((res) => { - if (res.data.records.length > 0) { - adviceBaseList.value = res.data.records.filter((item) => { - if (item.adviceType == 1 || item.adviceType == 2) { - return handleQuantity(item) != 0; - } else { - return true; - } - }); - total.value = res.data.total; - nextTick(() => { - currentIndex.value = 0; - // adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]); - }); - } - }); -} // 从priceList列表中获取价格 function getPriceFromInventory(row) { if (row.priceList && row.priceList.length > 0) { diff --git a/openhis-ui-vue3/src/views/doctorstation/components/api.js b/openhis-ui-vue3/src/views/doctorstation/components/api.js index 52488253..4084a5bf 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/api.js +++ b/openhis-ui-vue3/src/views/doctorstation/components/api.js @@ -573,16 +573,6 @@ export function deleteTcmDiagnosis(syndromeGroupNo) { }); } -/** - * 删除中医诊断 - */ -export function deleteTcmDiagnosis(syndromeGroupNo) { - return request({ - url: '/doctor-station/chinese-medical/tcm-diagnosis?syndromeGroupNo=' + syndromeGroupNo, - method: 'delete', - }) -} - /** * 保存中医医嘱 */ diff --git a/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue index ba6939e2..22ea34bc 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/eprescriptiondialog.vue @@ -946,12 +946,12 @@ defineExpose({ right: 20px !important; } -::v-deep .el-table .cell { +:deep(.el-table .cell) { display: flex; align-items: center; /* 垂直居中对齐 */ } -::v-deep .el-table td { +:deep(.el-table td) { vertical-align: middle !important; } \ No newline at end of file diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue index b22f52f1..80c09a67 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue @@ -103,239 +103,6 @@ ']' }} - - -
- -
- -
- {{ prescription.name }} - - 删除 - -
- - -
- - 新增 - - - 保存 - - - 签发 - - - 撤回 - - - 组套 - - - 历史 - - - 组合 - - - 拆组 - - - 删除 - - - 刷新 - - 诊断： - - - - 费用性质： - - - - - 合计金额：{{ getPrescriptionTotalAmount(prescription.id) }}元 - -
- - -