From 6e8e81028bd24a5b08f774ecf8fca10580be830c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 10 三月 2025 18:20:35 +0800
Subject: [PATCH] 检验下单代码迁移3
---
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualitySuperviseServiceImpl.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRiskAssessmentResultsServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeIlluminationServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeTempHumDateServiceImpl.java | 2
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalPlanServiceImpl.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/util/SheetWriteHandlerUtil.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/InconsistentDistributionServiceImpl.java | 2
pom.xml | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/util/HackLoopTableRenderPolicy.java | 2
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 9 +++
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
cnas-require/src/main/java/com/ruoyi/requier/service/impl/ForeignRegisterServiceImpl.java | 2
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java | 5 -
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalCheckServiceImpl.java | 2
cnas-require/src/main/java/com/ruoyi/requier/service/impl/FePowerStableServiceImpl.java | 2
ruoyi-framework/src/main/java/com/ruoyi/framework/util/XWPFDocumentUtils.java | 2
ruoyi-framework/pom.xml | 4 +
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/InternalImplementServiceImpl.java | 2
ruoyi-common/src/main/java/com/ruoyi/common/core/vo/SysUserVO.java | 21 +++++++
cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonSupervisePlanServiceImpl.java | 4 -
cnas-process/pom.xml | 18 +++++
cnas-process/src/main/java/com/ruoyi/process/service/impl/QualityMonitorServiceImpl.java | 4
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageMeetingServiceImpl.java | 2
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessMethodVerifyServiceImpl.java | 4
inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java | 3
ruoyi-system/src/main/resources/mapper/system/UserMapper.xml | 3 +
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageControlPlanListServiceImpl.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java | 2
cnas-require/src/main/java/com/ruoyi/requier/service/impl/InternalWastesServiceImpl.java | 2
32 files changed, 87 insertions(+), 36 deletions(-)
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 a076745..cee100b 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.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.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 bfff502..82ab971 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.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.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 cf1cb81..c0cdd80 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.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.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 d53aa2b..41ad064 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.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.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 ecad4e0..9d85840 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.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.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 61857da..52150ee 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.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.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 c275170..7c598f3 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.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.manage.mapper.ManageRiskAssessmentResultsMapper;
import com.ruoyi.manage.pojo.ManageRiskAssessmentResults;
import com.ruoyi.manage.service.ManageRiskAssessmentResultsService;
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonSupervisePlanServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonSupervisePlanServiceImpl.java
index b81a69f..1fa1cc7 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonSupervisePlanServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonSupervisePlanServiceImpl.java
@@ -17,7 +17,7 @@
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.personnel.dto.PersonSupervisePlanDto;
import com.ruoyi.personnel.excel.PersonSupervisePlanDetailsListener;
import com.ruoyi.personnel.excel.PersonSupervisePlanDetailsUpload;
@@ -30,7 +30,6 @@
import com.ruoyi.personnel.service.PersonSupervisePlanDetailsService;
import com.ruoyi.personnel.service.PersonSupervisePlanService;
import com.ruoyi.system.mapper.UserMapper;
-import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.hwpf.usermodel.*;
@@ -43,7 +42,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java
index 2148986..ec097a3 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingRecordServiceImpl.java
@@ -13,7 +13,7 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.performance.mapper.AuxiliaryWorkingHoursDayMapper;
import com.ruoyi.performance.mapper.PerformanceShiftMapper;
import com.ruoyi.performance.pojo.AuxiliaryWorkingHoursDay;
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
index a28a1e6..1598113 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/service/impl/PersonTrainingServiceImpl.java
@@ -17,7 +17,7 @@
import com.ruoyi.common.utils.DateImageUtil;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.personnel.dto.*;
import com.ruoyi.personnel.excel.PersonTrainingDetailedListener;
import com.ruoyi.personnel.excel.PersonTrainingDetailedUpload;
diff --git a/cnas-process/pom.xml b/cnas-process/pom.xml
index 70ecba8..c5c39bf 100644
--- a/cnas-process/pom.xml
+++ b/cnas-process/pom.xml
@@ -18,9 +18,25 @@
<dependencies>
<!--涓氬姟妯″潡-->
+<!-- <dependency>-->
+<!-- <groupId>com.ruoyi</groupId>-->
+<!-- <artifactId>inspect-server</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>com.ruoyi</groupId>
- <artifactId>inspect-server</artifactId>
+ <artifactId>ruoyi-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-framework</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>performance-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.deepoove</groupId>
+ <artifactId>poi-tl</artifactId>
</dependency>
<dependency>
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 0f6d198..5be07ef 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.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.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 d604cd5..99c49cb 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.inspect.util.HackLoopTableRenderPolicy;
-import com.ruoyi.inspect.util.XWPFDocumentUtils;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.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 007ac3d..51bac39 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
@@ -12,8 +12,8 @@
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
-import com.ruoyi.inspect.util.XWPFDocumentUtils;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.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 0711885..ac45802 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.inspect.util.HackLoopTableRenderPolicy;
-import com.ruoyi.inspect.util.XWPFDocumentUtils;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.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 0fb3b2d..26ef65e 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.inspect.util.HackLoopTableRenderPolicy;
-import com.ruoyi.inspect.util.XWPFDocumentUtils;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.XWPFDocumentUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.process.dto.QualitySuperviseDetailsAccordingDto;
import com.ruoyi.process.dto.QualitySuperviseDetailsCorrectDto;
diff --git a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeIlluminationServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeIlluminationServiceImpl.java
index c885dc9..0b9abb0 100644
--- a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeIlluminationServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeIlluminationServiceImpl.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.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.requier.dto.FeIlluminationDto;
import com.ruoyi.requier.dto.FeIlluminationExportDto;
diff --git a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FePowerStableServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FePowerStableServiceImpl.java
index 9d00e6b..08f9afb 100644
--- a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FePowerStableServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FePowerStableServiceImpl.java
@@ -9,7 +9,7 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.Pictures;
import com.ruoyi.framework.exception.ErrorException;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.requier.dto.FePowerStableDto;
import com.ruoyi.requier.dto.FePowerStableExportDto;
diff --git a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeTempHumDateServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeTempHumDateServiceImpl.java
index cde3cbd..2344687 100644
--- a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeTempHumDateServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/FeTempHumDateServiceImpl.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.requier.dto.FeTempHumDateDto;
import com.ruoyi.requier.dto.FeTempHumRecordDto;
import com.ruoyi.requier.mapper.FeTempHumDateMapper;
diff --git a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/ForeignRegisterServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/ForeignRegisterServiceImpl.java
index cc56c2d..360ef94 100644
--- a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/ForeignRegisterServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/ForeignRegisterServiceImpl.java
@@ -8,7 +8,7 @@
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.utils.QueryWrappers;
-import com.ruoyi.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.requier.dto.ForeignRegisterDto;
import com.ruoyi.requier.mapper.ForeignRegisterMapper;
diff --git a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/InternalWastesServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/InternalWastesServiceImpl.java
index f472230..4ef0e81 100644
--- a/cnas-require/src/main/java/com/ruoyi/requier/service/impl/InternalWastesServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/requier/service/impl/InternalWastesServiceImpl.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.inspect.util.HackLoopTableRenderPolicy;
+import com.ruoyi.framework.util.HackLoopTableRenderPolicy;
import com.ruoyi.requier.dto.InternalWastesDto;
import com.ruoyi.requier.mapper.InternalWastesMapper;
import com.ruoyi.requier.pojo.InternalWastes;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
index e5f1577..ed22a65 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/InsSampleMapper.java
@@ -14,6 +14,7 @@
import com.ruoyi.inspect.vo.SampleVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
import java.time.LocalDateTime;
import java.util.List;
@@ -46,7 +47,7 @@
List<SampleProductDto> selectSampleProductListByOrderId2(Integer id);
- List<SampleProductDto3> selectSampleProductListByOrderId3(List<Integer> ids);
+ List<SampleProductDto3> selectSampleProductListByOrderId3(@Param("ids") List<Integer> ids);
List<SampleProductDto> getInsOrderAndSample(Integer id, String laboratory);
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
index ed21b5c..272479d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java
@@ -1198,8 +1198,7 @@
@Override
public void exportChecked(Map<String, Object> data, HttpServletResponse response) {
// Integer userId = getLook.selectPowerByMethodAndUserId(null).get("userId");
- Integer userId = Integer.valueOf(String.valueOf(SecurityUtils.getLoginUser().getUserId()));
- User user = userMapper.selectById(userId);
+ User user = userMapper.selectById(SecurityUtils.getLoginUser().getUserId());
List<String> names = null;
String startTime = "";
String endTime = "";
@@ -1708,7 +1707,7 @@
}
temperatureCyclingList = temperatureCyclingList.stream().distinct().collect(Collectors.toList());
//鏌ヨ鍏ㄨ壊璋憋紝杩囨护鑹叉爣骞舵帓搴�
- List<String> colorList = dictTypeService.selectDictDataByType("color_type").stream()
+ List<String> colorList = dictTypeService.selectDictDataByType("fiber_color_type").stream()
.sorted(Comparator.comparing(SysDictData::getDictSort))
.map(SysDictData::getDictLabel)
.collect(Collectors.toList());
diff --git a/pom.xml b/pom.xml
index a7ea6ca..e7c41a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -389,8 +389,6 @@
<module>ruoyi-admin</module>
<module>ruoyi-framework</module>
<module>ruoyi-system</module>
- <module>ruoyi-quartz</module>
- <module>ruoyi-generator</module>
<module>ruoyi-common</module>
<module>basic-server</module>
<module>inspect-server</module>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index ae31b90..ba48829 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -2,6 +2,9 @@
import java.util.List;
import java.util.Set;
+
+import com.ruoyi.common.core.vo.SysUserVO;
+import com.ruoyi.system.mapper.UserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -39,6 +42,9 @@
@Autowired
private TokenService tokenService;
+ @Autowired
+ private UserMapper userMapper;
+
/**
* 鐧诲綍鏂规硶
*
@@ -66,6 +72,9 @@
{
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
+ //鏌ヨ鐢ㄦ埛淇℃伅
+ //TODO:閲嶅啓鏌ヨ鐢ㄦ埛淇℃伅sql
+// SysUserVO userInfo = userMapper.selectUserInfo(user.getUserId());
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/vo/SysUserVO.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/vo/SysUserVO.java
new file mode 100644
index 0000000..46d03ba
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/vo/SysUserVO.java
@@ -0,0 +1,21 @@
+package com.ruoyi.common.core.vo;
+
+import com.ruoyi.common.core.domain.entity.SysUser;
+import io.swagger.annotations.ApiModelProperty;
+
+public class SysUserVO extends SysUser {
+
+ /**
+ * 濮旀墭瀹㈡埛鍗曚綅鍚嶇О
+ */
+ @ApiModelProperty("濮旀墭瀹㈡埛鍗曚綅鍚嶇О")
+ private String companyName;
+
+ public String getCompanyName() {
+ return companyName;
+ }
+
+ public void setCompanyName(String companyName) {
+ this.companyName = companyName;
+ }
+}
diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml
index d7a4630..c48d10c 100644
--- a/ruoyi-framework/pom.xml
+++ b/ruoyi-framework/pom.xml
@@ -52,6 +52,10 @@
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.deepoove</groupId>
+ <artifactId>poi-tl</artifactId>
+ </dependency>
<!-- 绯荤粺妯″潡-->
<dependency>
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/HackLoopTableRenderPolicy.java
similarity index 98%
rename from inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java
rename to ruoyi-framework/src/main/java/com/ruoyi/framework/util/HackLoopTableRenderPolicy.java
index 9343a26..79e77fd 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/util/HackLoopTableRenderPolicy.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/HackLoopTableRenderPolicy.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ruoyi.inspect.util;
+package com.ruoyi.framework.util;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.exception.RenderException;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/util/SheetWriteHandlerUtil.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/SheetWriteHandlerUtil.java
similarity index 97%
rename from inspect-server/src/main/java/com/ruoyi/inspect/util/SheetWriteHandlerUtil.java
rename to ruoyi-framework/src/main/java/com/ruoyi/framework/util/SheetWriteHandlerUtil.java
index a9f274d..8858ac1 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/util/SheetWriteHandlerUtil.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/SheetWriteHandlerUtil.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.util;
+package com.ruoyi.framework.util;
import com.alibaba.excel.write.handler.SheetWriteHandler;
import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/util/XWPFDocumentUtils.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/XWPFDocumentUtils.java
similarity index 98%
rename from inspect-server/src/main/java/com/ruoyi/inspect/util/XWPFDocumentUtils.java
rename to ruoyi-framework/src/main/java/com/ruoyi/framework/util/XWPFDocumentUtils.java
index 386c987..2563bf1 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/util/XWPFDocumentUtils.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/util/XWPFDocumentUtils.java
@@ -1,4 +1,4 @@
-package com.ruoyi.inspect.util;
+package com.ruoyi.framework.util;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import org.apache.poi.xwpf.usermodel.*;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
index c320557..157d946 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UserMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.core.vo.SysUserVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -45,5 +46,6 @@
*/
User getUserNow(@Param("userId") int userId);
+ SysUserVO selectUserInfo(Long userId);
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
index 6487371..f05881a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/UserMapper.xml
@@ -60,4 +60,7 @@
left join custom c on u.company = c.id
where u.id = #{userId}
</select>
+ <select id="selectUserInfo" resultType="com.ruoyi.common.core.vo.SysUserVO">
+ select * from user
+ </select>
</mapper>
--
Gitblit v1.9.3