From 021468486e1179c00670caa13349a844cc0abc0e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 04 三月 2025 17:25:15 +0800
Subject: [PATCH] 修改包路径
---
basic-server/src/main/resources/mapper/StandardProductListMapper.xml | 10
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 4
basic-server/src/main/resources/mapper/StructureTestObjectPartMapper.xml | 2
basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTemplateController.java | 6
basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectService.java | 4
basic-server/src/main/java/com/ruoyi/inspect/controller/ProductPartController.java | 6
basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService2.java | 4
cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTreeServiceImpl.java | 22
basic-server/src/main/java/com/ruoyi/inspect/dto/SampleDto.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureItemParameterServiceImpl.java | 8
basic-server/src/main/java/com/ruoyi/inspect/service/impl/SealServiceImpl.java | 10
basic-server/src/main/resources/mapper/StandardMethodMapper.xml | 6
basic-server/src/main/resources/mapper/StandardTreeMapper.xml | 28 +-
basic-server/src/main/java/com/ruoyi/inspect/controller/CapacityScopeController.java | 26 +-
basic-server/src/main/resources/mapper/ProductPartMapper.xml | 2
basic-server/src/main/java/com/ruoyi/inspect/dto/TestItemDto.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/impl/CapacityScopeServiceImpl.java | 16
basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductSupplierDensityServiceImpl.java | 8
basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTreeController.java | 24 +-
basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureItemParameter.java | 2
cnas-process/pom.xml | 6
basic-server/src/main/java/com/ruoyi/inspect/service/LaboratoryService.java | 4
basic-server/src/main/java/com/ruoyi/inspect/mapper/LaboratoryMapper.java | 4
basic-server/src/main/java/com/ruoyi/inspect/controller/LaboratoryController.java | 6
basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListService2Impl.java | 12 +
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectData.java | 2
basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTemplateMapper.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java | 2
cnas-manage/src/main/resources/mapper/ManageReviewProgramFileMapper.xml | 2
basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureItemParameterMapper.java | 6
pom.xml | 2
basic-server/src/main/java/com/ruoyi/inspect/service/impl/CertificationServiceImpl.java | 8
basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductPartServiceImpl.java | 12
basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectListener.java | 4
basic-server/src/main/java/com/ruoyi/inspect/dto/LaboratoryDto.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectPartService.java | 4
basic-server/src/main/resources/mapper/ProductSupplierDensityMapper.xml | 2
basic-server/src/main/java/com/ruoyi/inspect/service/ProductSupplierDensityService.java | 4
basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodMapper.java | 4
basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductServiceImpl.java | 24 +-
basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethod.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/ProductPartService.java | 4
basic-server/src/main/java/com/ruoyi/inspect/service/StandardTemplateService.java | 4
basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductList.java | 2
basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductMapper.java | 6
basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListSupplierAskMapper.java | 4
basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodListService.java | 4
basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTreeMapper.java | 13
basic-server/src/main/java/com/ruoyi/inspect/pojo/InsSample1.java | 2
basic-server/src/main/java/com/ruoyi/inspect/mapper/SealMapper.java | 6
cnas-manage/src/main/resources/mapper/ManageDocumentControlledMapper.xml | 2
basic-server/src/main/java/com/ruoyi/inspect/dto/PageTestObjectDto.java | 4
basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListSupplierAskServiceImpl.java | 8
basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTree.java | 2
cnas-manage/src/main/resources/mapper/ManageRecordCheckMapper.xml | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/CapacityScopeService.java | 10
basic-server/src/main/java/com/ruoyi/inspect/service/StandardTreeService.java | 8
basic-server/src/main/java/com/ruoyi/inspect/dto/CopyStandardProductListDto.java | 4
basic-server/src/main/java/com/ruoyi/inspect/dto/SampleTypeDto.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListSupplierAskService.java | 4
basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductPart.java | 2
basic-server/src/main/resources/mapper/StructureTestMapper.xml | 2
basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml | 6
basic-server/src/main/java/com/ruoyi/inspect/controller/SealController.java | 8
basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectMapper.java | 6
basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductSupplierDensity.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodListServiceImpl.java | 12
basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDto.java | 2
basic-server/src/main/java/com/ruoyi/inspect/controller/StandardMethodController.java | 6
basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectPartMapper.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java | 4
basic-server/src/main/java/com/ruoyi/inspect/mapper/CertificationMapper.java | 4
basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodListMapper.java | 6
basic-server/src/main/java/com/ruoyi/inspect/dto/InsSampleReceiveDto.java | 4
basic-server/src/main/java/com/ruoyi/inspect/pojo/Product.java | 2
basic-server/src/main/java/com/ruoyi/inspect/pojo/Seal.java | 2
basic-server/src/main/resources/mapper/ProductMapper.xml | 4
basic-server/src/main/java/com/ruoyi/inspect/dto/ModelDto.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodServiceImpl.java | 20
basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListMapper.java | 4
basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObjectPart.java | 2
basic-server/src/main/java/com/ruoyi/inspect/dto/FactoryDto.java | 2
basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDTO1.java | 4
basic-server/src/main/java/com/ruoyi/inspect/controller/StructureTestObjectPartController.java | 6
basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTemplate.java | 2
basic-server/src/main/resources/mapper/LaboratoryMapper.xml | 2
basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObject.java | 2
basic-server/src/main/resources/mapper/StandardTemplateMapper.xml | 6
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java | 4
basic-server/src/main/java/com/ruoyi/inspect/pojo/Certification.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/CertificationService.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTemplateServiceImpl.java | 8
inspect-server/src/main/java/com/ruoyi/inspect/util/XWPFDocumentUtils.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/ProductService.java | 8
basic-server/src/main/java/com/ruoyi/inspect/service/impl/LaboratoryServiceImpl.java | 8
basic-server/src/main/java/com/ruoyi/inspect/service/SealService.java | 6
basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodService.java | 4
basic-server/src/main/java/com/ruoyi/inspect/controller/ProductSupplierDensityController.java | 6
basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethodList.java | 2
basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductListSupplierAsk.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectPartServiceImpl.java | 12
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListServiceImpl.java | 25 +-
basic-server/src/main/java/com/ruoyi/inspect/dto/ResetTreeDragDTO.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService.java | 10
basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectServiceImpl.java | 8
basic-server/src/main/resources/mapper/SealMapper.xml | 4
basic-server/src/main/resources/mapper/CertificationMapper.xml | 2
basic-server/src/main/java/com/ruoyi/inspect/pojo/Laboratory.java | 2
basic-server/src/main/java/com/ruoyi/inspect/service/StructureItemParameterService.java | 4
/dev/null | 12 -
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java | 2
basic-server/src/main/java/com/ruoyi/inspect/controller/CertificationController.java | 6
inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java | 2
basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductPartMapper.java | 4
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java | 4
basic-server/src/main/resources/mapper/StandardMethodListMapper.xml | 14
basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductSupplierDensityMapper.java | 4
124 files changed, 352 insertions(+), 362 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java
deleted file mode 100644
index eae1bc2..0000000
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListService2Impl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.ruoyi.basic.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.mapper.StandardProductListMapper;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.service.StandardProductListService2;
-import org.springframework.stereotype.Service;
-
-@Service
-public class StandardProductListService2Impl extends ServiceImpl<StandardProductListMapper, StandardProductList>
- implements StandardProductListService2 {
-}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java b/basic-server/src/main/java/com/ruoyi/inspect/controller/CapacityScopeController.java
similarity index 95%
rename from basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
rename to basic-server/src/main/java/com/ruoyi/inspect/controller/CapacityScopeController.java
index 810c430..9c2a785 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CapacityScopeController.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/controller/CapacityScopeController.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.poi.excel.ExcelUtil;
@@ -9,18 +9,18 @@
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.system.service.ISysDictTypeService;
-import com.ruoyi.basic.dto.PageTestObjectDto;
-import com.ruoyi.basic.dto.ProductDTO1;
-import com.ruoyi.basic.excel.StructureTestObjectData;
-import com.ruoyi.basic.excel.StructureTestObjectListener;
-import com.ruoyi.basic.pojo.Product;
-import com.ruoyi.basic.pojo.StandardTemplate;
-import com.ruoyi.basic.pojo.StructureItemParameter;
-import com.ruoyi.basic.pojo.StructureTestObject;
-import com.ruoyi.basic.service.CapacityScopeService;
-import com.ruoyi.basic.service.ProductService;
-import com.ruoyi.basic.service.StandardTemplateService;
-import com.ruoyi.basic.service.StructureItemParameterService;
+import com.ruoyi.inspect.dto.PageTestObjectDto;
+import com.ruoyi.inspect.dto.ProductDTO1;
+import com.ruoyi.inspect.excel.StructureTestObjectData;
+import com.ruoyi.inspect.excel.StructureTestObjectListener;
+import com.ruoyi.inspect.pojo.Product;
+import com.ruoyi.inspect.pojo.StandardTemplate;
+import com.ruoyi.inspect.pojo.StructureItemParameter;
+import com.ruoyi.inspect.pojo.StructureTestObject;
+import com.ruoyi.inspect.service.CapacityScopeService;
+import com.ruoyi.inspect.service.ProductService;
+import com.ruoyi.inspect.service.StandardTemplateService;
+import com.ruoyi.inspect.service.StructureItemParameterService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java b/basic-server/src/main/java/com/ruoyi/inspect/controller/CertificationController.java
similarity index 91%
rename from basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
rename to basic-server/src/main/java/com/ruoyi/inspect/controller/CertificationController.java
index 51ed763..51b8ff1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/CertificationController.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/controller/CertificationController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.pojo.Certification;
-import com.ruoyi.basic.service.CertificationService;
+import com.ruoyi.inspect.pojo.Certification;
+import com.ruoyi.inspect.service.CertificationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java b/basic-server/src/main/java/com/ruoyi/inspect/controller/LaboratoryController.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java
rename to basic-server/src/main/java/com/ruoyi/inspect/controller/LaboratoryController.java
index c21f7be..5133178 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/LaboratoryController.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/controller/LaboratoryController.java
@@ -1,10 +1,10 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.pojo.Laboratory;
-import com.ruoyi.basic.service.LaboratoryService;
+import com.ruoyi.inspect.pojo.Laboratory;
+import com.ruoyi.inspect.service.LaboratoryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java b/basic-server/src/main/java/com/ruoyi/inspect/controller/ProductPartController.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java
rename to basic-server/src/main/java/com/ruoyi/inspect/controller/ProductPartController.java
index ca3a5b9..49ff94f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/ProductPartController.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/controller/ProductPartController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.pojo.ProductPart;
-import com.ruoyi.basic.service.ProductPartService;
+import com.ruoyi.inspect.pojo.ProductPart;
+import com.ruoyi.inspect.service.ProductPartService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java b/basic-server/src/main/java/com/ruoyi/inspect/controller/ProductSupplierDensityController.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java
rename to basic-server/src/main/java/com/ruoyi/inspect/controller/ProductSupplierDensityController.java
index 1d86970..be25f08 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/ProductSupplierDensityController.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/controller/ProductSupplierDensityController.java
@@ -1,10 +1,10 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.pojo.ProductSupplierDensity;
-import com.ruoyi.basic.service.ProductSupplierDensityService;
+import com.ruoyi.inspect.pojo.ProductSupplierDensity;
+import com.ruoyi.inspect.service.ProductSupplierDensityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java b/basic-server/src/main/java/com/ruoyi/inspect/controller/SealController.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java
rename to basic-server/src/main/java/com/ruoyi/inspect/controller/SealController.java
index a34ba34..6822a8a 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/SealController.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/controller/SealController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.pojo.Laboratory;
-import com.ruoyi.basic.pojo.Seal;
-import com.ruoyi.basic.service.SealService;
+import com.ruoyi.inspect.pojo.Laboratory;
+import com.ruoyi.inspect.pojo.Seal;
+import com.ruoyi.inspect.service.SealService;
import com.ruoyi.common.core.domain.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java b/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardMethodController.java
similarity index 93%
rename from basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java
rename to basic-server/src/main/java/com/ruoyi/inspect/controller/StandardMethodController.java
index f74f38b..038f092 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardMethodController.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardMethodController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.pojo.StandardMethod;
-import com.ruoyi.basic.service.StandardMethodService;
+import com.ruoyi.inspect.pojo.StandardMethod;
+import com.ruoyi.inspect.service.StandardMethodService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java b/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTemplateController.java
similarity index 94%
rename from basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
rename to basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTemplateController.java
index b672612..a1a8e4b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTemplateController.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTemplateController.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.pojo.StandardTemplate;
-import com.ruoyi.basic.service.StandardTemplateService;
+import com.ruoyi.inspect.pojo.StandardTemplate;
+import com.ruoyi.inspect.service.StandardTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java b/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTreeController.java
similarity index 94%
rename from basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
rename to basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTreeController.java
index d24ae09..a92e4d1 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StandardTreeController.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/controller/StandardTreeController.java
@@ -1,19 +1,19 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.dto.CopyStandardProductListDto;
-import com.ruoyi.basic.dto.FactoryDto;
-import com.ruoyi.basic.dto.InsSampleReceiveDto;
-import com.ruoyi.basic.dto.ResetTreeDragDTO;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.basic.pojo.StandardTree;
-import com.ruoyi.basic.service.StandardMethodListService;
-import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StandardProductListSupplierAskService;
-import com.ruoyi.basic.service.StandardTreeService;
+import com.ruoyi.inspect.dto.CopyStandardProductListDto;
+import com.ruoyi.inspect.dto.FactoryDto;
+import com.ruoyi.inspect.dto.InsSampleReceiveDto;
+import com.ruoyi.inspect.dto.ResetTreeDragDTO;
+import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.inspect.pojo.StandardProductListSupplierAsk;
+import com.ruoyi.inspect.pojo.StandardTree;
+import com.ruoyi.inspect.service.StandardMethodListService;
+import com.ruoyi.inspect.service.StandardProductListService;
+import com.ruoyi.inspect.service.StandardProductListSupplierAskService;
+import com.ruoyi.inspect.service.StandardTreeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java b/basic-server/src/main/java/com/ruoyi/inspect/controller/StructureTestObjectPartController.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java
rename to basic-server/src/main/java/com/ruoyi/inspect/controller/StructureTestObjectPartController.java
index 5a073e8..e6aca05 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/controller/StructureTestObjectPartController.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/controller/StructureTestObjectPartController.java
@@ -1,10 +1,10 @@
-package com.ruoyi.basic.controller;
+package com.ruoyi.inspect.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
-import com.ruoyi.basic.pojo.StructureTestObjectPart;
-import com.ruoyi.basic.service.StructureTestObjectPartService;
+import com.ruoyi.inspect.pojo.StructureTestObjectPart;
+import com.ruoyi.inspect.service.StructureTestObjectPartService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/CopyStandardProductListDto.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/CopyStandardProductListDto.java
similarity index 84%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/CopyStandardProductListDto.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/CopyStandardProductListDto.java
index 7287adb..08f9bfc 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/CopyStandardProductListDto.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/CopyStandardProductListDto.java
@@ -1,6 +1,6 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
-import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.inspect.pojo.StandardProductList;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/FactoryDto.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/FactoryDto.java
index 612bcf8..a5b36d9 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/FactoryDto.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/FactoryDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/InsSampleReceiveDto.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/InsSampleReceiveDto.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/InsSampleReceiveDto.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/InsSampleReceiveDto.java
index fbc2683..98b716d 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/InsSampleReceiveDto.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/InsSampleReceiveDto.java
@@ -1,6 +1,6 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
-import com.ruoyi.basic.pojo.InsSample1;
+import com.ruoyi.inspect.pojo.InsSample1;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/LaboratoryDto.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/LaboratoryDto.java
index e3f000c..59d088d 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/LaboratoryDto.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/LaboratoryDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/ModelDto.java
similarity index 82%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/ModelDto.java
index 5f8321e..5ed39bf 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/ModelDto.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/ModelDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/PageTestObjectDto.java
similarity index 85%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/PageTestObjectDto.java
index 684cf46..f4736d5 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/PageTestObjectDto.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/PageTestObjectDto.java
@@ -1,6 +1,6 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
-import com.ruoyi.basic.pojo.StructureTestObject;
+import com.ruoyi.inspect.pojo.StructureTestObject;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDTO1.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDTO1.java
similarity index 76%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/ProductDTO1.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDTO1.java
index 8ed7631..f9fa558 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDTO1.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDTO1.java
@@ -1,6 +1,6 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
-import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.inspect.pojo.Product;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDto.java
similarity index 77%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDto.java
index efd5d2e..a1502e6 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/ProductDto.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/ProductDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/ResetTreeDragDTO.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/ResetTreeDragDTO.java
similarity index 94%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/ResetTreeDragDTO.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/ResetTreeDragDTO.java
index d875a91..1fee4c7 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/ResetTreeDragDTO.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/ResetTreeDragDTO.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/SampleDto.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/SampleDto.java
index 18fc086..3db9c2f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleDto.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/SampleDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/SampleTypeDto.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/SampleTypeDto.java
index 0ae8087..4744706 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/SampleTypeDto.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/SampleTypeDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java b/basic-server/src/main/java/com/ruoyi/inspect/dto/TestItemDto.java
similarity index 84%
rename from basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java
rename to basic-server/src/main/java/com/ruoyi/inspect/dto/TestItemDto.java
index 4363a1a..627fc66 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/TestItemDto.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/dto/TestItemDto.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.dto;
+package com.ruoyi.inspect.dto;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java b/basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectData.java
similarity index 94%
rename from basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java
rename to basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectData.java
index 4fc2fd2..8242910 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectData.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectData.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.excel;
+package com.ruoyi.inspect.excel;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectListener.java b/basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectListener.java
similarity index 91%
rename from basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectListener.java
rename to basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectListener.java
index 04d3c2c..9c3810b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/excel/StructureTestObjectListener.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/excel/StructureTestObjectListener.java
@@ -1,8 +1,8 @@
-package com.ruoyi.basic.excel;
+package com.ruoyi.inspect.excel;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
-import com.ruoyi.basic.service.ProductService;
+import com.ruoyi.inspect.service.ProductService;
import java.util.ArrayList;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/CertificationMapper.java
similarity index 86%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/CertificationMapper.java
index 2d50f3d..86153df 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/CertificationMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/CertificationMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.pojo.Certification;
+import com.ruoyi.inspect.pojo.Certification;
import org.apache.ibatis.annotations.Param;
public interface CertificationMapper extends BaseMapper<Certification> {
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/LaboratoryMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/LaboratoryMapper.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/LaboratoryMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/LaboratoryMapper.java
index df6aab9..6be3f72 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/LaboratoryMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/LaboratoryMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.pojo.Laboratory;
+import com.ruoyi.inspect.pojo.Laboratory;
import org.apache.ibatis.annotations.Param;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductMapper.java
similarity index 85%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/ProductMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductMapper.java
index 8fdbc4a..d6e9def 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductMapper.java
@@ -1,11 +1,11 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.ProductDTO1;
-import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.inspect.dto.ProductDTO1;
+import com.ruoyi.inspect.pojo.Product;
import org.apache.ibatis.annotations.Param;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductPartMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductPartMapper.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/ProductPartMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductPartMapper.java
index 9d2943f..e45e3f5 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductPartMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductPartMapper.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ruoyi.basic.pojo.ProductPart;
+import com.ruoyi.inspect.pojo.ProductPart;
import org.apache.ibatis.annotations.Param;
public interface ProductPartMapper extends BaseMapper<ProductPart> {
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductSupplierDensityMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductSupplierDensityMapper.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/ProductSupplierDensityMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductSupplierDensityMapper.java
index 80b387c..391f77d 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/ProductSupplierDensityMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/ProductSupplierDensityMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.pojo.ProductSupplierDensity;
+import com.ruoyi.inspect.pojo.ProductSupplierDensity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/SealMapper.java
similarity index 81%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/SealMapper.java
index 9b96fc9..1ebdeb0 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/SealMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/SealMapper.java
@@ -1,11 +1,11 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.pojo.Laboratory;
-import com.ruoyi.basic.pojo.Seal;
+import com.ruoyi.inspect.pojo.Laboratory;
+import com.ruoyi.inspect.pojo.Seal;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodListMapper.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodListMapper.java
index a5e337b..540c4ab 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodListMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodListMapper.java
@@ -1,8 +1,8 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.basic.pojo.StandardMethodList;
-import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.inspect.pojo.StandardMethodList;
+import com.ruoyi.inspect.pojo.StandardProductList;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodMapper.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodMapper.java
index fb88032..93795d4 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardMethodMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardMethodMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.mybatis_config.MyBaseMapper;
-import com.ruoyi.basic.pojo.StandardMethod;
+import com.ruoyi.inspect.pojo.StandardMethod;
import org.apache.ibatis.annotations.Param;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListMapper.java
similarity index 96%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListMapper.java
index f25f673..1b0e867 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListMapper.java
@@ -1,8 +1,8 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.inspect.pojo.StandardProductList;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListSupplierAskMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListSupplierAskMapper.java
similarity index 76%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListSupplierAskMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListSupplierAskMapper.java
index ff3cdfb..23ffae9 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardProductListSupplierAskMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardProductListSupplierAskMapper.java
@@ -1,7 +1,7 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
+import com.ruoyi.inspect.pojo.StandardProductListSupplierAsk;
import org.apache.ibatis.annotations.Mapper;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTemplateMapper.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTemplateMapper.java
index d6f36c1..b96cebf 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTemplateMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTemplateMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.pojo.StandardTemplate;
+import com.ruoyi.inspect.pojo.StandardTemplate;
import org.apache.ibatis.annotations.Param;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTreeMapper.java
similarity index 78%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTreeMapper.java
index 9e4bf5a..8d14068 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StandardTreeMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StandardTreeMapper.java
@@ -1,13 +1,10 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.*;
-import com.ruoyi.basic.pojo.StandardMethodList;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.pojo.StandardTree;
+import com.ruoyi.inspect.dto.*;
+import com.ruoyi.inspect.pojo.StandardMethodList;
+import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.inspect.pojo.StandardTree;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureItemParameterMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureItemParameterMapper.java
similarity index 86%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/StructureItemParameterMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureItemParameterMapper.java
index 654741a..d32b7c4 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureItemParameterMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureItemParameterMapper.java
@@ -1,11 +1,11 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.TestItemDto;
-import com.ruoyi.basic.pojo.StructureItemParameter;
+import com.ruoyi.inspect.dto.TestItemDto;
+import com.ruoyi.inspect.pojo.StructureItemParameter;
import org.apache.ibatis.annotations.Param;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectMapper.java
similarity index 82%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectMapper.java
index 1ada57c..84bf87a 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectMapper.java
@@ -1,11 +1,11 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.dto.PageTestObjectDto;
-import com.ruoyi.basic.pojo.StructureTestObject;
+import com.ruoyi.inspect.dto.PageTestObjectDto;
+import com.ruoyi.inspect.pojo.StructureTestObject;
import org.apache.ibatis.annotations.Param;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectPartMapper.java b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectPartMapper.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectPartMapper.java
rename to basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectPartMapper.java
index 33e54f7..29a4fc3 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/mapper/StructureTestObjectPartMapper.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/mapper/StructureTestObjectPartMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.basic.mapper;
+package com.ruoyi.inspect.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.basic.pojo.StructureTestObjectPart;
+import com.ruoyi.inspect.pojo.StructureTestObjectPart;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/Certification.java
similarity index 98%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/Certification.java
index 7eb1649..b20050e 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/Certification.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/Certification.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/InsSample1.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/InsSample1.java
similarity index 98%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/InsSample1.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/InsSample1.java
index 19d5cb9..79b048f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/InsSample1.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/InsSample1.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/Laboratory.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/Laboratory.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/Laboratory.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/Laboratory.java
index a9343a1..ac72303 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/Laboratory.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/Laboratory.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/Product.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/Product.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/Product.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/Product.java
index 0847231..1d8f47f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/Product.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/Product.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/ProductPart.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductPart.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/ProductPart.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductPart.java
index 0a29975..f7eef84 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/ProductPart.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductPart.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/ProductSupplierDensity.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductSupplierDensity.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/ProductSupplierDensity.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductSupplierDensity.java
index b953919..e0a13a9 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/ProductSupplierDensity.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/ProductSupplierDensity.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/Seal.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/Seal.java
similarity index 96%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/Seal.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/Seal.java
index 783703c..9008197 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/Seal.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/Seal.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethod.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethod.java
similarity index 98%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethod.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethod.java
index 6d5ec08..1c31147 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethod.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethod.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethodList.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethodList.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethodList.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethodList.java
index 8161270..bbc0cc4 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardMethodList.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardMethodList.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductList.java
similarity index 99%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductList.java
index 1c1b79f..b10c2ae 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductList.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductList.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListSupplierAsk.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductListSupplierAsk.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListSupplierAsk.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductListSupplierAsk.java
index c857a6c..ad0b683 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardProductListSupplierAsk.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardProductListSupplierAsk.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTemplate.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTemplate.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTemplate.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTemplate.java
index e26971f..04b5c0b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTemplate.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTemplate.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTree.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTree.java
similarity index 98%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTree.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTree.java
index 8c2b6cf..fe40352 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StandardTree.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StandardTree.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureItemParameter.java
similarity index 98%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureItemParameter.java
index 7faa8be..6325cc8 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureItemParameter.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureItemParameter.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObject.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObject.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObject.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObject.java
index d5af3f2..4403363 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObject.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObject.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObjectPart.java b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObjectPart.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObjectPart.java
rename to basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObjectPart.java
index a1e500c..7a6aa14 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/StructureTestObjectPart.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/pojo/StructureTestObjectPart.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/CapacityScopeService.java
similarity index 83%
rename from basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/CapacityScopeService.java
index 6139cd1..f988c0f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/CapacityScopeService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/CapacityScopeService.java
@@ -1,13 +1,13 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.dto.PageTestObjectDto;
-import com.ruoyi.basic.dto.TestItemDto;
+import com.ruoyi.inspect.dto.PageTestObjectDto;
+import com.ruoyi.inspect.dto.TestItemDto;
-import com.ruoyi.basic.pojo.StructureItemParameter;
-import com.ruoyi.basic.pojo.StructureTestObject;
+import com.ruoyi.inspect.pojo.StructureItemParameter;
+import com.ruoyi.inspect.pojo.StructureTestObject;
import java.util.List;
import java.util.Map;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/CertificationService.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/CertificationService.java
index 7ecac80..78398ed 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/CertificationService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/CertificationService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.Certification;
+import com.ruoyi.inspect.pojo.Certification;
public interface CertificationService extends IService<Certification> {
//鏌ヨ璧勮川鏄庣粏鍒楄〃
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/LaboratoryService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/LaboratoryService.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/basic/service/LaboratoryService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/LaboratoryService.java
index 4dc05a5..e86f89b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/LaboratoryService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/LaboratoryService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.Laboratory;
+import com.ruoyi.inspect.pojo.Laboratory;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/ProductPartService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/ProductPartService.java
similarity index 83%
rename from basic-server/src/main/java/com/ruoyi/basic/service/ProductPartService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/ProductPartService.java
index 3525752..b1127b8 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/ProductPartService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/ProductPartService.java
@@ -1,8 +1,8 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.ProductPart;
+import com.ruoyi.inspect.pojo.ProductPart;
public interface ProductPartService extends IService<ProductPart> {
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/ProductService.java
similarity index 79%
rename from basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/ProductService.java
index 6fdc7c2..c55af4f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/ProductService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/ProductService.java
@@ -1,11 +1,11 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.dto.ProductDTO1;
-import com.ruoyi.basic.excel.StructureTestObjectData;
-import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.inspect.dto.ProductDTO1;
+import com.ruoyi.inspect.excel.StructureTestObjectData;
+import com.ruoyi.inspect.pojo.Product;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/ProductSupplierDensityService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/ProductSupplierDensityService.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/basic/service/ProductSupplierDensityService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/ProductSupplierDensityService.java
index 13be167..d8b8e83 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/ProductSupplierDensityService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/ProductSupplierDensityService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.ProductSupplierDensity;
+import com.ruoyi.inspect.pojo.ProductSupplierDensity;
/**
* 浜у搧鍘傚瀵嗗害缁戝畾琛�
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/SealService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/SealService.java
similarity index 78%
rename from basic-server/src/main/java/com/ruoyi/basic/service/SealService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/SealService.java
index 3e4aa91..00d5ada 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/SealService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/SealService.java
@@ -1,11 +1,11 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.Laboratory;
-import com.ruoyi.basic.pojo.Seal;
+import com.ruoyi.inspect.pojo.Laboratory;
+import com.ruoyi.inspect.pojo.Seal;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodListService.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodListService.java
index 14ee117..2c0c066 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodListService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodListService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.StandardMethodList;
+import com.ruoyi.inspect.pojo.StandardMethodList;
import java.util.List;
import java.util.Map;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodService.java
similarity index 91%
rename from basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodService.java
index d9b3432..a2e7678 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardMethodService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardMethodService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.StandardMethod;
+import com.ruoyi.inspect.pojo.StandardMethod;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService.java
index 39e0754..e7fcbae 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService.java
@@ -1,12 +1,12 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.dto.CopyStandardProductListDto;
-import com.ruoyi.basic.dto.InsSampleReceiveDto;
-import com.ruoyi.basic.dto.ResetTreeDragDTO;
-import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.inspect.dto.CopyStandardProductListDto;
+import com.ruoyi.inspect.dto.InsSampleReceiveDto;
+import com.ruoyi.inspect.dto.ResetTreeDragDTO;
+import com.ruoyi.inspect.pojo.StandardProductList;
import java.util.List;
import java.util.Map;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService2.java
similarity index 78%
rename from basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService2.java
index 4f54fe6..1f64bae 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListService2.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListService2.java
@@ -1,7 +1,7 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.StandardProductList;
+import com.ruoyi.inspect.pojo.StandardProductList;
/**
* @author Administrator
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListSupplierAskService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListSupplierAskService.java
similarity index 84%
rename from basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListSupplierAskService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListSupplierAskService.java
index c32d0e4..40267e9 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardProductListSupplierAskService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardProductListSupplierAskService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
+import com.ruoyi.inspect.pojo.StandardProductListSupplierAsk;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTemplateService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardTemplateService.java
similarity index 91%
rename from basic-server/src/main/java/com/ruoyi/basic/service/StandardTemplateService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/StandardTemplateService.java
index 3910c22..5ae7350 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTemplateService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardTemplateService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.StandardTemplate;
+import com.ruoyi.inspect.pojo.StandardTemplate;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardTreeService.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/StandardTreeService.java
index 39d08e7..62da5e3 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StandardTreeService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/StandardTreeService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.dto.FactoryDto;
-import com.ruoyi.basic.dto.SampleTypeDto;
-import com.ruoyi.basic.pojo.StandardTree;
+import com.ruoyi.inspect.dto.FactoryDto;
+import com.ruoyi.inspect.dto.SampleTypeDto;
+import com.ruoyi.inspect.pojo.StandardTree;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StructureItemParameterService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/StructureItemParameterService.java
similarity index 68%
rename from basic-server/src/main/java/com/ruoyi/basic/service/StructureItemParameterService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/StructureItemParameterService.java
index a697619..8d2cedf 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StructureItemParameterService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/StructureItemParameterService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.StructureItemParameter;
+import com.ruoyi.inspect.pojo.StructureItemParameter;
public interface StructureItemParameterService extends IService<StructureItemParameter> {
void removeNoSample(String sample);
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectPartService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectPartService.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectPartService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectPartService.java
index de84817..420d1ed 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectPartService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectPartService.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.StructureTestObjectPart;
+import com.ruoyi.inspect.pojo.StructureTestObjectPart;
/**
* 妫�楠屽璞￠浂浠惰〃
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectService.java b/basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectService.java
similarity index 74%
rename from basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectService.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectService.java
index 200a51a..74c115b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/StructureTestObjectService.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/StructureTestObjectService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.basic.service;
+package com.ruoyi.inspect.service;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.basic.pojo.StructureTestObject;
+import com.ruoyi.inspect.pojo.StructureTestObject;
/**
* 妫�娴嬪璞�(StructureTestObject)$desc
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/CapacityScopeServiceImpl.java
similarity index 95%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/CapacityScopeServiceImpl.java
index f63a161..bf763cf 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CapacityScopeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/CapacityScopeServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -9,13 +9,13 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.dto.PageTestObjectDto;
-import com.ruoyi.basic.dto.TestItemDto;
-import com.ruoyi.basic.mapper.*;
-import com.ruoyi.basic.pojo.*;
-import com.ruoyi.basic.service.CapacityScopeService;
-import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StructureItemParameterService;
+import com.ruoyi.inspect.dto.PageTestObjectDto;
+import com.ruoyi.inspect.dto.TestItemDto;
+import com.ruoyi.inspect.mapper.*;
+import com.ruoyi.inspect.pojo.*;
+import com.ruoyi.inspect.service.CapacityScopeService;
+import com.ruoyi.inspect.service.StandardProductListService;
+import com.ruoyi.inspect.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/CertificationServiceImpl.java
similarity index 87%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/CertificationServiceImpl.java
index 11a6e61..4eb722a 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/CertificationServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/CertificationServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import com.alibaba.fastjson2.JSON;
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.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.mapper.CertificationMapper;
-import com.ruoyi.basic.pojo.Certification;
-import com.ruoyi.basic.service.CertificationService;
+import com.ruoyi.inspect.mapper.CertificationMapper;
+import com.ruoyi.inspect.pojo.Certification;
+import com.ruoyi.inspect.service.CertificationService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/LaboratoryServiceImpl.java
similarity index 88%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/LaboratoryServiceImpl.java
index a91a3c5..18c4318 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/LaboratoryServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/LaboratoryServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.mapper.LaboratoryMapper;
-import com.ruoyi.basic.pojo.Laboratory;
-import com.ruoyi.basic.service.LaboratoryService;
+import com.ruoyi.inspect.mapper.LaboratoryMapper;
+import com.ruoyi.inspect.pojo.Laboratory;
+import com.ruoyi.inspect.service.LaboratoryService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductPartServiceImpl.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductPartServiceImpl.java
index 5ecfb88..009b279 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductPartServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductPartServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,11 +7,11 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.mapper.ProductPartMapper;
-import com.ruoyi.basic.mapper.StructureTestObjectPartMapper;
-import com.ruoyi.basic.pojo.ProductPart;
-import com.ruoyi.basic.pojo.StructureTestObjectPart;
-import com.ruoyi.basic.service.ProductPartService;
+import com.ruoyi.inspect.mapper.ProductPartMapper;
+import com.ruoyi.inspect.mapper.StructureTestObjectPartMapper;
+import com.ruoyi.inspect.pojo.ProductPart;
+import com.ruoyi.inspect.pojo.StructureTestObjectPart;
+import com.ruoyi.inspect.service.ProductPartService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductServiceImpl.java
similarity index 93%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductServiceImpl.java
index d1786cb..41b12b6 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil;
@@ -10,17 +10,17 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.dto.ProductDTO1;
-import com.ruoyi.basic.excel.StructureTestObjectData;
-import com.ruoyi.basic.mapper.ProductMapper;
-import com.ruoyi.basic.mapper.ProductPartMapper;
-import com.ruoyi.basic.mapper.StandardTreeMapper;
-import com.ruoyi.basic.mapper.StructureTestObjectMapper;
-import com.ruoyi.basic.pojo.*;
-import com.ruoyi.basic.service.LaboratoryService;
-import com.ruoyi.basic.service.ProductService;
-import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StructureItemParameterService;
+import com.ruoyi.inspect.dto.ProductDTO1;
+import com.ruoyi.inspect.excel.StructureTestObjectData;
+import com.ruoyi.inspect.mapper.ProductMapper;
+import com.ruoyi.inspect.mapper.ProductPartMapper;
+import com.ruoyi.inspect.mapper.StandardTreeMapper;
+import com.ruoyi.inspect.mapper.StructureTestObjectMapper;
+import com.ruoyi.inspect.pojo.*;
+import com.ruoyi.inspect.service.LaboratoryService;
+import com.ruoyi.inspect.service.ProductService;
+import com.ruoyi.inspect.service.StandardProductListService;
+import com.ruoyi.inspect.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductSupplierDensityServiceImpl.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductSupplierDensityServiceImpl.java
index 54a92ab..069498c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductSupplierDensityServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/ProductSupplierDensityServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
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.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.mapper.ProductSupplierDensityMapper;
-import com.ruoyi.basic.pojo.ProductSupplierDensity;
-import com.ruoyi.basic.service.ProductSupplierDensityService;
+import com.ruoyi.inspect.mapper.ProductSupplierDensityMapper;
+import com.ruoyi.inspect.pojo.ProductSupplierDensity;
+import com.ruoyi.inspect.service.ProductSupplierDensityService;
import org.springframework.stereotype.Service;
/**
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/SealServiceImpl.java
similarity index 80%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/SealServiceImpl.java
index 695e989..ee9b06e 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/SealServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/SealServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
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.ruoyi.basic.mapper.SealMapper;
-import com.ruoyi.basic.pojo.Laboratory;
-import com.ruoyi.basic.pojo.Seal;
-import com.ruoyi.basic.service.SealService;
+import com.ruoyi.inspect.mapper.SealMapper;
+import com.ruoyi.inspect.pojo.Laboratory;
+import com.ruoyi.inspect.pojo.Seal;
+import com.ruoyi.inspect.service.SealService;
import com.ruoyi.common.utils.QueryWrappers;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodListServiceImpl.java
similarity index 94%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodListServiceImpl.java
index 5ab1ed5..784790b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodListServiceImpl.java
@@ -1,12 +1,12 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.mapper.StandardMethodListMapper;
-import com.ruoyi.basic.mapper.StandardProductListMapper;
-import com.ruoyi.basic.pojo.StandardMethodList;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.service.StandardMethodListService;
+import com.ruoyi.inspect.mapper.StandardMethodListMapper;
+import com.ruoyi.inspect.mapper.StandardProductListMapper;
+import com.ruoyi.inspect.pojo.StandardMethodList;
+import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.inspect.service.StandardMethodListService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodServiceImpl.java
similarity index 95%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodServiceImpl.java
index 44566bd..e4df479 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardMethodServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import cn.hutool.json.JSONUtil;
import cn.hutool.poi.excel.ExcelUtil;
@@ -8,15 +8,15 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.mapper.StandardMethodMapper;
-import com.ruoyi.basic.mapper.StandardProductListMapper;
-import com.ruoyi.basic.mapper.StructureItemParameterMapper;
-import com.ruoyi.basic.pojo.StandardMethod;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.pojo.StructureItemParameter;
-import com.ruoyi.basic.service.StandardMethodService;
-import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StructureItemParameterService;
+import com.ruoyi.inspect.mapper.StandardMethodMapper;
+import com.ruoyi.inspect.mapper.StandardProductListMapper;
+import com.ruoyi.inspect.mapper.StructureItemParameterMapper;
+import com.ruoyi.inspect.pojo.StandardMethod;
+import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.inspect.pojo.StructureItemParameter;
+import com.ruoyi.inspect.service.StandardMethodService;
+import com.ruoyi.inspect.service.StandardProductListService;
+import com.ruoyi.inspect.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListService2Impl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListService2Impl.java
new file mode 100644
index 0000000..c766bb3
--- /dev/null
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListService2Impl.java
@@ -0,0 +1,12 @@
+package com.ruoyi.inspect.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.inspect.mapper.StandardProductListMapper;
+import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.inspect.service.StandardProductListService2;
+import org.springframework.stereotype.Service;
+
+@Service
+public class StandardProductListService2Impl extends ServiceImpl<StandardProductListMapper, StandardProductList>
+ implements StandardProductListService2 {
+}
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListServiceImpl.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListServiceImpl.java
index ea94918..fac55a3 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -8,18 +8,17 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.basic.dto.CopyStandardProductListDto;
-import com.ruoyi.basic.dto.InsSampleReceiveDto;
-import com.ruoyi.basic.dto.ProductDto;
-import com.ruoyi.basic.dto.ResetTreeDragDTO;
-import com.ruoyi.basic.mapper.StandardProductListMapper;
-import com.ruoyi.basic.mapper.StandardProductListSupplierAskMapper;
-import com.ruoyi.basic.mapper.StandardTreeMapper;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.basic.pojo.StandardTree;
-import com.ruoyi.basic.service.StandardProductListService;
-import com.ruoyi.basic.service.StandardProductListService2;
+import com.ruoyi.inspect.dto.CopyStandardProductListDto;
+import com.ruoyi.inspect.dto.InsSampleReceiveDto;
+import com.ruoyi.inspect.dto.ProductDto;
+import com.ruoyi.inspect.dto.ResetTreeDragDTO;
+import com.ruoyi.inspect.mapper.StandardProductListMapper;
+import com.ruoyi.inspect.mapper.StandardProductListSupplierAskMapper;
+import com.ruoyi.inspect.mapper.StandardTreeMapper;
+import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.inspect.pojo.StandardTree;
+import com.ruoyi.inspect.service.StandardProductListService;
+import com.ruoyi.inspect.service.StandardProductListService2;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListSupplierAskServiceImpl.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListSupplierAskServiceImpl.java
index 95ac78d..72c261f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardProductListSupplierAskServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardProductListSupplierAskServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.basic.mapper.StandardProductListSupplierAskMapper;
-import com.ruoyi.basic.pojo.StandardProductListSupplierAsk;
-import com.ruoyi.basic.service.StandardProductListSupplierAskService;
+import com.ruoyi.inspect.mapper.StandardProductListSupplierAskMapper;
+import com.ruoyi.inspect.pojo.StandardProductListSupplierAsk;
+import com.ruoyi.inspect.service.StandardProductListSupplierAskService;
import org.springframework.stereotype.Service;
import java.util.List;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTemplateServiceImpl.java
similarity index 92%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTemplateServiceImpl.java
index 5495ddd..8d7ac33 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTemplateServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.mapper.StandardTemplateMapper;
-import com.ruoyi.basic.pojo.StandardTemplate;
-import com.ruoyi.basic.service.StandardTemplateService;
+import com.ruoyi.inspect.mapper.StandardTemplateMapper;
+import com.ruoyi.inspect.pojo.StandardTemplate;
+import com.ruoyi.inspect.service.StandardTemplateService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTreeServiceImpl.java
similarity index 97%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTreeServiceImpl.java
index b64ab41..93f803c 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTreeServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StandardTreeServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.poi.excel.ExcelUtil;
@@ -11,16 +11,16 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.basic.dto.FactoryDto;
-import com.ruoyi.basic.dto.LaboratoryDto;
-import com.ruoyi.basic.dto.SampleTypeDto;
-import com.ruoyi.basic.mapper.StandardProductListMapper;
-import com.ruoyi.basic.mapper.StandardTreeMapper;
-import com.ruoyi.basic.pojo.StandardProductList;
-import com.ruoyi.basic.pojo.StandardTemplate;
-import com.ruoyi.basic.pojo.StandardTree;
-import com.ruoyi.basic.pojo.StructureTestObject;
-import com.ruoyi.basic.service.*;
+import com.ruoyi.inspect.dto.FactoryDto;
+import com.ruoyi.inspect.dto.LaboratoryDto;
+import com.ruoyi.inspect.dto.SampleTypeDto;
+import com.ruoyi.inspect.mapper.StandardProductListMapper;
+import com.ruoyi.inspect.mapper.StandardTreeMapper;
+import com.ruoyi.inspect.pojo.StandardProductList;
+import com.ruoyi.inspect.pojo.StandardTemplate;
+import com.ruoyi.inspect.pojo.StandardTree;
+import com.ruoyi.inspect.pojo.StructureTestObject;
+import com.ruoyi.inspect.service.*;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureItemParameterServiceImpl.java
similarity index 73%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureItemParameterServiceImpl.java
index 4009106..5604e9f 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureItemParameterServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureItemParameterServiceImpl.java
@@ -1,10 +1,10 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.mapper.StructureItemParameterMapper;
-import com.ruoyi.basic.pojo.StructureItemParameter;
-import com.ruoyi.basic.service.StructureItemParameterService;
+import com.ruoyi.inspect.mapper.StructureItemParameterMapper;
+import com.ruoyi.inspect.pojo.StructureItemParameter;
+import com.ruoyi.inspect.service.StructureItemParameterService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectPartServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectPartServiceImpl.java
similarity index 89%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectPartServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectPartServiceImpl.java
index 819ef16..f0cc96d 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectPartServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectPartServiceImpl.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -9,11 +9,11 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.mapper.ProductPartMapper;
-import com.ruoyi.basic.mapper.StructureTestObjectPartMapper;
-import com.ruoyi.basic.pojo.ProductPart;
-import com.ruoyi.basic.pojo.StructureTestObjectPart;
-import com.ruoyi.basic.service.StructureTestObjectPartService;
+import com.ruoyi.inspect.mapper.ProductPartMapper;
+import com.ruoyi.inspect.mapper.StructureTestObjectPartMapper;
+import com.ruoyi.inspect.pojo.ProductPart;
+import com.ruoyi.inspect.pojo.StructureTestObjectPart;
+import com.ruoyi.inspect.service.StructureTestObjectPartService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectServiceImpl.java b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectServiceImpl.java
similarity index 62%
rename from basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectServiceImpl.java
rename to basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectServiceImpl.java
index 60f0f40..29d6ec2 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StructureTestObjectServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/inspect/service/impl/StructureTestObjectServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ruoyi.basic.service.impl;
+package com.ruoyi.inspect.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.basic.mapper.StructureTestObjectMapper;
-import com.ruoyi.basic.pojo.StructureTestObject;
-import com.ruoyi.basic.service.StructureTestObjectService;
+import com.ruoyi.inspect.mapper.StructureTestObjectMapper;
+import com.ruoyi.inspect.pojo.StructureTestObject;
+import com.ruoyi.inspect.service.StructureTestObjectService;
import org.springframework.stereotype.Service;
/**
diff --git a/basic-server/src/main/resources/mapper/CertificationMapper.xml b/basic-server/src/main/resources/mapper/CertificationMapper.xml
index 4926d05..40304a3 100644
--- a/basic-server/src/main/resources/mapper/CertificationMapper.xml
+++ b/basic-server/src/main/resources/mapper/CertificationMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.basic.mapper.CertificationMapper">
- <select id="getCertificationDetail" resultType="com.ruoyi.basic.pojo.Certification">
+ <select id="getCertificationDetail" resultType="com.ruoyi.inspect.pojo.Certification">
select b.*
from ( select a.`name`, a.`code`,a.organization,a.explanation,a.first_issuance_date,a.latest_issuance_date,c.expire_time FROM
(SELECT id,name,MIN(date_of_issuance) AS first_issuance_date,
diff --git a/basic-server/src/main/resources/mapper/LaboratoryMapper.xml b/basic-server/src/main/resources/mapper/LaboratoryMapper.xml
index c3ab2b4..f27f412 100644
--- a/basic-server/src/main/resources/mapper/LaboratoryMapper.xml
+++ b/basic-server/src/main/resources/mapper/LaboratoryMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.LaboratoryMapper">
- <select id="selectItemParameter" resultType="com.ruoyi.basic.pojo.Laboratory">
+ <select id="selectItemParameter" resultType="com.ruoyi.inspect.pojo.Laboratory">
select * from
(
select l.id,
diff --git a/basic-server/src/main/resources/mapper/ProductMapper.xml b/basic-server/src/main/resources/mapper/ProductMapper.xml
index a13b18d..c1b0953 100644
--- a/basic-server/src/main/resources/mapper/ProductMapper.xml
+++ b/basic-server/src/main/resources/mapper/ProductMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.ProductMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.Product">
+ <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.Product">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="nameEn" column="name_en" jdbcType="VARCHAR"/>
@@ -20,7 +20,7 @@
create_user,update_user,create_time,
update_time,object_id
</sql>
- <select id="selectProductListByObjectId" resultType="com.ruoyi.basic.pojo.Product">
+ <select id="selectProductListByObjectId" resultType="com.ruoyi.inspect.pojo.Product">
select * from (
select p.id,
p.name,
diff --git a/basic-server/src/main/resources/mapper/ProductPartMapper.xml b/basic-server/src/main/resources/mapper/ProductPartMapper.xml
index f883d3c..6a77f9c 100644
--- a/basic-server/src/main/resources/mapper/ProductPartMapper.xml
+++ b/basic-server/src/main/resources/mapper/ProductPartMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.ProductPartMapper">
- <select id="selectListByProductId" resultType="com.ruoyi.basic.pojo.ProductPart">
+ <select id="selectListByProductId" resultType="com.ruoyi.inspect.pojo.ProductPart">
SELECT * from product_part pp
where pp.product_id=#{productId}
</select>
diff --git a/basic-server/src/main/resources/mapper/ProductSupplierDensityMapper.xml b/basic-server/src/main/resources/mapper/ProductSupplierDensityMapper.xml
index 4f47e62..ffe0354 100644
--- a/basic-server/src/main/resources/mapper/ProductSupplierDensityMapper.xml
+++ b/basic-server/src/main/resources/mapper/ProductSupplierDensityMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.basic.mapper.ProductSupplierDensityMapper">
- <select id="selectListByProductId" resultType="com.ruoyi.basic.pojo.ProductSupplierDensity">
+ <select id="selectListByProductId" resultType="com.ruoyi.inspect.pojo.ProductSupplierDensity">
SELECT * from product_supplier_density pp
where pp.product_id=#{productId}
</select>
diff --git a/basic-server/src/main/resources/mapper/SealMapper.xml b/basic-server/src/main/resources/mapper/SealMapper.xml
index 5cb3595..d31b318 100644
--- a/basic-server/src/main/resources/mapper/SealMapper.xml
+++ b/basic-server/src/main/resources/mapper/SealMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.SealMapper">
- <select id="selectSeal" resultType="com.ruoyi.basic.pojo.Seal">
+ <select id="selectSeal" resultType="com.ruoyi.inspect.pojo.Seal">
select l.id,s.lab_id,l.laboratory_name ,s.address, s.type as Type,s.create_time
from seal s LEFT JOIN laboratory l on s.lab_id=l.id
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
@@ -11,7 +11,7 @@
</if>
</select>
- <select id="selectLaboratory" resultType="com.ruoyi.basic.pojo.Laboratory">
+ <select id="selectLaboratory" resultType="com.ruoyi.inspect.pojo.Laboratory">
SELECT *
from laboratory
WHERE id = #{labId}
diff --git a/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml b/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
index 957fd1f..25c6462 100644
--- a/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardMethodListMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardMethodListMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardMethodList">
+ <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardMethodList">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
@@ -25,14 +25,14 @@
from user
where id = #{id}
</select>
- <select id="selectStandardMethodLists" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ <select id="selectStandardMethodLists" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
select id, code, name, remark
from standard_method
where is_use = 1
and is_product = 1
and structure_test_object_id LIKE CONCAT('%[', #{tree}, ']%')
</select>
- <select id="selectParameterList" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="selectParameterList" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select inspection_item,
inspection_item_subclass,
laboratory,
@@ -52,7 +52,7 @@
from structure_item_parameter
where method = #{code}
</select>
- <select id="selectStandardMethodLists2" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ <select id="selectStandardMethodLists2" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
select sml.id, sml.code, sml.name,sml.remark, sml.create_time, u.name create_user_name
from standard_method_list sml
left join user u on u.id = sml.create_user
@@ -70,19 +70,19 @@
and model = #{data5}
</if>
</select>
- <select id="selectStandardMethodLists3" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ <select id="selectStandardMethodLists3" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
select id, code, name, remark
from standard_method
where is_use = 1
and is_product = 1
and structure_test_object_id LIKE CONCAT('%', #{tree}, '%')
</select>
- <select id="selectListEnum" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ <select id="selectListEnum" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
select id,code,name from standard_method
where is_product = 1
and is_use = 1
</select>
- <select id="selectStandardMethodListsByNull" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ <select id="selectStandardMethodListsByNull" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
select id, code, name, remark
from standard_method
where is_use = 1
diff --git a/basic-server/src/main/resources/mapper/StandardMethodMapper.xml b/basic-server/src/main/resources/mapper/StandardMethodMapper.xml
index 739d2d4..3ab8231 100644
--- a/basic-server/src/main/resources/mapper/StandardMethodMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardMethodMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardMethodMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardMethod">
+ <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardMethod">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="code" column="code" jdbcType="VARCHAR"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
@@ -15,7 +15,7 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <select id="selectStandardMethodList" resultType="com.ruoyi.basic.pojo.StandardMethod">
+ <select id="selectStandardMethodList" resultType="com.ruoyi.inspect.pojo.StandardMethod">
select * from (
select sm.id,
sm.code,
@@ -42,7 +42,7 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="selectStandMethodById" resultType="com.ruoyi.basic.pojo.StandardMethod">
+ <select id="selectStandMethodById" resultType="com.ruoyi.inspect.pojo.StandardMethod">
select sm.id,
sm.code,
sm.name,
diff --git a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
index 52d6bfe..112ae89 100644
--- a/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardProductListMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardProductListMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardProductList">
+ <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardProductList">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
@@ -55,7 +55,7 @@
and standard_method_list_id = #{methodId}
and sort between #{endIndex} and #{beginIndex} - 1
</update>
- <select id="standardProductListIPage" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="standardProductListIPage" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select spl.* from standard_product_list spl
left join product p on spl.sample = p.name
where standard_method_list_id = #{id}
@@ -72,7 +72,7 @@
order by p.id
group by spl.id
</select>
- <select id="getOne" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="getOne" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and inspection_item = #{inspectionItem}
@@ -92,7 +92,7 @@
and inspection_item_class = #{inspectionItemClass}
</if>
</select>
- <select id="selectDetail" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="selectDetail" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and state =#{state}
@@ -111,7 +111,7 @@
WHEN man_hour_group REGEXP '[0-9]+' THEN CAST(SUBSTRING(man_hour_group, 2)AS UNSIGNED) END -- 鎻愬彇瀛楁瘝鍚庨潰鐨勬暟瀛楅儴鍒�
,id asc
</select>
- <select id="selectDetail2" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="selectDetail2" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select * from standard_product_list
where standard_method_list_id = #{standardMethodListId}
and state =#{state}
diff --git a/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml b/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
index 43b380c..e4ccb07 100644
--- a/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTemplateMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardTemplateMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardTemplate">
+ <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardTemplate">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="name" column="name" jdbcType="VARCHAR"/>
<result property="remark" column="remark" jdbcType="VARCHAR"/>
@@ -15,7 +15,7 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <select id="selectStandardTemplatePageList" resultType="com.ruoyi.basic.pojo.StandardTemplate">
+ <select id="selectStandardTemplatePageList" resultType="com.ruoyi.inspect.pojo.StandardTemplate">
select * from (
select st.id, st.name,st.number, st.remark, u2.name create_user_name, u3.name update_user_name, st.create_time, st.update_time
from standard_template st
@@ -26,7 +26,7 @@
${ew.customSqlSegment}
</if>
</select>
- <select id="getStandTempIdByName" resultType="com.ruoyi.basic.pojo.StandardTemplate">
+ <select id="getStandTempIdByName" resultType="com.ruoyi.inspect.pojo.StandardTemplate">
select id from standard_template where name=#{name}
</select>
diff --git a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
index 3187d09..137857f 100644
--- a/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
+++ b/basic-server/src/main/resources/mapper/StandardTreeMapper.xml
@@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardTreeMapper">
- <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardTree">
+ <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardTree">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
@@ -16,19 +16,19 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <resultMap id="FactoryDto" type="com.ruoyi.basic.dto.FactoryDto">
+ <resultMap id="FactoryDto" type="com.ruoyi.inspect.dto.FactoryDto">
<result property="label" column="factory"/>
<result property="value" column="factory"/>
<collection property="children" resultMap="LaboratoryDto"/>
</resultMap>
- <resultMap id="LaboratoryDto" type="com.ruoyi.basic.dto.LaboratoryDto">
+ <resultMap id="LaboratoryDto" type="com.ruoyi.inspect.dto.LaboratoryDto">
<result property="label" column="laboratory"/>
<result property="value" column="laboratory"/>
<collection property="children" resultMap="SampleTypeDto"/>
</resultMap>
- <resultMap id="SampleTypeDto" type="com.ruoyi.basic.dto.SampleTypeDto">
+ <resultMap id="SampleTypeDto" type="com.ruoyi.inspect.dto.SampleTypeDto">
<result property="label" column="sample_type"/>
<result property="value" column="sample_type"/>
<result property="sampleTypeId" column="sample_type_id"/>
@@ -38,7 +38,7 @@
<collection property="children" resultMap="SampleDto"/>
</resultMap>
- <resultMap id="SampleDto" type="com.ruoyi.basic.dto.SampleDto">
+ <resultMap id="SampleDto" type="com.ruoyi.inspect.dto.SampleDto">
<result property="label" column="sample"/>
<result property="value" column="sample"/>
<result property="partNo" column="sample_part_no"/>
@@ -46,7 +46,7 @@
<collection property="children" resultMap="ModelDto"/>
</resultMap>
- <resultMap id="ModelDto" type="com.ruoyi.basic.dto.ModelDto">
+ <resultMap id="ModelDto" type="com.ruoyi.inspect.dto.ModelDto">
<result property="label" column="model"/>
<result property="value" column="model"/>
</resultMap>
@@ -108,7 +108,7 @@
order by l.id, CAST(sto.code AS DECIMAL), p.id, ISNULL(st.id), st.id
</select>
- <select id="selectStandardProductById" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="selectStandardProductById" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select inspection_item,
inspection_item_subclass,
laboratory,
@@ -128,7 +128,7 @@
from structure_item_parameter
where id = #{id}
</select>
- <select id="getStandardProductListBySample" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="getStandardProductListBySample" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select inspection_item,
inspection_item_subclass,
laboratory,
@@ -154,7 +154,7 @@
or sp.sample = ''
or sp.sample = '[]'
</select>
- <select id="getStandardMethodListBySample" resultType="com.ruoyi.basic.pojo.StandardMethodList">
+ <select id="getStandardMethodListBySample" resultType="com.ruoyi.inspect.pojo.StandardMethodList">
select sm.code,sm.name,sm.remark from standard_method sm
left join structure_test_object sto on sm.structure_test_object_id = sto.id
where is_use = 1
@@ -163,7 +163,7 @@
and sto.specimen_name = #{sampleType}
</if>
</select>
- <select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
+ <select id="selectStandardTreeList2" resultType="com.ruoyi.inspect.pojo.StandardTree">
select '涓ぉ绉戞妧妫�娴嬩腑蹇�' factory,
l.laboratory_name laboratory,
sto.specimen_name sample_type,
@@ -177,7 +177,7 @@
where sto.specimen_name = #{sampleType}
group by sto.specimen_name
</select>
- <select id="selectStandardProductListByTree" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="selectStandardProductListByTree" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select <include refid="selectStandardTree"/>
from structure_item_parameter
where (
@@ -192,7 +192,7 @@
order by inspection_item_class, inspection_item, id asc
</select>
- <select id="selectStandardProductListByTree2" resultType="com.ruoyi.basic.pojo.StandardProductList">
+ <select id="selectStandardProductListByTree2" resultType="com.ruoyi.inspect.pojo.StandardProductList">
select <include refid="selectStandardTree"/>
from structure_item_parameter
where sample LIKE CONCAT('%[', #{tree}, ']%')
@@ -212,7 +212,7 @@
and st.sample = p.name
</select>
- <select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
+ <select id="getStandardTree3" resultType="com.ruoyi.inspect.dto.SampleDto">
select model label,
model value
from standard_tree
@@ -240,7 +240,7 @@
and (inspection_item_subclass is null or inspection_item_subclass = '')
</if>
</select>
- <select id="selectPList" resultType="com.ruoyi.basic.dto.ProductDto">
+ <select id="selectPList" resultType="com.ruoyi.inspect.dto.ProductDto">
select p.name
from structure_test_object sto
left join product p on p.object_id = sto.id
diff --git a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
index fd67dfc..5a0977b 100644
--- a/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureItemParameterMapper.xml
@@ -8,7 +8,7 @@
from structure_item_parameter
where sample like concat('%', #{sample}, '%')
</delete>
- <select id="selectItemParameterList" resultType="com.ruoyi.basic.pojo.StructureItemParameter">
+ <select id="selectItemParameterList" resultType="com.ruoyi.inspect.pojo.StructureItemParameter">
select * from (select A.id,
inspection_item,
inspection_item_en,
@@ -109,12 +109,12 @@
left join product p on p.object_id = sto.id
</select>
- <resultMap id="itemDto" type="com.ruoyi.basic.dto.TestItemDto">
+ <resultMap id="itemDto" type="com.ruoyi.inspect.dto.TestItemDto">
<result column="sId" property="id"/>
<result column="sName" property="name"/>
<collection property="children" resultMap="productDto"/>
</resultMap>
- <resultMap id="productDto" type="com.ruoyi.basic.dto.ProductDto">
+ <resultMap id="productDto" type="com.ruoyi.inspect.dto.ProductDto">
<result column="pId" property="id"/>
<result column="pName" property="name"/>
</resultMap>
diff --git a/basic-server/src/main/resources/mapper/StructureTestMapper.xml b/basic-server/src/main/resources/mapper/StructureTestMapper.xml
index 05c7ae7..06bf1a1 100644
--- a/basic-server/src/main/resources/mapper/StructureTestMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureTestMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StructureTestObjectMapper">
- <select id="selectTestObjectList" resultType="com.ruoyi.basic.dto.PageTestObjectDto">
+ <select id="selectTestObjectList" resultType="com.ruoyi.inspect.dto.PageTestObjectDto">
select * from (
select sto.id,
sto.specimen_name,
diff --git a/basic-server/src/main/resources/mapper/StructureTestObjectPartMapper.xml b/basic-server/src/main/resources/mapper/StructureTestObjectPartMapper.xml
index ee26497..16a9aa7 100644
--- a/basic-server/src/main/resources/mapper/StructureTestObjectPartMapper.xml
+++ b/basic-server/src/main/resources/mapper/StructureTestObjectPartMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.ruoyi.basic.mapper.StructureTestObjectPartMapper">
- <select id="selectListByTestObjectId" resultType="com.ruoyi.basic.pojo.StructureTestObjectPart">
+ <select id="selectListByTestObjectId" resultType="com.ruoyi.inspect.pojo.StructureTestObjectPart">
SELECT * from structure_test_object_part pp
where pp.test_object_id = #{testObjectId}
</select>
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java
index 81470cd..a076745 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java
@@ -14,7 +14,7 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalCheckDto;
import com.ruoyi.manage.mapper.InternalCheckMapper;
import com.ruoyi.manage.pojo.InternalCheck;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java
index dc6ed80..bfff502 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java
@@ -13,7 +13,7 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalImplementDto;
import com.ruoyi.manage.mapper.InternalImplementMapper;
import com.ruoyi.manage.pojo.InternalImplement;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java
index c48f22b..cf1cb81 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalMeetingServiceImpl.java
@@ -7,7 +7,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalMeetingDto;
import com.ruoyi.manage.dto.InternalMeetingParticipantDto;
import com.ruoyi.manage.mapper.InternalMeetingMapper;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java
index 8b3ef6c..d53aa2b 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java
@@ -12,7 +12,7 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.InternalPlanDto;
import com.ruoyi.manage.mapper.InternalPlanMapper;
import com.ruoyi.manage.pojo.InternalPlan;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java
index 9eecd21..ecad4e0 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java
@@ -10,7 +10,7 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.mapper.ManageControlPlanListMapper;
import com.ruoyi.manage.pojo.ManageControlPlanList;
import com.ruoyi.manage.service.ManageControlPlanListService;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java
index 4a519a6..61857da 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java
@@ -7,7 +7,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.core.domain.entity.User;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.dto.ManageMeetingDto;
import com.ruoyi.manage.dto.ManageMeetingParticipantsDto;
import com.ruoyi.manage.mapper.ManageMeetingMapper;
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
index 9f4ee07..c275170 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java
@@ -10,7 +10,7 @@
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.mapper.ManageRiskAssessmentResultsMapper;
import com.ruoyi.manage.pojo.ManageRiskAssessmentResults;
import com.ruoyi.manage.service.ManageRiskAssessmentResultsService;
diff --git a/cnas-manage/src/main/resources/mapper/ManageDocumentControlledMapper.xml b/cnas-manage/src/main/resources/mapper/ManageDocumentControlledMapper.xml
index a748604..554119e 100644
--- a/cnas-manage/src/main/resources/mapper/ManageDocumentControlledMapper.xml
+++ b/cnas-manage/src/main/resources/mapper/ManageDocumentControlledMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.process.mapper.ManageDocumentControlledMapper">
+<mapper namespace="com.ruoyi.manage.mapper.ManageDocumentControlledMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ruoyi.manage.pojo.ManageDocumentControlled">
<id column="id" property="id"/>
diff --git a/cnas-manage/src/main/resources/mapper/ManageRecordCheckMapper.xml b/cnas-manage/src/main/resources/mapper/ManageRecordCheckMapper.xml
index 1a1398e..e320c4a 100644
--- a/cnas-manage/src/main/resources/mapper/ManageRecordCheckMapper.xml
+++ b/cnas-manage/src/main/resources/mapper/ManageRecordCheckMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.process.mapper.ManageRecordCheckMapper">
+<mapper namespace="com.ruoyi.manage.mapper.ManageRecordCheckMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ruoyi.manage.pojo.ManageRecordCheck">
<id column="id" property="id"/>
diff --git a/cnas-manage/src/main/resources/mapper/ManageReviewProgramFileMapper.xml b/cnas-manage/src/main/resources/mapper/ManageReviewProgramFileMapper.xml
index 262599f..068211c 100644
--- a/cnas-manage/src/main/resources/mapper/ManageReviewProgramFileMapper.xml
+++ b/cnas-manage/src/main/resources/mapper/ManageReviewProgramFileMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.process.mapper.ManageReviewProgramFileMapper">
+<mapper namespace="com.ruoyi.manage.mapper.ManageReviewProgramFileMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ruoyi.manage.pojo.ManageReviewProgramFile">
diff --git a/cnas-process/pom.xml b/cnas-process/pom.xml
index 5b8d1f9..70ecba8 100644
--- a/cnas-process/pom.xml
+++ b/cnas-process/pom.xml
@@ -25,15 +25,9 @@
<dependency>
<groupId>org.apache.poi</groupId>
- <artifactId>poi</artifactId>
- <version>5.2.2</version> <!-- 璇锋牴鎹渶瑕侀�夋嫨鍚堥�傜殑鐗堟湰 -->
- </dependency>
- <dependency>
- <groupId>org.apache.poi</groupId>
<artifactId>poi-scratchpad</artifactId>
<version>5.2.2</version>
</dependency>
-
</dependencies>
</project>
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java
index dbc7b6b..0f6d198 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java
@@ -7,7 +7,7 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
import com.ruoyi.process.dto.InconsistentDistributionDto;
import com.ruoyi.process.dto.InconsistentDistributionProportionDto;
import com.ruoyi.process.mapper.InconsistentDistributionMapper;
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
index 1d598c5..82b850c 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java
@@ -14,8 +14,8 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
-import com.ruoyi.basic.util.XWPFDocumentUtils;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.XWPFDocumentUtils;
import com.ruoyi.process.utils.UserUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.process.dto.ProcessMethodVerifyDto;
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java
index c594c5a..3253e43 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessOrderServiceImpl.java
@@ -9,8 +9,8 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
-import com.ruoyi.basic.util.XWPFDocumentUtils;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.XWPFDocumentUtils;
import com.ruoyi.process.dto.InspectionOrderDetail;
import com.ruoyi.process.dto.InspectionOrderExportDto;
import com.ruoyi.process.dto.ProcessOrderDto;
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
index 403b821..bfd56ed 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java
@@ -18,8 +18,8 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
-import com.ruoyi.basic.util.XWPFDocumentUtils;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.XWPFDocumentUtils;
import com.ruoyi.process.dto.QualityMonitorDetailsEvaluateDto;
import com.ruoyi.process.dto.QualityMonitorDto;
import com.ruoyi.process.excel.QualityMonitorDetailsUpload;
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
index ee4dbe2..1e5091a 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java
@@ -18,8 +18,8 @@
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.basic.util.HackLoopTableRenderPolicy;
-import com.ruoyi.basic.util.XWPFDocumentUtils;
+import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.inspect.util.XWPFDocumentUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.process.dto.QualitySuperviseDetailsAccordingDto;
import com.ruoyi.process.dto.QualitySuperviseDetailsCorrectDto;
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
similarity index 98%
rename from inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java
rename to inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
index fc15a45..f3657e4 100644
--- a/inspect-server/src/main/java/com/ruoyi/basic/pojo/InsSample.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsSample.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.pojo;
+package com.ruoyi.inspect.pojo;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/util/HackLoopTableRenderPolicy.java b/inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java
similarity index 99%
rename from inspect-server/src/main/java/com/ruoyi/basic/util/HackLoopTableRenderPolicy.java
rename to inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java
index 482f920..9343a26 100644
--- a/inspect-server/src/main/java/com/ruoyi/basic/util/HackLoopTableRenderPolicy.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ruoyi.basic.util;
+package com.ruoyi.inspect.util;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.exception.RenderException;
diff --git a/inspect-server/src/main/java/com/ruoyi/basic/util/XWPFDocumentUtils.java b/inspect-server/src/main/java/com/ruoyi/inspect/util/XWPFDocumentUtils.java
similarity index 99%
rename from inspect-server/src/main/java/com/ruoyi/basic/util/XWPFDocumentUtils.java
rename to inspect-server/src/main/java/com/ruoyi/inspect/util/XWPFDocumentUtils.java
index 672cb3c..386c987 100644
--- a/inspect-server/src/main/java/com/ruoyi/basic/util/XWPFDocumentUtils.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/util/XWPFDocumentUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.basic.util;
+package com.ruoyi.inspect.util;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import org.apache.poi.xwpf.usermodel.*;
diff --git a/pom.xml b/pom.xml
index 8c3873f..afe1213 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<fastjson.version>2.0.53</fastjson.version>
<oshi.version>6.6.5</oshi.version>
<commons.io.version>2.13.0</commons.io.version>
- <poi.version>4.1.2</poi.version>
+ <poi.version>5.2.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
<!-- override dependency version -->
--
Gitblit v1.9.3