From bb120c51ecba1bb4a16224352a6e8f620fdff79f Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期五, 28 二月 2025 15:16:12 +0800
Subject: [PATCH] 清除控制台直接打印
---
ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProcess.java | 6 --
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java | 1
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java | 1
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java | 29 --------------
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceRecordServiceImpl.java | 1
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java | 1
ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java | 23 +++--------
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java | 4 +-
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java | 10 ++---
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java | 1
ruoyi-common/src/main/java/com/ruoyi/common/oa/OAService.java | 9 ++--
performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java | 3 -
cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java | 1
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 1
14 files changed, 17 insertions(+), 74 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java
index 3aa6f7b..819a5b9 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageDocumentListServiceImpl.java
@@ -95,33 +95,4 @@
saveBatch(list);
}
- public String wordToPdf(String wordPath, String pdfPath) {
- FileOutputStream os = null;
- try {
- InputStream is = new ClassPathResource("/lib/license.xml").getInputStream();
- License license = new License();
- license.setLicense(is);
- if (!license.getIsLicensed()) {
- System.out.println("License楠岃瘉涓嶉�氳繃...");
- return null;
- }
- //鐢熸垚涓�涓┖鐨凱DF鏂囦欢
- File file = new File(pdfPath.replace(".pdf", ".pdf"));
- os = new FileOutputStream(file);
- //瑕佽浆鎹㈢殑word鏂囦欢
- com.aspose.words.Document doc = new com.aspose.words.Document(wordPath);
- doc.save(os, SaveFormat.PDF);
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (os != null) {
- try {
- os.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- return null;
- }
}
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java
index bd8155c..1f3a735 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCancelServiceImpl.java
@@ -430,7 +430,6 @@
for (int i = 1; i < rows.size(); i++) { // 浠庣浜岃寮�濮嬶紝璺宠繃琛ㄥご
XWPFTableRow row = rows.get(i);
if (row.getTableCells().size() != 10) {
- System.out.println("琛� " + (i + 1) + " 鐨勫垪鏁颁笉鍖归厤锛岃烦杩囪琛�");
continue;
}
if (ObjectUtils.isNotEmpty(row.getCell(1).getText())) {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java
index 9ffe421..47eda59 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordCheckServiceImpl.java
@@ -421,7 +421,6 @@
for (int i = 1; i < rows.size(); i++) { // 浠庣浜岃寮�濮嬶紝璺宠繃琛ㄥご
XWPFTableRow row = rows.get(i);
if (row.getTableCells().size() != 9) {
- System.out.println("琛� " + (i + 1) + " 鐨勫垪鏁颁笉鍖归厤锛岃烦杩囪琛�");
continue;
}
if (ObjectUtils.isNotEmpty(row.getCell(1).getText())) {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java
index 4326aec..d1ce9ea 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIntervalsServiceImpl.java
@@ -448,7 +448,6 @@
for (int i = 1; i < rows.size(); i++) { // 浠庣浜岃寮�濮嬶紝璺宠繃琛ㄥご
XWPFTableRow row = rows.get(i);
if (row.getTableCells().size() != 7) {
- System.out.println("琛� " + (i + 1) + " 鐨勫垪鏁颁笉鍖归厤锛岃烦杩囪琛�");
continue;
}
if (ObjectUtils.isNotEmpty(row.getCell(1).getText())) {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java
index 4fb7805..109a595 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordIssueRecycleServiceImpl.java
@@ -613,7 +613,6 @@
for (int i = 2; i < rows.size(); i++) { // 浠庣涓夎寮�濮嬶紝璺宠繃琛ㄥご
XWPFTableRow row = rows.get(i);
if (row.getTableCells().size() != 12) {
- System.out.println("琛� " + (i + 1) + " 鐨勫垪鏁颁笉鍖归厤锛岃烦杩囪琛�");
continue;
}
if (ObjectUtils.isNotEmpty(row.getCell(1).getText())) {
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
index de56b41..043e911 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/service/impl/ManageRecordVerifyServiceImpl.java
@@ -117,7 +117,6 @@
for (int i = 1; i < rows.size(); i++) { // 浠庣浜岃寮�濮嬶紝璺宠繃琛ㄥご
XWPFTableRow row = rows.get(i);
if (row.getTableCells().size() != 8) {
- System.out.println("琛� " + (i + 1) + " 鐨勫垪鏁颁笉鍖归厤锛岃烦杩囪琛�");
continue;
}
if (ObjectUtils.isNotEmpty(row.getCell(1).getText())) {
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceRecordServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceRecordServiceImpl.java
index 134e4ba..c02f6dc 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceRecordServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceRecordServiceImpl.java
@@ -58,7 +58,6 @@
}
standardSubstance.setState(0);
feStandardSubstanceMapper.updateById(standardSubstance);
- System.out.println(feStandardSubstanceRecord);
baseMapper.update(feStandardSubstanceRecord, Wrappers.<FeStandardSubstanceRecord>lambdaUpdate()
.eq(FeStandardSubstanceRecord::getSubstanceId, feStandardSubstanceRecord.getSubstanceId())
.eq(FeStandardSubstanceRecord::getStatus, 0));
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
index 6712b95..6a51cca 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java
@@ -66,7 +66,7 @@
public String unqualifiedHandlerOACallback(String data){
String msg = OAProcess.oaReturnMsg(0, "success");
JSONObject json = JSONObject.parseObject(data);
- System.out.println("========>" + json);
+ log.info("oa鍥炶皟鍙傛暟========>" + json);
try {
Long oaWorkId = json.getLong(REQUESTID);
String checkResult = json.getString(CHECKRESULT);
@@ -77,7 +77,7 @@
log.error("oa鍥炶皟澶辫触: " + e.getMessage());
msg = OAProcess.oaReturnMsg(1, "oa鍥炶皟澶辫触: " + e.getMessage());
}
- System.out.println("oa鍥炶皟杩斿洖缁撴灉========>" + msg);
+ log.info("oa鍥炶皟杩斿洖缁撴灉========>" + msg);
return msg;
}
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 0a6305f..5b7231d 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -4240,7 +4240,6 @@
License license = new License();
license.setLicense(is);
if (!license.getIsLicensed()) {
- System.out.println("License楠岃瘉涓嶉�氳繃...");
return null;
}
//鐢熸垚涓�涓┖鐨凱DF鏂囦欢
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
index 742af90..7d61ac8 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
@@ -36,6 +36,7 @@
import com.ruoyi.inspect.mapper.InsUnqualifiedHandlerMapper;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.system.service.InformationNotificationService;
+import lombok.extern.slf4j.Slf4j;
import org.apache.poi.xwpf.usermodel.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -65,6 +66,7 @@
* @createDate 2024-03-17 22:10:02
*/
@Service
+@Slf4j
public class InsReportServiceImpl extends ServiceImpl<InsReportMapper, InsReport>
implements InsReportService {
@Resource
@@ -540,7 +542,6 @@
// 娓呯悊涓存椂鏂囦欢澶�
deleteDirectory(tempFolder);
- System.out.println("ZIP鏂囦欢鍒涘缓瀹屾垚锛�");
} catch (IOException e) {
e.printStackTrace();
}
@@ -675,13 +676,11 @@
FileOutputStream os = null;
try {
//鍑瘉 涓嶇劧鍒囨崲鍚庢湁姘村嵃
-// InputStream is = this.getClass().getResourceAsStream("/lib/license.xml");
-// InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("license.xml");
InputStream is = Files.newInputStream(new File(licenseUrl).toPath());
License license = new License();
license.setLicense(is);
if (!license.getIsLicensed()) {
- System.out.println("License楠岃瘉涓嶉�氳繃...");
+ log.info("License楠岃瘉涓嶉�氳繃...");
return null;
}
//鐢熸垚涓�涓┖鐨凱DF鏂囦欢
@@ -1120,7 +1119,7 @@
License license = new License();
license.setLicense(is);
if (!license.getIsLicensed()) {
- System.out.println("License楠岃瘉涓嶉�氳繃...");
+ log.info("License楠岃瘉涓嶉�氳繃...");
return null;
}
//鐢熸垚涓�涓┖鐨凱DF鏂囦欢
@@ -1131,7 +1130,6 @@
//瑕佽浆鎹㈢殑word鏂囦欢
com.aspose.words.Document doc = new com.aspose.words.Document(wordPath);
doc.save(os, SaveFormat.PDF);
- String name = file.getName();
return file.getName();
} catch (Exception e) {
e.printStackTrace();
diff --git a/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java b/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
index 7b02c03..b49c9f8 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
@@ -114,7 +114,6 @@
@ApiOperation(value = "涓存椂鎺ュ彛-娣诲姞7鏈堜唤8鏈堜唤鐨勬暟鎹�")
@GetMapping("temporaryInterface")
public void temporaryInterface() {
- System.out.println("寮�濮嬬粰姣忎釜浜鸿繘琛屾帓鐝�,榛樿鏃╃彮======start");
// TODO 缁欐瘡涓汉閮借繘琛屾帓鐝�(榛樿鏃╃彮)
PerformanceShiftAddDto performanceShiftAddDto = new PerformanceShiftAddDto();
//鐝--鏃�(鏌ヨ瀛楀吀)
@@ -140,13 +139,11 @@
endOfWeek = startOfWeek.plusDays(6);
LocalDateTime startDateTime = LocalDateTime.of(startOfWeek, LocalTime.MIDNIGHT);
LocalDateTime endDateTime = LocalDateTime.of(endOfWeek, LocalTime.MIDNIGHT);
- System.out.println("Week starts on " + startDateTime + " and ends on " + endDateTime);
performanceShiftAddDto.setStartWeek(startDateTime);
performanceShiftAddDto.setEndWeek(endDateTime);
performanceShiftService.performanceShiftAdd(performanceShiftAddDto);
startOfWeek = startOfWeek.plusWeeks(1);
}
- System.out.println("鎺掔彮缁撴潫======end");
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProcess.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProcess.java
index c54d0a4..fd90aba 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProcess.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAProcess.java
@@ -37,8 +37,6 @@
// 鍙戣捣OA娴佺▼
OAResult oaResult = oaService.sendWorkFlow(wri);
- // 杈撳嚭OA娴佺▼鎵ц缁撴灉
- System.out.println(oaResult);
return oaResult;
}
@@ -51,17 +49,15 @@
wri.setCreaterId(createrId);
wri.setRequestLevel("0");
wri.setRequestName(requestName);
+ //todo: oa鎻愪氦 1: 鐩存帴鍙戦�佹祦绋�, 0:瀛樺叆鑽夌绠�
// wri.setIsnextflow("1");
wri.setIsnextflow("0");
//鍒涘缓涓昏〃
OAWorkflowTable wmi = oaService.createOAMainWorkflowTable(mainFields);
// 灏嗕富琛ㄤ俊鎭～鍏呭埌娴佺▼淇℃伅閲�
wri.setWorkflowMainTable(wmi);
-
// 鍙戣捣OA娴佺▼
OAResult oaResult = oaService.sendWorkFlow(wri);
- // 杈撳嚭OA娴佺▼鎵ц缁撴灉
- System.out.println(oaResult);
return oaResult;
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAService.java b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAService.java
index c80683f..4044700 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAService.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/oa/OAService.java
@@ -23,11 +23,10 @@
oaWorkflowRequestTableField.add(createOAWorkflowRequestTableField(field.getKey(), field.getValue().toString()));
}
- System.out.println("@#######################");
- for (OAWorkflowRequestTableField workflowRequestTableField : oaWorkflowRequestTableField) {
-
- System.out.println(workflowRequestTableField.fieldName +","+ workflowRequestTableField.fieldValue +"--"+ workflowRequestTableField.fieldType);
- }
+// for (OAWorkflowRequestTableField workflowRequestTableField : oaWorkflowRequestTableField) {
+//
+// System.out.println(workflowRequestTableField.fieldName +","+ workflowRequestTableField.fieldValue +"--"+ workflowRequestTableField.fieldType);
+// }
//鍒涘缓涓昏〃鍒�
ArrayOfOAWorkflowRequestTableField wrti = new ArrayOfOAWorkflowRequestTableField();
wrti.oaWorkflowRequestTableField = oaWorkflowRequestTableField;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
index f52e83e..044eb71 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java
@@ -4,7 +4,7 @@
/**
* 杞箟鍜屽弽杞箟宸ュ叿绫�
- *
+ *
* @author ruoyi
*/
public class EscapeUtil
@@ -30,7 +30,7 @@
/**
* 杞箟鏂囨湰涓殑HTML瀛楃涓哄畨鍏ㄧ殑瀛楃
- *
+ *
* @param text 琚浆涔夌殑鏂囨湰
* @return 杞箟鍚庣殑鏂囨湰
*/
@@ -41,7 +41,7 @@
/**
* 杩樺師琚浆涔夌殑HTML鐗规畩瀛楃
- *
+ *
* @param content 鍖呭惈杞箟绗︾殑HTML鍐呭
* @return 杞崲鍚庣殑瀛楃涓�
*/
@@ -52,7 +52,7 @@
/**
* 娓呴櫎鎵�鏈塇TML鏍囩锛屼絾鏄笉鍒犻櫎鏍囩鍐呯殑鍐呭
- *
+ *
* @param content 鏂囨湰
* @return 娓呴櫎鏍囩鍚庣殑鏂囨湰
*/
@@ -63,7 +63,7 @@
/**
* Escape缂栫爜
- *
+ *
* @param text 琚紪鐮佺殑鏂囨湰
* @return 缂栫爜鍚庣殑瀛楃
*/
@@ -104,7 +104,7 @@
/**
* Escape瑙ｇ爜
- *
+ *
* @param content 琚浆涔夌殑鍐呭
* @return 瑙ｇ爜鍚庣殑瀛楃涓�
*/
@@ -153,15 +153,4 @@
return tmp.toString();
}
- public static void main(String[] args)
- {
- String html = "<script>alert(1);</script>";
- String escape = EscapeUtil.escape(html);
- // String html = "<scr<script>ipt>alert(\"XSS\")</scr<script>ipt>";
- // String html = "<123";
- // String html = "123>";
- System.out.println("clean: " + EscapeUtil.clean(html));
- System.out.println("escape: " + escape);
- System.out.println("unescape: " + EscapeUtil.unescape(escape));
- }
}
--
Gitblit v1.9.3