diff --git a/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareOutServiceFallback.java b/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareOutServiceFallback.java index 6e8994f..4be9a02 100644 --- a/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareOutServiceFallback.java +++ b/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareOutServiceFallback.java @@ -12,7 +12,6 @@ public class ISpareOutServiceFallback implements ISpareOutServiceClient { Long tenantId, Integer current, Integer size){ - System.out.println("熔断了"); return null; } diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java index 6b10a50..9621957 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java @@ -122,7 +122,6 @@ public class HttpRequestUtil { result += str; } log.info(url+"-------------------------{}"+result); - System.out.println(result); //关闭流 is.close(); //断开连接，disconnect是在底层tcp socket链接空闲时才切断，如果正在被其他线程使用就不切断。 diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java index e161c7e..048ca65 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java @@ -86,7 +86,6 @@ public class SpAllocationServiceImpl extends ServiceImpl basicEntityList = entity.getBasicList(); super.save(entity); - System.out.println(entity.getId()); for (int i = 0; i < basicEntityList.size(); i++) { if(basicEntityList.get(i).getAmount()<=0){ throw new ServiceException("数量必须大于0"); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java index 9469cb3..b605167 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java @@ -493,7 +493,6 @@ public class WtSpBasicServiceImpl extends ServiceImpl success = smsClient.sendMessage("aliyun-task-end", "{\"two\":\"2021-03-24 16:41:26\",\"one\":\"测试短信3\"}", "18229968652"); - System.out.println("msg -- 用户手机号：18229968652 ; 返回信息 = " + (Func.isNotEmpty(success)?success.toString(): "返回为空")); } @Override diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java index 93d9e3a..b9e8f2c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java @@ -44,7 +44,6 @@ public class XxlJobConfig { xxlJobSpringExecutor.setAppname(appName); xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setPort(port); - System.out.println(">>>>>>>>>>> xxl-rpc, port " + port); xxlJobSpringExecutor.setAccessToken(accessToken); xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/CompressUtils.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/CompressUtils.java index af0ccc1..eea4b58 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/CompressUtils.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/CompressUtils.java @@ -79,7 +79,6 @@ public class CompressUtils { in.close(); } long end = System.currentTimeMillis(); - System.out.println("压缩完成，耗时：" + (end - start) + " ms"); } catch (Exception e) { throw new RuntimeException("zip error from ZipUtils", e); } finally { @@ -244,7 +243,6 @@ public class CompressUtils { in.close(); } long end = System.currentTimeMillis(); - System.out.println("压缩完成，耗时：" + (end - start) +" ms"); result = true; } catch (Exception e) { throw new RuntimeException("zip error from ZipUtils",e); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java index dac2ba5..4c61968 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java @@ -75,13 +75,11 @@ public class InspectReportController { response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); List datas = irs.getExcelByMonth(month, routId, userId); if(datas!=null && datas.size()>0){ - System.out.println("---------------- size = " + datas.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), InspectMonthReportExcel.class).autoCloseStream(Boolean.FALSE).sheet(month +"巡检详情") .doWrite(datas); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); @@ -118,13 +116,11 @@ public class InspectReportController { response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); List datas = irs.getExcelByMonthGather(vo); if(datas!=null && datas.size()>0){ - System.out.println("---------------- size = " + datas.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), InspectMonthReportExcel.class).autoCloseStream(Boolean.FALSE).sheet(vo.getMonth() +"巡检详情") .doWrite(datas); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java index e7a0b6b..8b7b8bd 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java @@ -180,13 +180,11 @@ public class TaskController extends BladeController { response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); List list = taskService.exportTaskList(task); if(list!=null && list.size()>0){ - System.out.println("---------------- size = " + list.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), InspectTaskExportVO.class).autoCloseStream(Boolean.FALSE).sheet("巡检任务报表") .doWrite(list); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java index 3d57ca5..1fd883b 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java @@ -117,7 +117,6 @@ public class HiKUtil { put("https://", url); }}; final String contentType = "application/json"; - System.out.println("海康调用传参"+ JSON.toJSONString(variable)); String result = ArtemisHttpUtil.doPostStringArtemis(path, JSON.toJSONString(variable), null, null, contentType , null); Assert.isTrue("0".equals(JSONObject.parseObject(result).getString("code")),() -> { throw new ServiceException("调用海康URL失败,报错信息为：" + result); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HtmltoPdf.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HtmltoPdf.java index 97cfa1f..d5755d6 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HtmltoPdf.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HtmltoPdf.java @@ -128,7 +128,6 @@ public class HtmltoPdf { public static String getCurrentOperatingSystem(){ String os = System.getProperty("os.name").toLowerCase(); - System.out.println("---------当前操作系统是-----------" + os); return os; } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java index 8708fbb..7a1cab7 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java @@ -54,9 +54,6 @@ public class ZxingGenCode { Result result = null; try { image = ImageIO.read(new File(imgPath)); - if (image == null) { - System.out.println("the decode image may be not exit."); - } LuminanceSource source = new BufferedImageLuminanceSource(image); BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/utils/ZXingGenCode.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/utils/ZXingGenCode.java index fe24f13..3c07300 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/utils/ZXingGenCode.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/utils/ZXingGenCode.java @@ -47,9 +47,6 @@ public class ZXingGenCode { Result result = null; try { image = ImageIO.read(new File(imgPath)); - if (image == null) { - System.out.println("the decode image may be not exit."); - } LuminanceSource source = new BufferedImageLuminanceSource(image); BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java index 4c0583c..26e2920 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java @@ -133,7 +133,6 @@ public class StAlamRecordServiceImpl extends ServiceImpl stationIds = station.stream().map(StationEntity::getCode).collect(Collectors.toSet()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date date2 = new Date(); - System.out.println("开始：" + sdf.format(date2)); //查询出用户所拥有的数据权限站点下的所有属性 List list = stFocusPropertiesService.list(new LambdaQueryWrapper() {{ in(StFocusPropertiesEntity::getStationId, stationIds); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java index 5cec3ce..57b8824 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java @@ -169,7 +169,6 @@ public class ImsAnalyseExampleServiceImpl extends ServiceImpl list = taskService.exportMaintenance(req); if(list!=null && list.size()>0){ - System.out.println("---------------- size = " + list.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), MaintenanceExportVO.class).autoCloseStream(Boolean.FALSE).sheet("日常维护记录统计") .doWrite(list); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java index 98e3cf4..498282a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java @@ -356,7 +356,6 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor log.info("电站发电量总览"+reportVOS.toString()); }catch (Exception e){ log.error("getStationMonthReportV2电站发电量报错", e); - System.out.println(e); }finally { countDownLatch.countDown(); log.info("电站发电耗时："+(System.currentTimeMillis()-startMillis)+"ms"); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java index 480fb07..84d373b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java @@ -129,10 +129,8 @@ public class ArtemisPostUtils { String body = jsonBody.toJSONString(); String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType, null); } catch (InterruptedException e) { - System.out.println("Runnable is error"); Thread.currentThread().interrupt(); } - System.out.println("Runnable running"); } }; Thread thread = new Thread(myRunnable); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/CommonUtils.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/CommonUtils.java index cb5970f..0396945 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/CommonUtils.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/CommonUtils.java @@ -186,9 +186,6 @@ public class CommonUtils { cell1.setCellStyle(valStyle); Map dataMap = avgList.get(i).getDataMap(); - for (Object o : dataMap.keySet()) { - System.out.println("测试打印：" + o + "===" + dataMap.get(o)); - } //第2格为上月平均值 Cell cell2 = row.createCell(2); if (dataMap.get(preMonthStr) != null) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ExcelUtil.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ExcelUtil.java index a95d8d4..330f98f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ExcelUtil.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ExcelUtil.java @@ -96,8 +96,6 @@ public class ExcelUtil { if(resources.length == 1) { InputStream inputStream = resources[0].getInputStream(); inputStreamToFile(inputStream, file); - }else { - System.out.println("请检查模板文件是否存在"); } return file; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ZpiUtil.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ZpiUtil.java index 49644fc..07689e5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ZpiUtil.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ZpiUtil.java @@ -49,7 +49,6 @@ public class ZpiUtil { out = new FileOutputStream(file.getPath()); workbook.write(out); } catch (Exception e) { - System.out.println("出现异常"); e.printStackTrace(); } fileList.add(file); @@ -123,7 +122,6 @@ public class ZpiUtil { zipOut.closeEntry(); } } catch (Exception e) { - System.out.println("压缩ZIP包出现异常"); e.printStackTrace(); } finally { in.close(); @@ -152,7 +150,6 @@ public class ZpiUtil { } response.flushBuffer(); } catch (IOException e) { - System.out.println("下载出现异常"); e.printStackTrace(); } finally { fis.close(); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/config/XxlJobConfig.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/config/XxlJobConfig.java index 71fb82d..87e5702 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/config/XxlJobConfig.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/config/XxlJobConfig.java @@ -45,7 +45,6 @@ public class XxlJobConfig { xxlJobSpringExecutor.setAppname(appName); xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setPort(port); - System.out.println(">>>>>>>>>>> xxl-rpc, port " + port); xxlJobSpringExecutor.setAccessToken(accessToken); xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java index cc6cad7..0b23047 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java @@ -43,7 +43,6 @@ public class ExcelConvertPdf { Sheet sheet = workbook.getSheetAt(0); int column = sheet.getRow(1).getLastCellNum(); int row = sheet.getPhysicalNumberOfRows(); - System.out.println(row); //下面是找出表格中的空行和空列 List nullCol = new ArrayList<>(); List nullRow = new ArrayList<>(); @@ -76,7 +75,6 @@ public class ExcelConvertPdf { PdfPTable table = new PdfPTable(column-sheet.getRow(1).getFirstCellNum()); List ranges = new ArrayList(); int sheetMergeCount = sheet.getNumMergedRegions(); - System.out.println("sheetMergeCount"+sheetMergeCount); for (int i = 0; i < sheetMergeCount; i++) { CellRangeAddress range = sheet.getMergedRegion(i); ranges.add(range); @@ -104,10 +102,6 @@ public class ExcelConvertPdf { } else { str = cell.getStringCellValue(); } - - System.out.println("i ::"+i + "j::"+j); - System.out.println(str); - for (CellRangeAddress range : ranges) { //合并的单元格判断和处理 if (j >= range.getFirstColumn() && j <= range.getLastColumn() && i >= range.getFirstRow() @@ -125,7 +119,6 @@ public class ExcelConvertPdf { rowNum = range.getLastRow() - range.getFirstRow() + 1; colNum = range.getLastColumn() - range.getFirstColumn() + 1; cell1 = mergeCell(str, font, rowNum, colNum); - System.out.println("合并"+rowNum+"、"+colNum); table.addCell(cell1); flag = false; mergeFlag = ranges.size() > 1; @@ -172,4 +165,4 @@ public class ExcelConvertPdf { cell.setMinimumHeight(25); return cell; } -} \ No newline at end of file +} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/HtmltoPdf.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/HtmltoPdf.java index 714bc38..3400258 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/HtmltoPdf.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/HtmltoPdf.java @@ -111,7 +111,6 @@ public class HtmltoPdf { public static String getCurrentOperatingSystem(){ String os = System.getProperty("os.name").toLowerCase(); - System.out.println("---------当前操作系统是-----------" + os); return os; } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ZXingGenCode.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ZXingGenCode.java index a7262b3..ae81112 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ZXingGenCode.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ZXingGenCode.java @@ -47,9 +47,6 @@ public class ZXingGenCode { Result result = null; try { image = ImageIO.read(new File(imgPath)); - if (image == null) { - System.out.println("the decode image may be not exit."); - } LuminanceSource source = new BufferedImageLuminanceSource(image); BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java index deaa288..0194c13 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java @@ -123,13 +123,9 @@ public class OperationTicketController { businessMessageDTO.setUserIds(userIds); businessMessageDTO.setCreateUser(1522897714092781569L); - System.out.println("businessMessageDTO = " + businessMessageDTO); - R booleanR = messageClient.sendAppAndWsMsgByUsers(businessMessageDTO); if (!booleanR.isSuccess()) { throw new ServiceException("消息推送失败"); - }else { - System.out.println("推送成功"); } } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java index 63b1474..3e464e3 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; - + import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -92,7 +92,7 @@ public class StandardTicketInfoController extends BladeController { return standardTicketInfoService.detail(id); } - + @PostMapping("/queryList") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页") @@ -101,7 +101,7 @@ public class StandardTicketInfoController extends BladeController { return standardTicketInfoService.queryList(req, query); } - + @PostMapping("/exportStandardTicket") @ApiOperationSupport(order = 2) @ApiOperation(value = "操作票导出") @@ -123,14 +123,11 @@ public class StandardTicketInfoController extends BladeController { response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); List list = standardTicketInfoService.exportStandardTicket(req); if(list!=null && list.size()>0){ - System.out.println("---------------- size = " + list.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), StandardTicketExportVO.class).autoCloseStream(Boolean.FALSE).sheet("操作票统计报表") .doWrite(list); } } catch (Exception e) { - System.out.println("exportExcel = " + e); - // 重置response response.reset(); response.setContentType("application/json"); response.setCharacterEncoding("utf-8"); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java index f934986..16bd5bd 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java @@ -901,7 +901,6 @@ public class StandardTicketInfoServiceImpl extends ServiceImpl list = workTicketInfoService.exportWorkTicket(req); if(list!=null && list.size()>0){ - System.out.println("---------------- size = " + list.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), WorkTicketExportVO.class).autoCloseStream(Boolean.FALSE).sheet("工作票统计报表") .doWrite(list); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); @@ -214,7 +212,7 @@ public class WorkTicketInfoController { return workTicketInfoService.licenseOfflineTicket(req); } - + @GetMapping("/userListByRoleAlias") @ApiOperationSupport(order = 100) @ApiOperation(value = "获取某机构下角色的人员列表") @@ -258,7 +256,7 @@ public class WorkTicketInfoController { /** * 获取工作票台账、 */ - + @GetMapping("/getWorkTicketBill") @ApiOperation(value = "获取工作票台账") public R> getWorkTicketBill(String emCode, String startTime, String endTime) { @@ -272,7 +270,7 @@ public class WorkTicketInfoController { return R.data(workTicketInfoService.work(Condition.getPage(query),work)); } - + @PostMapping("/cancel") @ApiOperationSupport(order = 50) @ApiOperation(value = "线下工作票作废") diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java index aec8082..7da2909 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java @@ -1018,7 +1018,6 @@ public class WorkTicketInfoServiceImpl extends ServiceImpl " + classGroupMembers); String[] split = classGroupMembers.split(","); for (String classGroupMember : split) { - System.out.println(classGroupMember); if (StringUtils.isNoneBlank(classGroupMember)) { boolean matches = classGroupMember.matches("[0-9]+"); if (matches) { @@ -1314,7 +1313,6 @@ public class WorkTicketInfoServiceImpl extends ServiceImpl>>>>>>>>>> xxl-rpc, port " + port); xxlJobSpringExecutor.setAccessToken(accessToken); xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);