Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java =================================================================== diff -u -r38918 -r38948 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java (.../DeviceInterface.java) (revision 38918) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java (.../DeviceInterface.java) (revision 38948) @@ -132,8 +132,11 @@ * 强生 型号STERRAD 100S */ public static final String JOHNSON_MODEL_STERRAD_100S = "STERRAD 100S"; - /** + * 强生 型号STERRAD 100S(单循环) + */ + public static final String JOHNSON_MODEL_STERRAD_100S_SINGLE_CYCLE = "STERRAD 100S(单循环)"; + /** * 新华负压清洗机(PC-L)(张家界市人民医院ZJJSRM-6) */ public static final String XINHUA_PC_L = "负压清洗机(PC-L)"; Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js =================================================================== diff -u -r38921 -r38948 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js (.../deviceInterfaceForm.js) (revision 38921) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceForm.js (.../deviceInterfaceForm.js) (revision 38948) @@ -531,7 +531,7 @@ }else if(deviceBrand == JOHNSON){ var johnsonModelComboStore = new Ext.data.SimpleStore({ fields : [ 'value' ], - data : [[' '],[JOHNSON_MODEL_STERRAD_100S],[DEVICEMODEL_100NX]] + data : [[' '],[JOHNSON_MODEL_STERRAD_100S],[JOHNSON_MODEL_STERRAD_100S_SINGLE_CYCLE],[DEVICEMODEL_100NX]] }) var interfaceTypeComboStore = new Ext.data.SimpleStore({ fields : [ 'value' ], Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java =================================================================== diff -u -r38918 -r38948 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java (.../DeviceInterfaceDataProcessImpl.java) (revision 38918) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/DeviceInterfaceDataProcessImpl.java (.../DeviceInterfaceDataProcessImpl.java) (revision 38948) @@ -132,7 +132,8 @@ dm.readAndSaveRecord(devInterface,st.getMachineNumber(),DeviceInterface.XINHUA,st.getIsAutoCompleteSterilization(),enableDetailedDeviceInformation,loginUserData); break; case DeviceInterface.JOHNSON: - if(DeviceInterface.JOHNSON_MODEL_STERRAD_100S.equals(devInterface.getDeviceModel())){ + if(DeviceInterface.JOHNSON_MODEL_STERRAD_100S.equals(devInterface.getDeviceModel()) + || DeviceInterface.JOHNSON_MODEL_STERRAD_100S_SINGLE_CYCLE.equals(devInterface.getDeviceModel())){ Object johnsonBean = SpringBeanManger.getBean("johnsonDataManager"); dm = (DeviceDataManager) johnsonBean; dm.readAndSaveRecord(devInterface,st.getMachineNumber(),DeviceInterface.JOHNSON,st.getIsAutoCompleteSterilization(),enableDetailedDeviceInformation,loginUserData); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp =================================================================== diff -u -r38921 -r38948 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp (.../deviceInterfaceView.jsp) (revision 38921) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/deviceInterface/deviceInterfaceView.jsp (.../deviceInterfaceView.jsp) (revision 38948) @@ -40,6 +40,7 @@ var BELIMED = '<%=DeviceInterface.BELIMED%>'; var JOHNSON = '<%=DeviceInterface.JOHNSON%>'; var JOHNSON_MODEL_STERRAD_100S = '<%=DeviceInterface.JOHNSON_MODEL_STERRAD_100S%>'; +var JOHNSON_MODEL_STERRAD_100S_SINGLE_CYCLE = '<%=DeviceInterface.JOHNSON_MODEL_STERRAD_100S_SINGLE_CYCLE%>'; var YOUYUAN = '<%=DeviceInterface.YOUYUAN%>'; var MATACHANA = '<%=DeviceInterface.MATACHANA%>'; //ZJYY-133:新增设备品牌3M GS8 灭菌器 Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java =================================================================== diff -u -r35645 -r38948 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java (.../JohnsonDataManagerImpl.java) (revision 35645) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/JohnsonDataManagerImpl.java (.../JohnsonDataManagerImpl.java) (revision 38948) @@ -6,6 +6,7 @@ import java.io.InputStreamReader; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.HashSet; import java.util.Iterator; @@ -32,6 +33,7 @@ import com.forgon.databaseadapter.service.DateQueryAdapter; import com.forgon.directory.vo.LoginUserData; +import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.LowTempForJohnsonStageDetails; @@ -140,6 +142,16 @@ String backUpPath = rootPath + "/backUp"; commonFileManager.makeDirectory(remoteType, ftp, backUpPath, session, enableDetailedDeviceInformation, loginUserData); SimpleDateFormat sdfToday = new SimpleDateFormat("yyyyMMdd"); + //限制读取的天数,默认只读当天(默认会把非读取日期的数据移走,避免文件堆积) + int interfaceReadLimitDays = CssdUtils.getSystemSetConfigByNameInt("interfaceReadLimitDays", 0); + Date endStartTime = null; + if(interfaceReadLimitDays > 1){ + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DATE, -interfaceReadLimitDays); //得到前一天 + endStartTime = calendar.getTime(); + }else{ + endStartTime = new Date(); + } for (int i = 0; i < length; i++) { FTPFile ftpFile = null; SmbFile smbForm = null; @@ -158,7 +170,7 @@ } } //不是今天的就移走,避免文件堆积重复读取,影响效率 - if(sdfToday.parse(name.substring(4, 12)).before(sdfToday.parse(sdfToday.format(new Date())))){ + if(sdfToday.parse(name.substring(4, 12)).before(sdfToday.parse(sdfToday.format(endStartTime)))){ commonFileManager.moveFile(remoteType, name, ftp, ftpFileManager.getCurrentPath(ftp), backUpPath, session, smbForm); continue; } @@ -293,7 +305,10 @@ if(lowTempForJohnsonSterilizerRecord == null){ continue; } - startReaded = true; + if(!DeviceInterface.JOHNSON_MODEL_STERRAD_100S_SINGLE_CYCLE.equals(devInterface.getDeviceModel())){ + startReaded = true;//(100单循环没有程序数据 默认SHORT CYCLE) + lowTempForJohnsonSterilizerRecord.setProgramName("SHORT CYCLE"); + } startStageDetails = false;//阶段信息读取完毕 String startDateStr = line.substring(7).trim(); String yearMonthDay = startDateStr.substring(0, 6) + "20" + startDateStr.substring(6, 8);