Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java =================================================================== diff -u -r40910 -r40952 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java (.../WashDataLineChartAction.java) (revision 40910) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashDataLineChartAction.java (.../WashDataLineChartAction.java) (revision 40952) @@ -290,26 +290,5 @@ logger.error(e); } } - /** - * 获取pdf - */ - public void getPDFFile(){ - //清洗记录id - Long washAndDisinfectRecordId = StrutsParamUtils.getPraramLongValue("washAndDisinfectRecordId", 0L); - //灭菌记录id - Long sterilizationRecordId = StrutsParamUtils.getPraramLongValue("sterilizationRecordId", 0L); - //清洗参数PDFid 或者 灭菌参数PDFid - Long dataRecordId = StrutsParamUtils.getPraramLongValue("dataRecordId", 0L); - - JSONObject result = washAndDisinfectRecordManager.getDataPDF(washAndDisinfectRecordId,sterilizationRecordId, dataRecordId); - HttpServletResponse httpServletResponse = StrutsParamUtils - .getResponse(); - httpServletResponse.setCharacterEncoding("UTF-8"); - try { - httpServletResponse.getWriter().print(result.toString()); - } catch (IOException e) { - logger.error(e); - } - } } Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java =================================================================== diff -u -r40943 -r40952 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 40943) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 40952) @@ -523,13 +523,6 @@ */ public JSONObject getRinserWashDataFile(Long washAndDisinfectRecordId, Long belimedV2WashDataPDFId); /** - * 获取清洗参数文件 - * @param washAndDisinfectRecordId 清洗记录id - * @param belimedV2WashDataPDFId 参数记录id - */ - public JSONObject getDataPDF(Long washAndDisinfectRecordId, Long sterilizationRecordId, Long dataRecordId); - - /** * 获取温度和阶段表格NYSY-45参数界面增加清洗记录运行内容的数据表格显示 * @param washAndDisinfectRecordId 清洗记录id * @param washDataId 清洗参数记录id Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r40951 -r40952 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 40951) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 40952) @@ -4460,20 +4460,21 @@ if(washData != null){ Rinser rinser = rinserManager.get(wdr.getRinserId()); - resultData.put("rinserName", rinser.getName()); - resultData.put("CycleCounter", wdr.getCycleCounter()); - resultData.put("programName", washData.getProgramName()); - resultData.put("startDate", DateTools.YMDHMSFORMAT.get().format(washData.getStartDate())); - resultData.put("endDate", DateTools.YMDHMSFORMAT.get().format(washData.getEndDate())); - resultData.put("washStatus", wdr.getWashStatus()); - resultData.put("runCount", washData.getRunCount()); - resultData.put("operator", wdr.getOperator()); - resultData.put("A0Value", washData.getA0Value()); - resultData.put("totalRunTime", washData.getTotalRunTime()); - resultData.put("runResult", washData.getRunResult()); + JSONObject keyValues = new JSONObject(); + keyValues.put("机器：", rinser.getName()); + keyValues.put("锅次：", wdr.getCycleCounter()); + keyValues.put("程序：", washData.getProgramName()); + keyValues.put("启动时间：", DateTools.YMDHMSFORMAT.get().format(washData.getStartDate())); + keyValues.put("结束时间：", DateTools.YMDHMSFORMAT.get().format(washData.getEndDate())); + keyValues.put("清洗状态：", wdr.getWashStatus()); + keyValues.put("循环次数：", washData.getRunCount()); + keyValues.put("操作员：", wdr.getOperator()); + keyValues.put("A0值：", washData.getA0Value()); + keyValues.put("总运行时间：", washData.getTotalRunTime()); + keyValues.put("运行结果：", washData.getRunResult()); + resultData.put("keyValues", keyValues); - List detailsList = washData.getXinHuaSuper6000DetailsList(); JSONArray timeArray = new JSONArray(); JSONArray innerTemperatureArray = new JSONArray(); @@ -7282,84 +7283,6 @@ return washAndDisinfectRecordId; } @Override - public JSONObject getDataPDF(Long washAndDisinfectRecordId, Long sterilizationRecordId, Long dataRecordId) { - if(!DatabaseUtil.isPoIdValid(washAndDisinfectRecordId) && !DatabaseUtil.isPoIdValid(sterilizationRecordId)){ - throw new RuntimeException("Id参数异常"); - } - ResultSet rs = null; - JSONObject result = new JSONObject(); - String base64PdfContent = null; - boolean success = false; - try { - String fileName = null; - DeviceInterface deviceInterface = null; - String path = null; - Long recordId = null; - if(DatabaseUtil.isPoIdValid(washAndDisinfectRecordId)){ - WashAndDisinfectRecord wdr = get(washAndDisinfectRecordId); - if (wdr == null) { - throw new RuntimeException("recordId参数异常"); - } - recordId = wdr.getId(); - //清洗机定义 - Rinser rinser = (Rinser) objectDao.getByProperty(Rinser.class.getSimpleName(), "id", wdr.getRinserId()); - if (rinser == null) { - throw new RuntimeException("数据异常，清洗记录关联的清洗机不存在！"); - } - deviceInterface = rinser.getDeviceInterface(); - }else{ - SterilizationRecord sterilizationRecord = (SterilizationRecord)objectDao.getById(SterilizationRecord.class.getSimpleName(), sterilizationRecordId); - if (sterilizationRecord == null) { - throw new RuntimeException("recordId参数异常"); - } - recordId = sterilizationRecord.getId();; - //清洗机定义 - Sterilizer sterilizer = sterilizationRecord.getSterilizer(); - if (sterilizer == null) { - throw new RuntimeException("数据异常，灭菌记录关联的灭菌炉不存在！"); - } - deviceInterface = sterilizer.getDeviceInterface(); - } - if(deviceInterface == null){ - throw new RuntimeException("数据异常，清洗机关联的设备接口不存在！"); - } - if(DeviceInterface.XINHUA.equals(deviceInterface.getDeviceBrand())){ - XinHuaDataPDF pdf = null; - if(DeviceInterface.XINHUA_PDF_SUPER6000.equals(deviceInterface.getDeviceModel()) || DeviceInterface.XINHUA_PDF_CLEAN_H101513.equals(deviceInterface.getDeviceModel())){ - if (DatabaseUtil.isPoIdValid(dataRecordId)) { - pdf = (XinHuaDataPDF) objectDao.getBySql(XinHuaDataPDF.class.getSimpleName() - , " where po.id=" + dataRecordId); - if (pdf == null) { - throw new RuntimeException("找不到" + dataRecordId + "对应的数据"); - } - fileName = pdf.getFileName(); - }else if(DatabaseUtil.isPoIdValid(recordId)){ - pdf = (XinHuaDataPDF) objectDao.getBySql(XinHuaDataPDF.class.getSimpleName() - , " where po.recordId=" + recordId); - } - path = "XINHUAPDF/"; - } - if(pdf != null){ - fileName = pdf.getFileName(); - } - } - if (StringUtils.isNotBlank(fileName)) { - String fileUrl = PathUtils.getWebAppRootPath() + "/UserUpLoadFiles/" + path; - File file = new File(fileUrl + fileName); - byte[] pdfContent = Files.readAllBytes(file.toPath()); - base64PdfContent = Base64.getEncoder().encodeToString(pdfContent); - success = true; - } - } catch (Exception e) { - e.printStackTrace(); - } finally { - DatabaseUtil.closeResultSetAndStatement(rs); - } - result.put("success", success); - result.put("data", base64PdfContent); - return result; - } - @Override public JSONObject getRinserWashDataFile(Long washAndDisinfectRecordId, Long belimedV2WashDataPDFId) { ResultSet rs = null; JSONObject result = new JSONObject();