Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMAGGSZK260.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMAGGSZK260.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfMAGGSZK260.java (revision 41138) @@ -0,0 +1,556 @@ +package com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData; + +import java.util.Date; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Index; +import javax.persistence.Table; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +/** + * 品牌：Marge + * 型号：MAG-GSZK260（CSV格式） + * 本机器只有一个CSV格式的文件存放所有炉次的清洗数据，每当有新的清洗数据时，会在该CSV文件最顶端插入一行数据。 + * BJDXZLYY-66 + * 按文件中的序列号排重 读到已保存的序列号时 不再读取 + */ +@Entity +@DynamicInsert(false) +@DynamicUpdate(true) +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +@Table(indexes={@Index(columnList="machineNo",name="w_d_maggszk260_mno") +,@Index(columnList="deviceInterfaceID",name="w_d_maggszk260_diid") +,@Index(columnList="startTime",name="w_d_maggszk260_start_time") +,@Index(columnList="washAndDisinfectRecordId",name="w_d_maggszk260_wdid") +}) +public class WashDataOfMAGGSZK260 { + /** + * 清洗参数id + */ + private Long id; + + /** + * 机器号 + * 来源于清洗机机器号 + * 因为文件中没有机器号 + */ + private String machineNo; + + /** + * 设备接口id + */ + private Long deviceInterfaceID; + + /** + * 序列号 + */ + private String serialNumber; + + /** + * 启动时间 + */ + private Date startTime; + + /** + * 停止时间 + */ + private Date endTime; + + /** + * 启动年 + */ + private String startYear; + /** + * 启动月 + */ + private String startMonth; + /** + * 启动日 + */ + private String startDay; + /** + * 启动时 + */ + private String startHour; + /** + * 启动分 + */ + private String startMinute; + /** + * 启动秒 + */ + private String startSecond; + + /** + * 停止时 + */ + private String endHour; + /** + * 停止分 + */ + private String endMunite; + /** + * 停止秒 + */ + private String endSecond; + /** + * 清洗水位 + */ + private String waterLevelCleaning; + + + /** + * 完成标志 + * (清洗正常结束此数值固定为123) + */ + private String completeSign; + /** + * 程序编号 + */ + private String methodNumber; + + /** + * 清洗正常结束的固定值为123 + */ + public static final String COMPLETE_SIGN_FINISHED = "123"; + /** + * 运行时间(分钟) + */ + private String runTime; + /** + * 预洗时间(分钟) + */ + private String preWashingTime; + /** + * 酶洗时间(分钟) + */ + private String enzymeWashingTime; + /** + * 酶洗温度 + */ + private String enzymeWashingTemperature; + + /** + * 加酶量(ML) + */ + private String pushEnzymeQuantity; + /** + * 超声时间(分钟) + */ + private String ultrasoundTime; + /** + * 超声温度 + */ + private String ultrasonicTemp; + + /** + * 超声电流(A) + */ + private String ultrasonicCurrent; + + + /** + * 超声频率(kHz) + */ + private String ultrasonicFrequency; + /** + * 脉冲次数 + */ + private String pulseCount; + /** + * 脉冲温度 + */ + private String pulseTemperature; + /** + * 灌流次数 + */ + private String perfusionTimes; + + /** + * 漂洗时间 + */ + private String rinseTime; + /** + * 漂洗抽洗次数 + */ + private String rinsingExtractionCycles; + /** + * 漂洗次数 + */ + private String rinseCycles; + /** + * 消毒时间 + */ + private String disinfectionTime; + /** + * 消毒温度 + */ + private String disinfectionTemperature; + /** + * 加油量 + */ + private String fuelQuantity; + /** + * A0值 + */ + private String aoValue; + /** + * 干燥时间 + */ + private String dryingTime; + /** + * 干燥温度 + */ + private String dryingTemp; + + /** + * 故障代码 + */ + private String faultCode; + + /** + * 清洗记录id + */ + private Long washAndDisinfectRecordId; + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getMachineNo() { + return machineNo; + } + + public void setMachineNo(String machineNo) { + this.machineNo = machineNo; + } + + public Long getDeviceInterfaceID() { + return deviceInterfaceID; + } + + public void setDeviceInterfaceID(Long deviceInterfaceID) { + this.deviceInterfaceID = deviceInterfaceID; + } + + public String getSerialNumber() { + return serialNumber; + } + + public void setSerialNumber(String serialNumber) { + this.serialNumber = serialNumber; + } + + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + public String getStartYear() { + return startYear; + } + + public void setStartYear(String startYear) { + this.startYear = startYear; + } + + public String getStartMonth() { + return startMonth; + } + + public void setStartMonth(String startMonth) { + this.startMonth = startMonth; + } + + public String getStartDay() { + return startDay; + } + + public void setStartDay(String startDay) { + this.startDay = startDay; + } + + public String getStartHour() { + return startHour; + } + + public void setStartHour(String startHour) { + this.startHour = startHour; + } + + public String getStartMinute() { + return startMinute; + } + + public void setStartMinute(String startMinute) { + this.startMinute = startMinute; + } + + public String getStartSecond() { + return startSecond; + } + + public void setStartSecond(String startSecond) { + this.startSecond = startSecond; + } + + public String getEndHour() { + return endHour; + } + + public void setEndHour(String endHour) { + this.endHour = endHour; + } + + public String getEndMunite() { + return endMunite; + } + + public void setEndMunite(String endMunite) { + this.endMunite = endMunite; + } + + public String getEndSecond() { + return endSecond; + } + + public void setEndSecond(String endSecond) { + this.endSecond = endSecond; + } + + public String getWaterLevelCleaning() { + return waterLevelCleaning; + } + + public void setWaterLevelCleaning(String waterLevelCleaning) { + this.waterLevelCleaning = waterLevelCleaning; + } + + public String getCompleteSign() { + return completeSign; + } + + public void setCompleteSign(String completeSign) { + this.completeSign = completeSign; + } + + public String getMethodNumber() { + return methodNumber; + } + + public void setMethodNumber(String methodNumber) { + this.methodNumber = methodNumber; + } + + public String getRunTime() { + return runTime; + } + + public void setRunTime(String runTime) { + this.runTime = runTime; + } + + public String getPreWashingTime() { + return preWashingTime; + } + + public void setPreWashingTime(String preWashingTime) { + this.preWashingTime = preWashingTime; + } + + public String getEnzymeWashingTime() { + return enzymeWashingTime; + } + + public void setEnzymeWashingTime(String enzymeWashingTime) { + this.enzymeWashingTime = enzymeWashingTime; + } + + public String getEnzymeWashingTemperature() { + return enzymeWashingTemperature; + } + + public void setEnzymeWashingTemperature(String enzymeWashingTemperature) { + this.enzymeWashingTemperature = enzymeWashingTemperature; + } + + public String getPushEnzymeQuantity() { + return pushEnzymeQuantity; + } + + public void setPushEnzymeQuantity(String pushEnzymeQuantity) { + this.pushEnzymeQuantity = pushEnzymeQuantity; + } + + public String getUltrasoundTime() { + return ultrasoundTime; + } + + public void setUltrasoundTime(String ultrasoundTime) { + this.ultrasoundTime = ultrasoundTime; + } + + public String getUltrasonicTemp() { + return ultrasonicTemp; + } + + public void setUltrasonicTemp(String ultrasonicTemp) { + this.ultrasonicTemp = ultrasonicTemp; + } + + public String getUltrasonicCurrent() { + return ultrasonicCurrent; + } + + public void setUltrasonicCurrent(String ultrasonicCurrent) { + this.ultrasonicCurrent = ultrasonicCurrent; + } + + public String getUltrasonicFrequency() { + return ultrasonicFrequency; + } + + public void setUltrasonicFrequency(String ultrasonicFrequency) { + this.ultrasonicFrequency = ultrasonicFrequency; + } + + public String getPulseCount() { + return pulseCount; + } + + public void setPulseCount(String pulseCount) { + this.pulseCount = pulseCount; + } + + public String getPulseTemperature() { + return pulseTemperature; + } + + public void setPulseTemperature(String pulseTemperature) { + this.pulseTemperature = pulseTemperature; + } + + public String getPerfusionTimes() { + return perfusionTimes; + } + + public void setPerfusionTimes(String perfusionTimes) { + this.perfusionTimes = perfusionTimes; + } + + public String getRinseTime() { + return rinseTime; + } + + public void setRinseTime(String rinseTime) { + this.rinseTime = rinseTime; + } + + public String getRinsingExtractionCycles() { + return rinsingExtractionCycles; + } + + public void setRinsingExtractionCycles(String rinsingExtractionCycles) { + this.rinsingExtractionCycles = rinsingExtractionCycles; + } + + public String getRinseCycles() { + return rinseCycles; + } + + public void setRinseCycles(String rinseCycles) { + this.rinseCycles = rinseCycles; + } + + public String getDisinfectionTime() { + return disinfectionTime; + } + + public void setDisinfectionTime(String disinfectionTime) { + this.disinfectionTime = disinfectionTime; + } + + public String getDisinfectionTemperature() { + return disinfectionTemperature; + } + + public void setDisinfectionTemperature(String disinfectionTemperature) { + this.disinfectionTemperature = disinfectionTemperature; + } + + public String getFuelQuantity() { + return fuelQuantity; + } + + public void setFuelQuantity(String fuelQuantity) { + this.fuelQuantity = fuelQuantity; + } + + public String getAoValue() { + return aoValue; + } + + public void setAoValue(String aoValue) { + this.aoValue = aoValue; + } + + public String getDryingTime() { + return dryingTime; + } + + public void setDryingTime(String dryingTime) { + this.dryingTime = dryingTime; + } + + public String getDryingTemp() { + return dryingTemp; + } + + public void setDryingTemp(String dryingTemp) { + this.dryingTemp = dryingTemp; + } + + public String getFaultCode() { + return faultCode; + } + + public void setFaultCode(String faultCode) { + this.faultCode = faultCode; + } + + public Long getWashAndDisinfectRecordId() { + return washAndDisinfectRecordId; + } + + public void setWashAndDisinfectRecordId(Long washAndDisinfectRecordId) { + this.washAndDisinfectRecordId = washAndDisinfectRecordId; + } + + public static String getCompleteSignFinished() { + return COMPLETE_SIGN_FINISHED; + } + +} Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java =================================================================== diff -u -r41008 -r41138 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java (.../WashAndDisinfectRecord.java) (revision 41008) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washanddisinfectrecord/WashAndDisinfectRecord.java (.../WashAndDisinfectRecord.java) (revision 41138) @@ -200,6 +200,12 @@ * xinhua ws pdf */ public static final Integer WASHDATATYPE_XINHUA_WSPDF = 7; + + /** + * 品牌：Marge + * 型号：MAG-GSZK260（CSV格式） + */ + public static final Integer WASHDATATYPE_MAG_GSZK260 = 8; @Id @GeneratedValue(strategy=GenerationType.AUTO) public Long getId() { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java =================================================================== diff -u -r40891 -r41138 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java (.../DeviceInterface.java) (revision 40891) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java (.../DeviceInterface.java) (revision 41138) @@ -110,7 +110,12 @@ * 美雅洁,设备型号:MAG-GSZK385（CSV格式） */ public static final String MARGE_MODEL_MAG_GSZK385_CSV = "MAG-GSZK385（CSV格式）"; + /** + * 美雅洁,设备型号:MAG-GSZK260（CSV格式） + */ + public static final String MARGE_MODEL_MAG_GSZK260_CSV = "MAG-GSZK260（CSV格式）"; + /** * 美雅洁,设备型号:MAG-CL4 */ public static final String MARGE_MODEL_MAG_CL4 = "MAG-CL4";