Fisheye: Tag 29805 refers to a dead (removed) revision in file `ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/LowTempForJohnsonSterilizerRecord.java'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java =================================================================== diff -u -r29697 -r29805 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java (.../JohnsonDataManagerImpl.java) (revision 29697) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java (.../JohnsonDataManagerImpl.java) (revision 29805) @@ -35,7 +35,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonStageDetails; -import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonSterilizerRecord; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonRecord; import com.forgon.disinfectsystem.filemanager.CommonFileManager; import com.forgon.disinfectsystem.filemanager.FtpFileManager; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.service.SterilizationRecordManager; @@ -198,8 +198,8 @@ // 读取直到最后一行 String line = ""; boolean startStageDetails = false; - List lowTempForJohnsonSterilizerRecordList = new ArrayList(); - LowTempForJohnsonSterilizerRecord lowTempForJohnsonSterilizerRecord = null; + List lowTempForJohnsonSterilizerRecordList = new ArrayList(); + LowTempForJohnsonRecord lowTempForJohnsonSterilizerRecord = null; LowTempForJohnsonStageDetails lowTempForJohnsonStageDetails = null; SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy HH:mm:ss"); String processCompleteTime = null; @@ -211,7 +211,7 @@ boolean readStartDate = false;//下一条是否灭菌开始时间 while ((line = br.readLine()) != null) { if(line.contains("Validated")){//验证人 读取开始标记 - lowTempForJohnsonSterilizerRecord = new LowTempForJohnsonSterilizerRecord(); + lowTempForJohnsonSterilizerRecord = new LowTempForJohnsonRecord(); }else if(!startStageDetails && line.contains("sec")){//总耗时 if(lowTempForJohnsonSterilizerRecord == null){ continue; @@ -279,7 +279,7 @@ torrStr = line.replaceAll(lowTempForJohnsonStageDetails.getPressureUnit(), "").substring(1).trim(); lowTempForJohnsonStageDetails.setRelationSymbol(relationSymbol); lowTempForJohnsonStageDetails.setPress(Double.valueOf(torrStr)); - lowTempForJohnsonStageDetails.setLowTempForJohnsonSterilizerRecord(lowTempForJohnsonSterilizerRecord); + lowTempForJohnsonStageDetails.setLowTempForJohnsonRecord(lowTempForJohnsonSterilizerRecord); }else if(readStartDate){//灭菌开始时间 readStartDate = false; if(lowTempForJohnsonSterilizerRecord == null){ @@ -354,7 +354,7 @@ * @param line * @param lowTempForJohnsonSterilizerRecord */ - private void setStageTime(String line, LowTempForJohnsonSterilizerRecord lowTempForJohnsonSterilizerRecord){ + private void setStageTime(String line, LowTempForJohnsonRecord lowTempForJohnsonSterilizerRecord){ String stageTime = line.substring(8).replaceAll(" ", "").replace("sec", ""); int stageTotalMin = 0; int stageTotalSec = 0; @@ -388,10 +388,10 @@ * 移除一些数据(现有移除不完整数据;完整数据有灭菌周期) * @param lowTempSterilizerRecordList */ - private void removeIncompleteData(List lowTempForJohnsonSterilizerRecord){ - Iterator it = lowTempForJohnsonSterilizerRecord.iterator(); + private void removeIncompleteData(List lowTempForJohnsonSterilizerRecord){ + Iterator it = lowTempForJohnsonSterilizerRecord.iterator(); while(it.hasNext()){ - LowTempForJohnsonSterilizerRecord item = it.next(); + LowTempForJohnsonRecord item = it.next(); //要保存的数据 关联灭菌记录 refreshSterilizaerRecordAmounts(item,it); } @@ -404,13 +404,13 @@ */ private boolean isExistData(String machineNumber, Long totalCycleCounter){ String sql = String.format("select count(*) from %s where machineNumber='%s' and totalCycleCounter=%s ", - LowTempForJohnsonSterilizerRecord.class.getSimpleName(),machineNumber,totalCycleCounter); + LowTempForJohnsonRecord.class.getSimpleName(),machineNumber,totalCycleCounter); if(objectDao.countBySql(sql) > 0){ return true; } return false; } - public boolean refreshSterilizaerRecordAmounts(LowTempForJohnsonSterilizerRecord item, Iterator it) { + public boolean refreshSterilizaerRecordAmounts(LowTempForJohnsonRecord item, Iterator it) { boolean result = false; Date startDate = item.getStartDate(); String machineNo = item.getMachineNumber(); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/LowTempForJohnsonSterilizerRecord.java =================================================================== diff -u -r29628 -r29805 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/LowTempForJohnsonSterilizerRecord.java (.../LowTempForJohnsonSterilizerRecord.java) (revision 29628) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/LowTempForJohnsonSterilizerRecord.java (.../LowTempForJohnsonRecord.java) (revision 29805) @@ -29,7 +29,7 @@ @DynamicInsert(false) @DynamicUpdate(true) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) -public class LowTempForJohnsonSterilizerRecord { +public class LowTempForJohnsonRecord { private Long id; /** * 设备编号 Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r29792 -r29805 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29792) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 29805) @@ -80,7 +80,7 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecordPic; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.HighTempSterilizerRecord; -import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonSterilizerRecord; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerRecord; import com.forgon.disinfectsystem.entity.urgent.UrgentLevel; @@ -6055,9 +6055,9 @@ return null; } @Override - public LowTempForJohnsonSterilizerRecord getLowTempForJohnsonSterilizerRecord( + public LowTempForJohnsonRecord getLowTempForJohnsonSterilizerRecord( String machineNo, Date startDate) { - LowTempForJohnsonSterilizerRecord result = null; + LowTempForJohnsonRecord result = null; try { Date beginStartTime = new Date(startDate.getTime() - 10*60*1000); Date endStartTime = new Date(startDate.getTime() + 10*60*1000); @@ -6066,7 +6066,7 @@ String queryString = " where po.machineNumber ='" + machineNo + "' and " + dateQueryAdapter.dateAreaSql("po.startDate", beginStartTimeStr, endStartTimeStr, false); - result = (LowTempForJohnsonSterilizerRecord)objectDao.getBySql(LowTempForJohnsonSterilizerRecord.class.getSimpleName(), queryString); + result = (LowTempForJohnsonRecord)objectDao.getBySql(LowTempForJohnsonRecord.class.getSimpleName(), queryString); } catch (Exception e) { e.printStackTrace(); } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/LowTempForJohnsonStageDetails.java =================================================================== diff -u -r29660 -r29805 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/LowTempForJohnsonStageDetails.java (.../LowTempForJohnsonStageDetails.java) (revision 29660) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/sterilizationmanager/sterilizerrecord/LowTempForJohnsonStageDetails.java (.../LowTempForJohnsonStageDetails.java) (revision 29805) @@ -49,7 +49,7 @@ /** * 所属低温灭菌炉记录 */ - private LowTempForJohnsonSterilizerRecord lowTempForJohnsonSterilizerRecord; + private LowTempForJohnsonRecord lowTempForJohnsonRecord; @Id @GeneratedValue(strategy = GenerationType.AUTO) public Long getId() { @@ -102,14 +102,14 @@ } @ManyToOne - @JoinColumn(name = "lowTempForJohnsonSterilizerRecord_id") - public LowTempForJohnsonSterilizerRecord getLowTempForJohnsonSterilizerRecord() { - return lowTempForJohnsonSterilizerRecord; + @JoinColumn(name = "lowTempForJohnsonRecord_id") + public LowTempForJohnsonRecord getLowTempForJohnsonRecord() { + return lowTempForJohnsonRecord; } - public void setLowTempForJohnsonSterilizerRecord( - LowTempForJohnsonSterilizerRecord lowTempForJohnsonSterilizerRecord) { - this.lowTempForJohnsonSterilizerRecord = lowTempForJohnsonSterilizerRecord; + public void setLowTempForJohnsonRecord( + LowTempForJohnsonRecord lowTempForJohnsonRecord) { + this.lowTempForJohnsonRecord = lowTempForJohnsonRecord; } public String getRelationSymbol() { Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java =================================================================== diff -u -r29738 -r29805 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 29738) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizerrecord/action/SterilizerRecordLineChartAction.java (.../SterilizerRecordLineChartAction.java) (revision 29805) @@ -19,7 +19,7 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.HighTempStageDetails; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.HighTempSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonStageDetails; -import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonSterilizerRecord; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempStageDetails; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerRecord; @@ -301,7 +301,7 @@ JSONObject rueslt = new JSONObject(); try { SterilizationRecord sterilizationRecord = sterilizationRecordManager.getSterilizationRecordById(sterilizationRecordId); - LowTempForJohnsonSterilizerRecord lowTempForJohnsonRecord = sterilizationRecordManager.getLowTempForJohnsonSterilizerRecord(sterilizationRecord.getSterilizer().getMachineNumber(), sterilizationRecord.getStartDate()); + LowTempForJohnsonRecord lowTempForJohnsonRecord = sterilizationRecordManager.getLowTempForJohnsonSterilizerRecord(sterilizationRecord.getSterilizer().getMachineNumber(), sterilizationRecord.getStartDate()); List lowTempForJohnsonStageDetailsList = null; if(lowTempForJohnsonRecord != null){ lowTempForJohnsonStageDetailsList = lowTempForJohnsonRecord.getLowTempForJohnsonStageDetailsList(); Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java =================================================================== diff -u -r29792 -r29805 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 29792) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java (.../SterilizationRecordManager.java) (revision 29805) @@ -16,7 +16,7 @@ import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecordPic; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.HighTempSterilizerRecord; -import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonSterilizerRecord; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempSterilizerRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerRecord; import com.forgon.disinfectsystem.sterilizationmanager.sterilizationrecord.vo.SterilizationRecordPrintTousseItem; @@ -510,7 +510,7 @@ * @param startDate 灭菌记录的开始日期 * @return */ - public LowTempForJohnsonSterilizerRecord getLowTempForJohnsonSterilizerRecord(String machineNo, Date startDate); + public LowTempForJohnsonRecord getLowTempForJohnsonSterilizerRecord(String machineNo, Date startDate); /** * 保存灭菌记录图片