长龙清洗参数

清洗程序参数

+清洗程序: + +

+程序运行总时间: + +

+程序完成时间: + +

+程序完成总次数: + +

+识别牌代码: + +

+循环泵的速度: + +

清洗腔参数

超声腔参数

漂洗腔参数

干燥腔参数

+ + + +

Index: ssts-web/src/main/webapp/js/jsgrid/jsgrid.min.css =================================================================== diff -u --- ssts-web/src/main/webapp/js/jsgrid/jsgrid.min.css (revision 0) +++ ssts-web/src/main/webapp/js/jsgrid/jsgrid.min.css (revision 23559) @@ -0,0 +1,7 @@ +/* + * jsGrid v1.5.3 (http://js-grid.com) + * (c) 2016 Artem Tabalin + * Licensed under MIT (https://github.com/tabalinas/jsgrid/blob/master/LICENSE) + */ + +.jsgrid{position:relative;overflow:hidden;font-size:1em}.jsgrid,.jsgrid *,.jsgrid :after,.jsgrid :before{box-sizing:border-box}.jsgrid input,.jsgrid select,.jsgrid textarea{font-size:1em}.jsgrid-grid-header{overflow-x:hidden;overflow-y:scroll;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.jsgrid-grid-body{overflow-x:auto;overflow-y:scroll;-webkit-overflow-scrolling:touch}.jsgrid-table{width:100%;table-layout:fixed;border-collapse:collapse;border-spacing:0}.jsgrid-cell{padding:.5em}.jsgrid-header-cell,.jsgrid-сell{box-sizing:border-box}.jsgrid-align-left{text-align:left}.jsgrid-align-center,.jsgrid-align-center input,.jsgrid-align-center select,.jsgrid-align-center textarea{text-align:center}.jsgrid-align-right,.jsgrid-align-right input,.jsgrid-align-right select,.jsgrid-align-right textarea{text-align:right}.jsgrid-header-cell{padding:.5em}.jsgrid-edit-row input,.jsgrid-edit-row select,.jsgrid-edit-row textarea,.jsgrid-filter-row input,.jsgrid-filter-row select,.jsgrid-filter-row textarea,.jsgrid-insert-row input,.jsgrid-insert-row select,.jsgrid-insert-row textarea{width:100%;padding:.3em .5em}.jsgrid-edit-row input[type=checkbox],.jsgrid-filter-row input[type=checkbox],.jsgrid-insert-row input[type=checkbox]{width:auto}.jsgrid-selected-row .jsgrid-cell{cursor:pointer}.jsgrid-nodata-row .jsgrid-cell{padding:.5em 0;text-align:center}.jsgrid-header-sort{cursor:pointer}.jsgrid-pager{padding:.5em 0}.jsgrid-pager-nav-button{padding:.2em .6em}.jsgrid-pager-nav-inactive-button{display:none;pointer-events:none}.jsgrid-pager-page{padding:.2em .6em} \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp =================================================================== diff -u -r22845 -r23559 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp (.../washAndDisinfectView.jsp) (revision 22845) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp (.../washAndDisinfectView.jsp) (revision 23559) @@ -2,6 +2,7 @@ <%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition"%> <%@page import="com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem"%> <%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface"%> <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> <%@page import="com.forgon.tools.SpringBeanManger,com.forgon.directory.vo.LoginUserData,com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord,com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> @@ -106,6 +107,7 @@ //扫描篮筐允许的篮筐状态集合 var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>'; var qmFormType = '<%=FormDefinition.FOMRTYPE_QUALITYMONITORING%>'; +var changLong = '<%= DeviceInterface.CHANGLONG %>'; Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImpl.java =================================================================== diff -u --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImpl.java (revision 0) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/ChangLongDataManagerImpl.java (revision 23559) @@ -0,0 +1,493 @@ +package com.forgon.disinfectsystem.maintain.device.service; + +import java.io.BufferedReader; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStreamReader; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import jcifs.smb.NtlmPasswordAuthentication; +import jcifs.smb.SmbFile; +import jcifs.smb.SmbFileInputStream; +import net.sf.json.JSONArray; + +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; +import org.hibernate.Query; +import org.hibernate.Session; +import org.springframework.stereotype.Service; + +import com.forgon.directory.acegi.tools.AcegiHelper; +import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; +import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser; +import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData; +import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataItemOfChangLong; +import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataOfChangLong; +import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; +import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; +import com.forgon.tools.hibernate.ObjectDao; + + +@Service("changLongDataManagerTarget") +public class ChangLongDataManagerImpl implements DeviceDataManager{ + + private static final String START_FLAG = "----------------------------------------"; + + /* + * 这些是未知的清洗方法 + [RINSE]DECONAMRINSE1 + [SONIC]DECONAMWASH + [WASH]DECONAMWASH + [SONIC]DECONAMRINSE1 + [WASH]DECONAMRINSE1 + [WASH]DECONAMRINSE + [RINSE]DECONAMRINSE + [RINSE]DECONAMWASH + [SONIC]DECONAMRINSE + */ + private static final Map translateMap = new HashMap(); + private static Map washDataMethodMap = new HashMap(); + static{ + //*************************************************// + //这些是未知的清洗程序 + //LAGLG, LADA, WLLA, UALSULE, DECONTAM. + translateMap.put("LNSTRUMENTS", "器械程序"); + translateMap.put("UTENSILS", "弯盘程序"); + translateMap.put("TEST", "测试程序"); + translateMap.put("PLASTIC", "塑料程序"); + + //*************************************************// + //清洗腔 + translateMap.put("ENMEWASH", "酶清洗"); + translateMap.put("PRE-WASH1", "预洗1"); + translateMap.put("WASH1", "碱洗1"); + translateMap.put("ENMERINSE", "酶漂洗"); + translateMap.put("COOLDOWNRINSE", "冷水漂洗 "); + //超声腔 + translateMap.put("SONIC", "超声 "); + //漂洗腔 + translateMap.put("THERMALRINSE", "终末漂洗 "); + translateMap.put("RINSE1", "漂洗1"); + //干燥腔 + translateMap.put("DRYING", "干燥"); + + //*************************************************// + //*************************************************// + translateMap.put("UNLOCKED", "未锁"); + translateMap.put("JMZX", "江门中心医院"); + translateMap.put("HIGH", "高"); + translateMap.put("LOW", "低"); + translateMap.put("DEPARTMENT", "部门"); + + translateMap.put("COLDWATER", "冷水"); + translateMap.put("PUREWATER", "纯水"); + translateMap.put("COLD&HOTWATER", "冷水和热水"); + translateMap.put("HOTWATER", "热水"); + + translateMap.put("NO", "否"); + translateMap.put("YES", "是"); + + translateMap.put("REGULAR", "常规"); + translateMap.put("ULTRA-CONCENTRATES", "特浓缩"); + + + try { +// washDataMethodMap.put("machineNo", WashDataOfChangLong.class.getMethod("setMachineNo", String.class)); + washDataMethodMap.put("CYCLECOUNT:", WashDataOfChangLong.class.getMethod("setCycleCounter", Long.class)); +// washDataMethodMap.put("deviceInterfaceID", WashDataOfChangLong.class.getMethod("setDeviceInterfaceID", Long.class)); +// washDataMethodMap.put("startedTime", WashDataOfChangLong.class.getMethod("setStartedTime", String.class)); +// washDataMethodMap.put("completedTime", WashDataOfChangLong.class.getMethod("setCompletedTime", String.class)); +// washDataMethodMap.put("methodName", WashDataOfChangLong.class.getMethod("setMethodName", String.class)); + washDataMethodMap.put("TOTALCYCLETIME:", WashDataOfChangLong.class.getMethod("setTotalCycleTime", String.class)); + washDataMethodMap.put("HOSPITALNAME:", WashDataOfChangLong.class.getMethod("setHospitalName", String.class)); + washDataMethodMap.put("DEPARTMENTNAME:", WashDataOfChangLong.class.getMethod("setDepartmentName", String.class)); + washDataMethodMap.put("CYCLEACCESS:", WashDataOfChangLong.class.getMethod("setCycleAccess", String.class)); + washDataMethodMap.put("PUMPSPEED:", WashDataOfChangLong.class.getMethod("setPumpSpeed", String.class)); + washDataMethodMap.put("BARCODENUMBER:", WashDataOfChangLong.class.getMethod("setBarCodeNumber", String.class)); + washDataMethodMap.put("UNITSERIALNUMBER:", WashDataOfChangLong.class.getMethod("setUnitSerialNumber", String.class)); + +// washDataMethodMap.put("setWashStatus", WashDataItemOfChangLong.class.getMethod("setWashStatus", String.class)); +// washDataMethodMap.put("setWashMethod", WashDataItemOfChangLong.class.getMethod("setWashMethod", String.class)); + washDataMethodMap.put("PHASETIME:", WashDataItemOfChangLong.class.getMethod("setPhaseTime", String.class)); + washDataMethodMap.put("HEATED:", WashDataItemOfChangLong.class.getMethod("setHeated", String.class)); + washDataMethodMap.put("CHEMICALPUMP:", WashDataItemOfChangLong.class.getMethod("setChemicalPump", String.class)); + washDataMethodMap.put("CHEMICALPUMP2:", WashDataItemOfChangLong.class.getMethod("setChemicalPump2", String.class)); + washDataMethodMap.put("CHEMICALTYPE:", WashDataItemOfChangLong.class.getMethod("setChemicalType", String.class)); + washDataMethodMap.put("CHEMICALTYPE2:", WashDataItemOfChangLong.class.getMethod("setChemicalType2", String.class)); + washDataMethodMap.put("LNJECTIONRATE:", WashDataItemOfChangLong.class.getMethod("setInjectionRate", String.class)); + washDataMethodMap.put("LNJECTIONRATE2:", WashDataItemOfChangLong.class.getMethod("setInjectionRate2", String.class)); + washDataMethodMap.put("WATERTYPE:", WashDataItemOfChangLong.class.getMethod("setWaterType", String.class)); + washDataMethodMap.put("TEMPERATURE:", WashDataItemOfChangLong.class.getMethod("setTemperature", String.class)); + washDataMethodMap.put("NUMBEROFSTAGES:", WashDataItemOfChangLong.class.getMethod("setNumberOfStages", String.class)); + washDataMethodMap.put("A0:", WashDataItemOfChangLong.class.getMethod("setA0", String.class)); + } catch (NoSuchMethodException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (SecurityException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + private LogManager appLogManager; + + private ObjectDao objectDao; + + private WashAndDisinfectRecordManager washAndDisinfectRecordManager; + + private SimpleDateFormat sdfFrom = new SimpleDateFormat("yyyyMMdd HH:mm"); + private SimpleDateFormat sdfTo = new SimpleDateFormat("yyyy/MM/dd HH:mm"); + + private static final Logger logger = Logger + .getLogger(ChangLongDataManagerImpl.class); + + + public void setWashAndDisinfectRecordManager( + WashAndDisinfectRecordManager washAndDisinfectRecordManager) { + this.washAndDisinfectRecordManager = washAndDisinfectRecordManager; + } + + public void setObjectDao(ObjectDao objectDao) { + this.objectDao = objectDao; + } + + public void setAppLogManager(LogManager appLogManager) { + this.appLogManager = appLogManager; + } + + /** + * 从接口读取数据和存入数据库 + */ + @Override + public void readAndSaveRecord(DeviceInterface devInterface,String machineNo,String brand,String isAutoCompleteSterilization) + { + if(devInterface == null) + { + return ; + } + try { + NtlmPasswordAuthentication auth = new NtlmPasswordAuthentication( + devInterface.getIP(), devInterface.getUserName(), devInterface.getPassword()); + // smbFileName格式 "smb://192.168.2.18/Share/*************_machineNumber.txt" + String shareURL = "smb://" + devInterface.getIP() + "/" + devInterface.getFolderPath() + "/"; + String backUpDirURL = shareURL + "backUp" + "/"; + SmbFile backUpDir = new SmbFile(backUpDirURL,auth); + if( !backUpDir.exists() ) + { + backUpDir.mkdirs(); + } + + SmbFile remoteFile = new SmbFile(shareURL, auth); + for(SmbFile file : remoteFile.listFiles()){ + String name = file.getName(); + if ( !(name.endsWith("txt") || name.endsWith("TXT")) ){ + continue; + } + String machineNumber = getMachineNo(name); + // 机器号和品牌都要匹配，才处理 + if(!(machineNumber.equals(machineNo) && DeviceInterface.CHANGLONG.equals(brand))){ + continue ; + } + String cycleCounter = washDataReadAndSave(file,devInterface.getId()); + if( cycleCounter != null){ + refreshWashRecordAmounts(devInterface.getId().toString(),Long.parseLong(cycleCounter),machineNumber); + } + else{ + logger.warn(name); + } + SmbFile desFile = new SmbFile(backUpDirURL + name,auth); + file.copyTo(desFile); + file.delete(); + } + } catch (IOException e){ + // 捕获BufferedReader对象关闭时的异常 + logger.warn(e.getMessage()); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, "设备接口连接异常," + e.getMessage()); + } + } + + /** + * 数据处理结束之后的工作，移动文件夹等等 + */ + @Override + public void end() + { + + } + + public String getMachineNo(String fileName) + { + if(fileName == null) + return ""; + try{ + String machineNo = ""; + int posS = fileName.indexOf("_"); + int posE = fileName.indexOf("."); + machineNo = fileName.substring(posS +1, posE); + return machineNo; + }catch(Exception e) + { + return ""; + } + } + + /** + * 长龙清洗机数据处理 + */ + public String washDataReadAndSave(SmbFile remoteFile,Long devInterfaceId) throws IOException{ + BufferedReader br = null; + try{ + br = new BufferedReader(new InputStreamReader( + new SmbFileInputStream(remoteFile))); + String machineNumber = getMachineNo(remoteFile.getName()); + String cycleCounter = null; + String line = null; + boolean isFirstLine = false; + boolean fileError = false; + WashDataOfChangLong washData = null; + while ((line = br.readLine()) != null) { + line = line.trim().replace(" ",""); + if(line.equals(START_FLAG)){ + isFirstLine = true; + }else{ + if(line.isEmpty()){ + continue; + } + if(isFirstLine){ + isFirstLine = false; + if(line.equals("CYCLECOMPLETED")){ + washData = new WashDataOfChangLong(); + isFirstLine = readBaseInfo(washData, br); + if(!isFirstLine){//文件结束 + break; + } + }else if(line.equals("TOTALCYCLETIME:")){ + if(washData == null){ + fileError = true; + logger.warn(remoteFile.getName() +":文件格式错误，文件没有清洗完成标志(CYCLE COMPLEMENT)"); + break; + } + isFirstLine = readwashDataInfo(washData, br); + if(!isFirstLine){//文件结束（或者有未知的参数） + break; + } + }else if(line.startsWith("[")){ + if(washData == null || washData.getCycleCounter() == null){ + fileError = true; + logger.warn(remoteFile.getName() +":文件格式错误，文件没有清洗完成标志(CYCLE COMPLEMENT)或者没有有效的循环次数"); + break; + } + isFirstLine = readWashDataItemInfo(washData, br, line); + if(!isFirstLine){//文件结束（或者有未知的参数） + break; + } + }else{ + fileError = true;//未知情况 + } + } + } + } + if(!fileError && washData != null){ + washData.setMachineNo(machineNumber); + washData.setDeviceInterfaceID(devInterfaceId); + cycleCounter = washData.getCycleCounter().toString(); + objectDao.saveOrUpdate(washData); + } + return cycleCounter; + } catch (ParseException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DEVICE_INTERFACE, Log.TYPE_ADD, "设备接口文件处理中,解析参数错误," + e.getMessage()); + return null; + }finally{ + try { + br.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + private boolean readWashDataItemInfo(WashDataOfChangLong washData, + BufferedReader br, String type) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, IOException { + List items = washData.getWashDataItems(); + String line = null; + String key = null; + WashDataItemOfChangLong item = new WashDataItemOfChangLong(); + if(type.startsWith("[WASH]")){ + item.setWashStatus(WashDataItemOfChangLong.WASH_STATUS_WASH); + }else if(type.startsWith("[SONIC]")){ + item.setWashStatus(WashDataItemOfChangLong.WASH_STATUS_SONIC); + }else if(type.startsWith("[RINSE]")){ + item.setWashStatus(WashDataItemOfChangLong.WASH_STATUS_RINSE); + }else if(type.startsWith("[DRYING]")){ + item.setWashStatus(WashDataItemOfChangLong.WASH_STATUS_DRYING); + }else{ + return false;//不该出现此种情况 + } + type = type.substring(type.indexOf("]")+1); + String washMethod = translateMap.get(type); + if(washMethod == null){ + washMethod = type; + } + item.setWashMethod(washMethod); + + while((line = br.readLine()) != null){ + line = line.trim().replace(" ",""); + if(line.equals(START_FLAG)){ + items.add(item); + item.setWashData(washData); + return true; + } + if(line.endsWith(":")){ + key = line; + }else{ + if(key != null){ + Method method = washDataMethodMap.get(key); + if(method == null){ + logger.warn("新参数：" + key + " 无法解析;"); + return false; + } + method.invoke(item, translateValue(line)); + } + key = null; + } + } + return false; + } + + private boolean readwashDataInfo(WashDataOfChangLong washData, BufferedReader br) throws IOException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { + String line = null; + String key = null; + //一进入这个函数，第一行必须是totalCycleTime，否则无法解析 + //系统的这个有bug显示（比如：171127030713_VISIONMC04.txt） + //TOTAL CYCLE TIME: + // 70: + //修改为： 70:00 + line = br.readLine(); + if(line != null){ + line = line.trim(); + if(line.endsWith(":")){ + line += "00"; + } + washData.setTotalCycleTime(line); + }else{ + return false; + } + while((line = br.readLine()) != null){ + line = line.trim().replace(" ",""); + if(line.equals(START_FLAG)){ + return true; + } + if(line.endsWith(":")){ + key = line; + }else{ + if(key != null){ + Method method = washDataMethodMap.get(key); + if(method == null){ + logger.warn("新参数：" + key + " 无法解析;"); + return false; + } +// .invoke(washData, translateValue(line)); + Class classType = method.getParameterTypes()[0]; +// System.out.println(classType.getName()); + if(classType.getName().equals("java.lang.Long")){ + method.invoke(washData, Long.valueOf(line)); + }else{ + method.invoke(washData, translateValue(line)); + } + } + key = null; + } + } + return false; + } + + private String translateValue(String line) { + String out = translateMap.get(line); + if(out == null){ + out = line; + } + return out; + } + + /** + * 读取基本信息 + * @param washData + * @param br + * @return + * @throws IOException + * @throws ParseException + */ + private boolean readBaseInfo(WashDataOfChangLong washData, BufferedReader br) throws IOException, ParseException { + String line = null; + int lineNumber = 2; + while((line = br.readLine()) != null){ + line = line.trim(); + if(line.equals(START_FLAG)){ + return true; + } + switch(lineNumber){ + case 2 : + washData.setMethodName(translateValue(line)); + lineNumber++; + break; + case 3 : + washData.setCompletedTime(parseTime(line)); + break; + default : + break; + } + } + return false; + } + + private String parseTime(String line) throws ParseException { + line = line.replace("/", ""); + if(line.endsWith(":")){ //有些数据没有分钟，形式如 : 2017/11/20 15: + line += "00"; + } + return sdfTo.format(sdfFrom.parse(line)); + } + + /** + * 更新清洗机的温度压力数据 + */ + public void refreshWashRecordAmounts(String devInterfaceId,Long cycleCounter,String machineNo){ + // 根据接口和机器号找到清洗机 + Session session = objectDao.getHibernateSession(); + String queryString = "select r from Rinser r" + + " where r.deviceInterface.id = :deviceInterfaceId" + + " and r.machineNumber = :machineNo"; + Query query = session.createQuery(queryString); + query.setParameter("deviceInterfaceId", Long.valueOf(devInterfaceId)); + query.setParameter("machineNo", machineNo); + @SuppressWarnings("unchecked") + List rinsers = query.list(); + + for(Rinser rs : rinsers) + { + queryString = "select wd from WashAndDisinfectRecord wd" + + " where wd.rinserId = :rinserId" + + " and wd.cycleCounter = :cycleCounter"; + query = session.createQuery(queryString); + query.setParameter("rinserId", rs.getId()); + query.setParameter("cycleCounter", cycleCounter); + WashAndDisinfectRecord wd = (WashAndDisinfectRecord)query.uniqueResult(); + if(wd != null) + { + int amounts = washAndDisinfectRecordManager.getWashAndDisinfectRecordsCount(devInterfaceId,machineNo,cycleCounter); + wd.setWashDataAmount(Long.valueOf(amounts)); + washAndDisinfectRecordManager.save(wd); + } + } + } +} Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataItemOfChangLong.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataItemOfChangLong.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataItemOfChangLong.java (revision 23559) @@ -0,0 +1,257 @@ +package com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData; + +import javax.persistence.Entity; + +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; + + +/** + * @author niutouren 2018-06-08 + * 长龙清洗机的清洗数据详情，关联到WashDataOfChangLong.java + */ +@Entity +@DynamicInsert(false) +@DynamicUpdate(true) +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +public class WashDataItemOfChangLong { + + private Long id; + + /** + * 清洗腔 + */ + public static final String WASH_STATUS_WASH = "清洗腔"; + + /** + * 超声腔 + */ + public static final String WASH_STATUS_SONIC = "超声腔"; + + /** + * 漂洗腔 + */ + public static final String WASH_STATUS_RINSE = "漂洗腔"; + + /** + * 干燥腔 + */ + public static final String WASH_STATUS_DRYING = "干燥腔"; + + /** + * 清洗状态（在哪个清洗腔：清洗腔/超声腔/漂洗腔/干燥腔） + */ + private String washStatus; + + /** + * 清洗方法 + */ + private String washMethod; + + /** + * 喷淋（超声/干燥）时间 + */ + private String phaseTime; + + /** + * 吸耗品的泵 + */ + private String chemicalPump; + + /** + * 吸耗品的泵2 + */ + private String chemicalPump2; + + /** + * 耗品的类型 + */ + private String chemicalType; + + /** + * 耗品的类型2 + */ + private String chemicalType2; + + /** + * 吸液比率 + */ + private String injectionRate; + + /** + * 吸液比率2 + */ + private String injectionRate2; + + /** + * 水的类型 + */ + private String waterType; + + /** + * 是否加热 + */ + private String heated; + + /** + * 加热温度设置点 + */ + private String temperature; + + /** + * 清洗步骤次数 + */ + private String numberOfStages; + + /** + * A0 + */ + private String A0; + + /** + * 关联清洗数据 + */ + private WashDataOfChangLong washData; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getWashStatus() { + return washStatus; + } + + public void setWashStatus(String washStatus) { + this.washStatus = washStatus; + } + + public String getWashMethod() { + return washMethod; + } + + public void setWashMethod(String washMethod) { + this.washMethod = washMethod; + } + + public String getPhaseTime() { + return phaseTime; + } + + public void setPhaseTime(String phaseTime) { + this.phaseTime = phaseTime; + } + + public String getChemicalPump() { + return chemicalPump; + } + + public void setChemicalPump(String chemicalPump) { + this.chemicalPump = chemicalPump; + } + + public String getChemicalPump2() { + return chemicalPump2; + } + + public void setChemicalPump2(String chemicalPump2) { + this.chemicalPump2 = chemicalPump2; + } + + public String getChemicalType() { + return chemicalType; + } + + public void setChemicalType(String chemicalType) { + this.chemicalType = chemicalType; + } + + public String getChemicalType2() { + return chemicalType2; + } + + public void setChemicalType2(String chemicalType2) { + this.chemicalType2 = chemicalType2; + } + + public String getInjectionRate() { + return injectionRate; + } + + public void setInjectionRate(String injectionRate) { + this.injectionRate = injectionRate; + } + + public String getInjectionRate2() { + return injectionRate2; + } + + public void setInjectionRate2(String injectionRate2) { + this.injectionRate2 = injectionRate2; + } + + public String getWaterType() { + return waterType; + } + + public void setWaterType(String waterType) { + this.waterType = waterType; + } + + public String getHeated() { + return heated; + } + + public void setHeated(String heated) { + this.heated = heated; + } + + public String getTemperature() { + return temperature; + } + + public void setTemperature(String temperature) { + this.temperature = temperature; + } + + public String getNumberOfStages() { + return numberOfStages; + } + + public void setNumberOfStages(String numberOfStages) { + this.numberOfStages = numberOfStages; + } + + public String getA0() { + return A0; + } + + public void setA0(String a0) { + A0 = a0; + } + + @ManyToOne + @JoinColumn(name = "washDataOfChangLong_id") + public WashDataOfChangLong getWashData() { + return washData; + } + + public void setWashData(WashDataOfChangLong washData) { + this.washData = washData; + } + +} Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washdataGridChart.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washdataGridChart.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washdataGridChart.js (revision 23559) @@ -0,0 +1,231 @@ +var washItems = null; +var sonicItems = null; +var rinseItems = null; +var dryingItems = null; +var totalCycleTime; +var completedTime; +var cycleCount; +var barCodeNumber; +var methodName; +var pumpSpeed; + +var parameterSpace = "： "; +var valueEmpty = ' '; + +var fileds = [ + { name: "参数", type: "text", width: 60, align : "right"}, +// cellRenderer : function(value,item){ +// if(value.indexOf("：") == -1){ +// return "" + value + ""; +// } +// }, + { name: "数值", type: "text", width: 40} +]; + + +function rowClassFunction(item){ + var a = item['数值'] ; + if(a == valueEmpty){ + return "row_backcolor_green"; + } +} + +function showGrid(){ + var gridWidth = "100%"; + var gridHeight = "100%"; + if(washItems != null){ + $("#myJsGrid1").jsGrid({ + width: gridWidth, + height: gridHeight, + rowClass : function(item, itemIndex){ + return rowClassFunction(item); + }, + data: washItems, + fields: fileds + }); + }else{ + $("#wrap1").hide(); + } + if(sonicItems != null){ + $("#myJsGrid2").jsGrid({ + width: gridWidth, + height: gridHeight, + rowClass : function(item, itemIndex){ + return rowClassFunction(item); + }, + data: sonicItems, + fields: fileds + }); + }else{ + $("#wrap2").hide(); + } + if(rinseItems != null){ + $("#myJsGrid3").jsGrid({ + width: gridWidth, + height: gridHeight, + rowClass : function(item, itemIndex){ + return rowClassFunction(item); + }, + data: rinseItems, + fields: fileds + }); + }else{ + $("#wrap3").hide(); + } + if(dryingItems != null){ + $("#myJsGrid4").jsGrid({ + width: gridWidth, + height: gridHeight, + rowClass : function(item, itemIndex){ + return rowClassFunction(item); + }, + data: dryingItems, + fields: fileds + }); + }else{ + $("#wrap4").hide(); + } +} + +function parseItem(array, item){ + var status = item.washStatus; + var washMethod = item.washMethod; + var phaseTime = item.phaseTime; + var chemicalPump = item.chemicalPump; + var chemicalPump2 = item.chemicalPump2; + var chemicalType = item.chemicalType; + var chemicalType2 = item.chemicalType2; + var injectionRate = item.injectionRate; + var injectionRate2 = item.injectionRate2; + var waterType = item.waterType; + var heated = item.heated; + var temperature = item.temperature; + var numberOfStages = item.numberOfStages; + var A0 = item.A0; + + array.push({"参数": washMethod, "数值": valueEmpty}); + if(!isUndefinedOrNullOrEmpty(phaseTime)){ + switch(status){ + case washStatus: + array.push({"参数": "喷淋时间"+parameterSpace, "数值": phaseTime}); + break; + case sonicStatus: + array.push({"参数": "超声时间"+parameterSpace, "数值": phaseTime}); + break; + case rinseStatus: + array.push({"参数": "喷淋时间"+parameterSpace, "数值": phaseTime}); + break; + case dryingStatus: + array.push({"参数": "干燥时间"+parameterSpace, "数值": phaseTime}); + break; + default : + break ; + } + } + if(!isUndefinedOrNullOrEmpty(chemicalPump)){ + array.push({"参数": "吸耗品的泵"+parameterSpace, "数值": chemicalPump}); + } + if(!isUndefinedOrNullOrEmpty(chemicalType)){ + array.push({"参数": "耗品的类型"+parameterSpace, "数值": chemicalType}); + } + if(!isUndefinedOrNullOrEmpty(injectionRate)){ + array.push({"参数": "吸液比率"+parameterSpace, "数值": injectionRate}); + } + if(!isUndefinedOrNullOrEmpty(chemicalPump2)){ + array.push({"参数": "吸耗品的泵2+parameterSpace", "数值": chemicalPump2}); + } + if(!isUndefinedOrNullOrEmpty(chemicalType2)){ + array.push({"参数": "耗品的类型2"+parameterSpace, "数值": chemicalType2}); + } + if(!isUndefinedOrNullOrEmpty(injectionRate2)){ + array.push({"参数": "吸液比率2"+parameterSpace, "数值": injectionRate2}); + } + if(!isUndefinedOrNullOrEmpty(waterType)){ + array.push({"参数": "水的类型"+parameterSpace, "数值": waterType}); + } + if(!isUndefinedOrNullOrEmpty(heated)){ + array.push({"参数": "是否加热"+parameterSpace, "数值": heated}); + } + if(dryingStatus == status){ + if(!isUndefinedOrNullOrEmpty(temperature)){ + array.push({"参数": "干燥温度类型选择"+parameterSpace, "数值": temperature}); + } + }else{ + if(!isUndefinedOrNullOrEmpty(temperature)){ + array.push({"参数": "加热温度设置点"+parameterSpace, "数值": temperature}); + } + } + if(!isUndefinedOrNullOrEmpty(numberOfStages)){ + array.push({"参数": "清洗步骤次数"+parameterSpace, "数值": numberOfStages}); + } + if(!isUndefinedOrNullOrEmpty(A0)){ + array.push({"参数": "A0"+parameterSpace, "数值": A0}); + } + +} + +function parseItemArray(array, items){ + for(var int = 0; int < items.length; int++){ + parseItem(array, items[int]); + } +} + +function myTestOut(result){ + totalCycleTime = result.totalCycleTime; + completedTime = result.completedTime; + cycleCount = result.cycleCount; + barCodeNumber = result.barCodeNumber; + methodName = result.methodName; + pumpSpeed = result.pumpSpeed; + + document.getElementById("methodName").value =methodName; + document.getElementById("completedTime").value =completedTime; + document.getElementById("totalCycleTime").value =totalCycleTime; + document.getElementById("cycleCount").value =cycleCount; + document.getElementById("barCodeNumber").value =barCodeNumber; + document.getElementById("pumpSpeed").value =pumpSpeed; + + var data = result.washItems; + if(!isUndefinedOrNullOrEmpty(data)){ + if(washItems == null){ + washItems = new Array(); + } + parseItemArray(washItems, data); + } + data = result.sonicItems; + if(!isUndefinedOrNullOrEmpty(data)){ + if(sonicItems == null){ + sonicItems = new Array(); + } + parseItemArray(sonicItems, data); + } + data = result.rinseItems; + if(!isUndefinedOrNullOrEmpty(data)){ + if(rinseItems == null){ + rinseItems = new Array(); + } + parseItemArray(rinseItems, data); + } + data = result.dryingItems; + if(!isUndefinedOrNullOrEmpty(data)){ + if(dryingItems == null){ + dryingItems = new Array(); + } + parseItemArray(dryingItems, data); + } + fillUnfulledArray(washItems); + fillUnfulledArray(sonicItems); + fillUnfulledArray(rinseItems); + fillUnfulledArray(dryingItems); + +} + +function fillUnfulledArray(items){ + if(items != null){ + if(items.length <7){ + for(var int = 7-items.length; int >0 ;int--){ + items.push({"参数": valueEmpty, "数值": valueEmpty}); + } + } + } +} \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfChangLong.java =================================================================== diff -u --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfChangLong.java (revision 0) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/washanddisinfectmanager/washData/WashDataOfChangLong.java (revision 23559) @@ -0,0 +1,233 @@ +package com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData; + +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.Entity; + +import org.hibernate.annotations.Cascade; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; + +import org.hibernate.annotations.Cache; +import org.hibernate.annotations.CacheConcurrencyStrategy; + + + +/** + * @author niutouren 2018-06-08 + * 长龙清洗机的清洗数据。一条清洗记录，对应一条此清洗数据。 + * 一条此清洗数据，关联多条WashDataItemOfChangLong详情。 + * 新建此po，而不用以前的清洗数据的模型（WashData)，是因为长龙清洗机的清洗文件跟其它的不一样，以前的WashData无法适用 + */ +@Entity +@DynamicInsert(false) +@DynamicUpdate(true) +@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) +public class WashDataOfChangLong { + + private Long id; + + /** + * 机器号 + */ + private String machineNo; + + /** + * 循环次数(程序完成总次数) + */ + private Long cycleCounter; + + /** + * 设备接口ID + */ + private Long deviceInterfaceID; + + /** + * 开始时间 + */ + private String startedTime; + + /** + * 完成时间 + */ + private String completedTime; + + /** + * 程序名称 + */ + private String methodName; + + /** + * 程序运行总时间 + */ + private String totalCycleTime; + + /** + * 清洗机系列号 + */ + private String unitSerialNumber; + + /** + * 医院名称 + */ + private String hospitalName; + + /** + * 部门名称 + */ + private String departmentName; + + /** + * 程序使用权 + */ + private String cycleAccess; + + /** + * 循环泵的速度 + */ + private String pumpSpeed; + + /** + * 识别牌代号 + */ + private String barCodeNumber; + + /** + * 清洗项 + */ + private List washDataItems = new ArrayList(); + + @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 getCycleCounter() { + return cycleCounter; + } + + public void setCycleCounter(Long cycleCounter) { + this.cycleCounter = cycleCounter; + } + + public Long getDeviceInterfaceID() { + return deviceInterfaceID; + } + + public void setDeviceInterfaceID(Long deviceInterfaceID) { + this.deviceInterfaceID = deviceInterfaceID; + } + + public String getStartedTime() { + return startedTime; + } + + public void setStartedTime(String startedTime) { + this.startedTime = startedTime; + } + + public String getCompletedTime() { + return completedTime; + } + + public void setCompletedTime(String completedTime) { + this.completedTime = completedTime; + } + + public String getMethodName() { + return methodName; + } + + public void setMethodName(String methodName) { + this.methodName = methodName; + } + + public String getTotalCycleTime() { + return totalCycleTime; + } + + public void setTotalCycleTime(String totalCycleTime) { + this.totalCycleTime = totalCycleTime; + } + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + + public String getDepartmentName() { + return departmentName; + } + + public void setDepartmentName(String departmentName) { + this.departmentName = departmentName; + } + + public String getCycleAccess() { + return cycleAccess; + } + + public void setCycleAccess(String cycleAccess) { + this.cycleAccess = cycleAccess; + } + + public String getPumpSpeed() { + return pumpSpeed; + } + + public void setPumpSpeed(String pumpSpeed) { + this.pumpSpeed = pumpSpeed; + } + + public String getBarCodeNumber() { + return barCodeNumber; + } + + public void setBarCodeNumber(String barCodeNumber) { + this.barCodeNumber = barCodeNumber; + } + + @OneToMany(fetch = FetchType.LAZY, mappedBy="washData") + @Cascade(value = { org.hibernate.annotations.CascadeType.SAVE_UPDATE }) + @OrderBy("id asc") + public List getWashDataItems() { + return washDataItems; + } + + public void setWashDataItems(List washDataItems) { + this.washDataItems = washDataItems; + } + + public String getUnitSerialNumber() { + return unitSerialNumber; + } + + public void setUnitSerialNumber(String unitSerialNumber) { + this.unitSerialNumber = unitSerialNumber; + } + +} Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r23299 -r23559 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 23299) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 23559) @@ -77,7 +77,16 @@ } function openWashDataLineChart(id){ - openModalWindow(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id, '清洗参数', '800', '600'); + Ext.Ajax.request({ + url: WWWROOT +'/disinfectSystem/washData/washDataLineChartAction!getRinserType.do?washAndDisinfectRecordId='+id+'&time='+new Date(), + success: function(result){ + var out = Ext.decode(result.responseText); + if(out.message == changLong){ + openModalWindow(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataGridChart.jsp?washAndDisinfectRecordId='+id, '清洗参数', '800', '600'); + }else{ + openModalWindow(WWWROOT+'/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataLineChart.jsp?washAndDisinfectRecordId='+id, '清洗参数', '800', '600'); + } + }}); } function updateWashStatus(status){ Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r22995 -r23559 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 22995) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 23559) @@ -62,6 +62,8 @@ import com.forgon.disinfectsystem.entity.packing.PackingTask; import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData; +import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataItemOfChangLong; +import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataOfChangLong; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecordMaterial; import com.forgon.disinfectsystem.idcarddefinition.service.IDCardDefinitionManager; @@ -1437,22 +1439,32 @@ @Override public int getWashAndDisinfectRecordsCount(String devInterfaceId, String machineNo, long cycleCounter) { - Session session = objectDao.getHibernateSession(); - String queryString = "select count(*) from WashData wd" - + " where wd.deviceInterfaceID = :devInterfaceId" - + " and wd.machineNo = :machineNo" - + " and wd.cycleCounter = :cycleCounter"; - Query query = session.createQuery(queryString); - query.setParameter("devInterfaceId", devInterfaceId); - query.setParameter("machineNo", machineNo); - query.setParameter("cycleCounter", cycleCounter); +// Session session = objectDao.getHibernateSession(); + String washDataTableString = "select count(*) c from WashData wd" + + " where wd.deviceInterfaceID = '" + devInterfaceId + + "' and wd.machineNo = '" + machineNo + + "' and wd.cycleCounter = " + cycleCounter; + String washDataOfChangLongTableString = "select count(*) c from WashDataOfChangLong wdcl" + + " where wdcl.deviceInterfaceID = '" + devInterfaceId + + "' and wdcl.machineNo = '" + machineNo + + "' and wdcl.cycleCounter = " + cycleCounter; + String queryString = String.format("select sum(c) from ( %s union %s ) tempTable", + washDataTableString,washDataOfChangLongTableString); +// Query query = session.createQuery(queryString); +// query.setParameter("devInterfaceId1", devInterfaceId); +// query.setParameter("devInterfaceId2", Long.valueOf(devInterfaceId)); +// query.setParameter("machineNo1", machineNo); +// query.setParameter("machineNo2", machineNo); +// query.setParameter("cycleCounter1", cycleCounter); +// query.setParameter("cycleCounter2", cycleCounter); - int count = 0; - Long result = (Long)query.uniqueResult(); - if (result != null && StringUtils.isNumeric(result + "")){ - count = result.intValue(); - } - return count; +// int count = 0; + return objectDao.countBySql(queryString); +// Long result = (Long)query.uniqueResult(); +// if (result != null && StringUtils.isNumeric(result + "")){ +// count = result.intValue(); +// } +// return count; } /** @@ -2504,4 +2516,97 @@ } return jSONArray; } + + @Override + public String getRinserType(String washAndDisinfectRecordId) { + if(DatabaseUtil.isPoIdValid(washAndDisinfectRecordId)){ + String hql = " where po.id = (select wr.rinserId from WashAndDisinfectRecord wr where wr.id = " + washAndDisinfectRecordId + ")"; + Rinser rinser = (Rinser) objectDao.getBySql(Rinser.class.getSimpleName(), hql); + if(rinser != null){ + return rinser.getDeviceInterface().getDeviceBrand(); + } + } + return null; + } + + @Override + public JSONObject getWashDataOfChangLongById(Long washRecordId) { + WashAndDisinfectRecord sr = get(washRecordId); + Rinser rs = (Rinser)objectDao.getByProperty(Rinser.class.getSimpleName(), "id", sr.getRinserId()); + if(sr != null && rs != null) + { + String hql = " where po.deviceInterfaceID = " + rs.getDeviceInterfaceId() + + " and po.machineNo = '" + rs.getMachineNumber() + + "' and po.cycleCounter = " + sr.getCycleCounter(); + WashDataOfChangLong washData = (WashDataOfChangLong) objectDao.getBySql(WashDataOfChangLong.class.getSimpleName(), hql); + if(washData != null){ + JSONObject object = new JSONObject(); + object.put("totalCycleTime", washData.getTotalCycleTime()); + object.put("completedTime", washData.getCompletedTime()); + object.put("cycleCount", washData.getCycleCounter()); + object.put("barCodeNumber", washData.getBarCodeNumber()); + object.put("methodName", washData.getMethodName()); + object.put("pumpSpeed", washData.getPumpSpeed()); + + JSONArray washArray = null; + JSONArray sonicArray = null; + JSONArray rinseArray = null; + JSONArray dryingArray = null; + List items = washData.getWashDataItems(); + for (WashDataItemOfChangLong item : items) { + JSONObject itemObject = new JSONObject(); + itemObject.put("washMethod", item.getWashMethod()); + itemObject.put("phaseTime", item.getPhaseTime()); + itemObject.put("chemicalPump", item.getChemicalPump()); + itemObject.put("chemicalPump2", item.getChemicalPump2()); + itemObject.put("chemicalType", item.getChemicalType()); + itemObject.put("chemicalType2", item.getChemicalType2()); + itemObject.put("injectionRate", item.getInjectionRate()); + itemObject.put("injectionRate2", item.getInjectionRate2()); + itemObject.put("waterType", item.getWaterType()); + itemObject.put("heated", item.getHeated()); + itemObject.put("temperature", item.getTemperature()); + itemObject.put("numberOfStages", item.getNumberOfStages()); + itemObject.put("A0", item.getA0()); + switch(item.getWashStatus()){ + case WashDataItemOfChangLong.WASH_STATUS_WASH : + if(washArray == null){ + washArray = new JSONArray(); + } + itemObject.put("washStatus", WashDataItemOfChangLong.WASH_STATUS_WASH); + washArray.add(itemObject); + break; + case WashDataItemOfChangLong.WASH_STATUS_SONIC : + if(sonicArray == null){ + sonicArray = new JSONArray(); + } + itemObject.put("washStatus", WashDataItemOfChangLong.WASH_STATUS_SONIC); + sonicArray.add(itemObject); + break; + case WashDataItemOfChangLong.WASH_STATUS_RINSE : + if(rinseArray == null){ + rinseArray = new JSONArray(); + } + itemObject.put("washStatus", WashDataItemOfChangLong.WASH_STATUS_RINSE); + rinseArray.add(itemObject); + break; + case WashDataItemOfChangLong.WASH_STATUS_DRYING : + if(dryingArray == null){ + dryingArray = new JSONArray(); + } + itemObject.put("washStatus", WashDataItemOfChangLong.WASH_STATUS_DRYING); + dryingArray.add(itemObject); + break; + default : break; + } + } + object.put("washItems", washArray); + object.put("sonicItems", sonicArray); + object.put("rinseItems", rinseArray); + object.put("dryingItems", dryingArray); + return object; + } + } + return null; + } } Index: ssts-web/src/main/webapp/js/jsgrid/jsgrid.min.js =================================================================== diff -u --- ssts-web/src/main/webapp/js/jsgrid/jsgrid.min.js (revision 0) +++ ssts-web/src/main/webapp/js/jsgrid/jsgrid.min.js (revision 23559) @@ -0,0 +1,8 @@ +/* + * jsGrid v1.5.3 (http://js-grid.com) + * (c) 2016 Artem Tabalin + * Licensed under MIT (https://github.com/tabalinas/jsgrid/blob/master/LICENSE) + */ + +!function(a,b,c){function d(a,c){var d=b(a);d.data(f,this),this._container=d,this.data=[],this.fields=[],this._editingRow=null,this._sortField=null,this._sortOrder=i,this._firstDisplayingPage=1,this._init(c),this.render()}var e="JSGrid",f=e,g="JSGridItem",h="JSGridEditRow",i="asc",j="desc",k="{first}",l="{pages}",m="{prev}",n="{next}",o="{last}",p="{pageIndex}",q="{pageCount}",r="{itemCount}",s="javascript:void(0);",t=function(a,c){return b.isFunction(a)?a.apply(c,b.makeArray(arguments).slice(2)):a},u=function(a){var c=b.Deferred();return a&&a.then?a.then(function(){c.resolve.apply(c,arguments)},function(){c.reject.apply(c,arguments)}):c.resolve(a),c.promise()},v={loadData:b.noop,insertItem:b.noop,updateItem:b.noop,deleteItem:b.noop};d.prototype={width:"auto",height:"auto",updateOnResize:!0,rowClass:b.noop,rowRenderer:null,rowClick:function(a){this.editing&&this.editItem(b(a.event.target).closest("tr"))},rowDoubleClick:b.noop,noDataContent:"Not found",noDataRowClass:"jsgrid-nodata-row",heading:!0,headerRowRenderer:null,headerRowClass:"jsgrid-header-row",headerCellClass:"jsgrid-header-cell",filtering:!1,filterRowRenderer:null,filterRowClass:"jsgrid-filter-row",inserting:!1,insertRowRenderer:null,insertRowClass:"jsgrid-insert-row",editing:!1,editRowRenderer:null,editRowClass:"jsgrid-edit-row",confirmDeleting:!0,deleteConfirm:"Are you sure?",selecting:!0,selectedRowClass:"jsgrid-selected-row",oddRowClass:"jsgrid-row",evenRowClass:"jsgrid-alt-row",cellClass:"jsgrid-cell",sorting:!1,sortableClass:"jsgrid-header-sortable",sortAscClass:"jsgrid-header-sort jsgrid-header-sort-asc",sortDescClass:"jsgrid-header-sort jsgrid-header-sort-desc",paging:!1,pagerContainer:null,pageIndex:1,pageSize:20,pageButtonCount:15,pagerFormat:"Pages: {first} {prev} {pages} {next} {last} {pageIndex} of {pageCount}",pagePrevText:"Prev",pageNextText:"Next",pageFirstText:"First",pageLastText:"Last",pageNavigatorNextText:"...",pageNavigatorPrevText:"...",pagerContainerClass:"jsgrid-pager-container",pagerClass:"jsgrid-pager",pagerNavButtonClass:"jsgrid-pager-nav-button",pagerNavButtonInactiveClass:"jsgrid-pager-nav-inactive-button",pageClass:"jsgrid-pager-page",currentPageClass:"jsgrid-pager-current-page",customLoading:!1,pageLoading:!1,autoload:!1,controller:v,loadIndication:!0,loadIndicationDelay:500,loadMessage:"Please, wait...",loadShading:!0,invalidMessage:"Invalid data entered!",invalidNotify:function(c){var d=b.map(c.errors,function(a){return a.message||null});a.alert([this.invalidMessage].concat(d).join("\n"))},onInit:b.noop,onRefreshing:b.noop,onRefreshed:b.noop,onPageChanged:b.noop,onItemDeleting:b.noop,onItemDeleted:b.noop,onItemInserting:b.noop,onItemInserted:b.noop,onItemEditing:b.noop,onItemUpdating:b.noop,onItemUpdated:b.noop,onItemInvalid:b.noop,onDataLoading:b.noop,onDataLoaded:b.noop,onOptionChanging:b.noop,onOptionChanged:b.noop,onError:b.noop,invalidClass:"jsgrid-invalid",containerClass:"jsgrid",tableClass:"jsgrid-table",gridHeaderClass:"jsgrid-grid-header",gridBodyClass:"jsgrid-grid-body",_init:function(a){b.extend(this,a),this._initLoadStrategy(),this._initController(),this._initFields(),this._attachWindowLoadResize(),this._attachWindowResizeCallback(),this._callEventHandler(this.onInit)},loadStrategy:function(){return this.pageLoading?new jsGrid.loadStrategies.PageLoadingStrategy(this):new jsGrid.loadStrategies.DirectLoadingStrategy(this)},_initLoadStrategy:function(){this._loadStrategy=t(this.loadStrategy,this)},_initController:function(){this._controller=b.extend({},v,t(this.controller,this))},renderTemplate:function(a,b,d){args=[];for(var e in d)args.push(d[e]);return args.unshift(a,b),a=t.apply(null,args),a===c||null===a?"":a},loadIndicator:function(a){return new jsGrid.LoadIndicator(a)},validation:function(a){return jsGrid.Validation&&new jsGrid.Validation(a)},_initFields:function(){var a=this;a.fields=b.map(a.fields,function(c){if(b.isPlainObject(c)){var d=c.type&&jsGrid.fields[c.type]||jsGrid.Field;c=new d(c)}return c._grid=a,c})},_attachWindowLoadResize:function(){b(a).on("load",b.proxy(this._refreshSize,this))},_attachWindowResizeCallback:function(){this.updateOnResize&&b(a).on("resize",b.proxy(this._refreshSize,this))},_detachWindowResizeCallback:function(){b(a).off("resize",this._refreshSize)},option:function(a,b){var c,d;return 1===arguments.length?this[a]:(c={option:a,oldValue:this[a],newValue:b},this._callEventHandler(this.onOptionChanging,c),this._handleOptionChange(c.option,c.newValue),d={option:c.option,value:c.newValue},void this._callEventHandler(this.onOptionChanged,d))},fieldOption:function(a,b,c){return a=this._normalizeField(a),2===arguments.length?a[b]:(a[b]=c,void this._renderGrid())},_handleOptionChange:function(a,b){switch(this[a]=b,a){case"width":case"height":this._refreshSize();break;case"rowClass":case"rowRenderer":case"rowClick":case"rowDoubleClick":case"noDataRowClass":case"noDataContent":case"selecting":case"selectedRowClass":case"oddRowClass":case"evenRowClass":this._refreshContent();break;case"pageButtonCount":case"pagerFormat":case"pagePrevText":case"pageNextText":case"pageFirstText":case"pageLastText":case"pageNavigatorNextText":case"pageNavigatorPrevText":case"pagerClass":case"pagerNavButtonClass":case"pageClass":case"currentPageClass":case"pagerRenderer":this._refreshPager();break;case"fields":this._initFields(),this.render();break;case"data":case"editing":case"heading":case"filtering":case"inserting":case"paging":this.refresh();break;case"loadStrategy":case"pageLoading":this._initLoadStrategy(),this.search();break;case"pageIndex":this.openPage(b);break;case"pageSize":this.refresh(),this.search();break;case"editRowRenderer":case"editRowClass":this.cancelEdit();break;case"updateOnResize":this._detachWindowResizeCallback(),this._attachWindowResizeCallback();break;case"invalidNotify":case"invalidMessage":break;default:this.render()}},destroy:function(){this._detachWindowResizeCallback(),this._clear(),this._container.removeData(f)},render:function(){return this._renderGrid(),this.autoload?this.loadData():b.Deferred().resolve().promise()},_renderGrid:function(){this._clear(),this._container.addClass(this.containerClass).css("position","relative").append(this._createHeader()).append(this._createBody()),this._pagerContainer=this._createPagerContainer(),this._loadIndicator=this._createLoadIndicator(),this._validation=this._createValidation(),this.refresh()},_createLoadIndicator:function(){return t(this.loadIndicator,this,{message:this.loadMessage,shading:this.loadShading,container:this._container})},_createValidation:function(){return t(this.validation,this)},_clear:function(){this.cancelEdit(),clearTimeout(this._loadingTimer),this._pagerContainer&&this._pagerContainer.empty(),this._container.empty().css({position:"",width:"",height:""})},_createHeader:function(){var a=this._headerRow=this._createHeaderRow(),c=this._filterRow=this._createFilterRow(),d=this._insertRow=this._createInsertRow(),e=this._headerGrid=b("").addClass(this.tableClass).append(a).append(c).append(d),f=this._header=b("

").addClass(this.gridHeaderClass).addClass(this._scrollBarWidth()?"jsgrid-header-scrollbar":"").append(e);return f},_createBody:function(){var a=this._content=b("

"),c=this._bodyGrid=b("

").addClass(this.tableClass).append(a),d=this._body=b("

").addClass(this.gridBodyClass).append(c).on("scroll",b.proxy(function(a){this._header.scrollLeft(a.target.scrollLeft)},this));return d},_createPagerContainer:function(){var a=this.pagerContainer||b("

").appendTo(this._container);return b(a).addClass(this.pagerContainerClass)},_eachField:function(a){var c=this;b.each(this.fields,function(b,d){d.visible&&a.call(c,d,b)})},_createHeaderRow:function(){if(b.isFunction(this.headerRowRenderer))return b(this.renderTemplate(this.headerRowRenderer,this));var a=b("

").addClass(this.headerRowClass);return this._eachField(function(c,d){var e=this._prepareCell("").addClass(this.filterRowClass);return this._eachField(function(b){this._prepareCell("").addClass(this.insertRowClass);return this._eachField(function(b){this._prepareCell("").addClass(this.noDataRowClass).append(b(""),this._renderCells(d,a)),d.addClass(this._getRowClasses(a,c)).data(g,a).on("click",b.proxy(function(b){this.rowClick({item:a,itemIndex:c,event:b})},this)).on("dblclick",b.proxy(function(b){this.rowDoubleClick({item:a,itemIndex:c,event:b})},this)),this.selecting&&this._attachRowHover(d),d},_getRowClasses:function(a,b){var c=[];return c.push((b+1)%2?this.oddRowClass:this.evenRowClass),c.push(t(this.rowClass,this,a,b)),c.join(" ")},_attachRowHover:function(a){var c=this.selectedRowClass;a.hover(function(){b(this).addClass(c)},function(){b(this).removeClass(c)})},_renderCells:function(a,b){return this._eachField(function(c){a.append(this._createCell(b,c))}),this},_createCell:function(a,c){var d,e=this._getItemFieldValue(a,c),f={value:e,item:a};return d=b.isFunction(c.cellRenderer)?this.renderTemplate(c.cellRenderer,c,f):b("").addClass(this.editRowClass);return this._eachField(function(b){var d=this._getItemFieldValue(a,b);this._prepareCell("

",c,"headercss",this.headerCellClass).append(this.renderTemplate(c.headerTemplate,c)).appendTo(a);this.sorting&&c.sorting&&e.addClass(this.sortableClass).on("click",b.proxy(function(){this.sort(d)},this))}),a},_prepareCell:function(a,c,d,e){return b(a).css("width",c.width).addClass(e\|\|this.cellClass).addClass(d&&c[d]\|\|c.css).addClass(c.align?"jsgrid-align-"+c.align:"")},_createFilterRow:function(){if(b.isFunction(this.filterRowRenderer))return b(this.renderTemplate(this.filterRowRenderer,this));var a=b("
",b,"filtercss").append(this.renderTemplate(b.filterTemplate,b)).appendTo(a)}),a},_createInsertRow:function(){if(b.isFunction(this.insertRowRenderer))return b(this.renderTemplate(this.insertRowRenderer,this));var a=b("
",b,"insertcss").append(this.renderTemplate(b.insertTemplate,b)).appendTo(a)}),a},_callEventHandler:function(a,c){return a.call(this,b.extend(c,{grid:this})),c},reset:function(){return this._resetSorting(),this._resetPager(),this._loadStrategy.reset()},_resetPager:function(){this._firstDisplayingPage=1,this._setPage(1)},_resetSorting:function(){this._sortField=null,this._sortOrder=i,this._clearSortingCss()},refresh:function(){this._callEventHandler(this.onRefreshing),this.cancelEdit(),this._refreshHeading(),this._refreshFiltering(),this._refreshInserting(),this._refreshContent(),this._refreshPager(),this._refreshSize(),this._callEventHandler(this.onRefreshed)},_refreshHeading:function(){this._headerRow.toggle(this.heading)},_refreshFiltering:function(){this._filterRow.toggle(this.filtering)},_refreshInserting:function(){this._insertRow.toggle(this.inserting)},_refreshContent:function(){var a=this._content;if(a.empty(),!this.data.length)return a.append(this._createNoDataRow()),this;for(var b=this._loadStrategy.firstDisplayIndex(),c=this._loadStrategy.lastDisplayIndex(),d=b;c>d;d++){var e=this.data[d];a.append(this._createRow(e,d))}},_createNoDataRow:function(){var a=0;return this._eachField(function(){a++}),b("
").addClass(this.cellClass).attr("colspan",a).append(this.renderTemplate(this.noDataContent,this)))},_createRow:function(a,c){var d;return b.isFunction(this.rowRenderer)?d=this.renderTemplate(this.rowRenderer,this,{item:a,itemIndex:c}):(d=b("
").append(this.renderTemplate(c.itemTemplate\|\|e,c,f)),this._prepareCell(d,c)},_getItemFieldValue:function(a,b){for(var c=b.name.split("."),d=a[c.shift()];d&&c.length;)d=d[c.shift()];return d},_setItemFieldValue:function(a,b,c){for(var d=b.name.split("."),e=a,f=d[0];e&&d.length;)a=e,f=d.shift(),e=a[f];if(!e)for(;d.length;)a=a[f]={},f=d.shift();a[f]=c},sort:function(a,c){return b.isPlainObject(a)&&(c=a.order,a=a.field),this._clearSortingCss(),this._setSortingParams(a,c),this._setSortingCss(),this._loadStrategy.sort()},_clearSortingCss:function(){this._headerRow.find("th").removeClass(this.sortAscClass).removeClass(this.sortDescClass)},_setSortingParams:function(a,b){a=this._normalizeField(a),b=b\|\|(this._sortField===a?this._reversedSortOrder(this._sortOrder):i),this._sortField=a,this._sortOrder=b},_normalizeField:function(a){return b.isNumeric(a)?this.fields[a]:"string"==typeof a?b.grep(this.fields,function(b){return b.name===a})[0]:a},_reversedSortOrder:function(a){return a===i?j:i},_setSortingCss:function(){var a=this._visibleFieldIndex(this._sortField);this._headerRow.find("th").eq(a).addClass(this._sortOrder===i?this.sortAscClass:this.sortDescClass)},_visibleFieldIndex:function(a){return b.inArray(a,b.grep(this.fields,function(a){return a.visible}))},_sortData:function(){var a=this._sortFactor(),b=this._sortField;b&&this.data.sort(function(c,d){return ab.sortingFunc(c[b.name],d[b.name])})},_sortFactor:function(){return this._sortOrder===i?1:-1},_itemsCount:function(){return this._loadStrategy.itemsCount()},_pagesCount:function(){var a=this._itemsCount(),b=this.pageSize;return Math.floor(a/b)+(a%b?1:0)},_refreshPager:function(){var a=this._pagerContainer;a.empty(),this.paging&&a.append(this._createPager());var b=this.paging&&this._pagesCount()>1;a.toggle(b)},_createPager:function(){var a;return a=b.isFunction(this.pagerRenderer)?b(this.pagerRenderer({pageIndex:this.pageIndex,pageCount:this._pagesCount()})):b(" ").append(this._createPagerByFormat()),a.addClass(this.pagerClass),a},_createPagerByFormat:function(){var a=this.pageIndex,c=this._pagesCount(),d=this._itemsCount(),e=this.pagerFormat.split(" ");return b.map(e,b.proxy(function(e){var f=e;return e===l?f=this._createPages():e===k?f=this._createPagerNavButton(this.pageFirstText,1,a>1):e===m?f=this._createPagerNavButton(this.pagePrevText,a-1,a>1):e===n?f=this._createPagerNavButton(this.pageNextText,a+1,c>a):e===o?f=this._createPagerNavButton(this.pageLastText,c,c>a):e===p?f=a:e===q?f=c:e===r&&(f=d),b.isArray(f)?f.concat([" "]):[f," "]},this))},_createPages:function(){var a=this._pagesCount(),b=this.pageButtonCount,c=this._firstDisplayingPage,d=[];c>1&&d.push(this._createPagerPageNavButton(this.pageNavigatorPrevText,this.showPrevPages));for(var e=0,f=c;b>e&&a>=f;e++,f++)d.push(f===this.pageIndex?this._createPagerCurrentPage():this._createPagerPage(f));return a>c+b-1&&d.push(this._createPagerPageNavButton(this.pageNavigatorNextText,this.showNextPages)),d},_createPagerNavButton:function(a,c,d){return this._createPagerButton(a,this.pagerNavButtonClass+(d?"":" "+this.pagerNavButtonInactiveClass),d?function(){this.openPage(c)}:b.noop)},_createPagerPageNavButton:function(a,b){return this._createPagerButton(a,this.pagerNavButtonClass,b)},_createPagerPage:function(a){return this._createPagerButton(a,this.pageClass,function(){this.openPage(a)})},_createPagerButton:function(a,c,d){var e=b("").attr("href",s).html(a).on("click",b.proxy(d,this));return b("").addClass(c).append(e)},_createPagerCurrentPage:function(){return b("").addClass(this.pageClass).addClass(this.currentPageClass).text(this.pageIndex)},_refreshSize:function(){this._refreshHeight(),this._refreshWidth()},_refreshWidth:function(){var a="auto"===this.width?this._getAutoWidth():this.width;this._container.width(a)},_getAutoWidth:function(){var a=this._headerGrid,b=this._header;a.width("auto");var c=a.outerWidth(),d=b.outerWidth()-b.innerWidth();return a.width(""),c+d},_scrollBarWidth:function(){var a;return function(){if(a===c){var d=b(" "),e=b(" ");d.append(e).appendTo("body");var f=e.innerWidth();d.css("overflow-y","auto");var g=e.innerWidth();d.remove(),a=f-g}return a}}(),_refreshHeight:function(){var a,b=this._container,c=this._pagerContainer,d=this.height;b.height(d),"auto"!==d&&(d=b.height(),a=this._header.outerHeight(!0),c.parents(b).length&&(a+=c.outerHeight(!0)),this._body.outerHeight(d-a))},showPrevPages:function(){var a=this._firstDisplayingPage,b=this.pageButtonCount;this._firstDisplayingPage=a>b?a-b:1,this._refreshPager()},showNextPages:function(){var a=this._firstDisplayingPage,b=this.pageButtonCount,c=this._pagesCount();this._firstDisplayingPage=a+2b>c?c-b+1:a+b,this._refreshPager()},openPage:function(a){1>a\|\|a>this._pagesCount()\|\|(this._setPage(a),this._loadStrategy.openPage(a))},_setPage:function(a){var b=this._firstDisplayingPage,c=this.pageButtonCount;this.pageIndex=a,b>a&&(this._firstDisplayingPage=a),a>b+c-1&&(this._firstDisplayingPage=a-c+1),this._callEventHandler(this.onPageChanged,{pageIndex:a})},_controllerCall:function(a,c,d,e){if(d)return b.Deferred().reject().promise();this._showLoading();var f=this._controller;if(!f\|\|!f[a])throw Error("controller has no method '"+a+"'");return u(f[a](c)).done(b.proxy(e,this)).fail(b.proxy(this._errorHandler,this)).always(b.proxy(this._hideLoading,this))},_errorHandler:function(){this._callEventHandler(this.onError,{args:b.makeArray(arguments)})},_showLoading:function(){this.loadIndication&&(clearTimeout(this._loadingTimer),this._loadingTimer=setTimeout(b.proxy(function(){this._loadIndicator.show()},this),this.loadIndicationDelay))},_hideLoading:function(){this.loadIndication&&(clearTimeout(this._loadingTimer),this._loadIndicator.hide())},search:function(a){return this._resetSorting(),this._resetPager(),this.loadData(a)},loadData:function(a){a=a\|\|(this.filtering?this.getFilter():{}),b.extend(a,this._loadStrategy.loadParams(),this._sortingParams());var c=this._callEventHandler(this.onDataLoading,{filter:a});return this._controllerCall("loadData",a,c.cancel,function(a){a&&(this._loadStrategy.finishLoad(a),this._callEventHandler(this.onDataLoaded,{data:a}))})},getFilter:function(){var a={};return this._eachField(function(b){b.filtering&&this._setItemFieldValue(a,b,b.filterValue())}),a},_sortingParams:function(){return this.sorting&&this._sortField?{sortField:this._sortField.name,sortOrder:this._sortOrder}:{}},getSorting:function(){var a=this._sortingParams();return{field:a.sortField,order:a.sortOrder}},clearFilter:function(){var a=this._createFilterRow();return this._filterRow.replaceWith(a),this._filterRow=a,this.search()},insertItem:function(a){var c=a\|\|this._getValidatedInsertItem();if(!c)return b.Deferred().reject().promise();var d=this._callEventHandler(this.onItemInserting,{item:c});return this._controllerCall("insertItem",c,d.cancel,function(a){a=a\|\|c,this._loadStrategy.finishInsert(a),this._callEventHandler(this.onItemInserted,{item:a})})},_getValidatedInsertItem:function(){var a=this._getInsertItem();return this._validateItem(a,this._insertRow)?a:null},_getInsertItem:function(){var a={};return this._eachField(function(b){b.inserting&&this._setItemFieldValue(a,b,b.insertValue())}),a},_validateItem:function(a,c){var d=[],e={item:a,itemIndex:this._rowIndex(c),row:c};if(this._eachField(function(f){if(f.validate&&(c!==this._insertRow\|\|f.inserting)&&(c!==this._getEditRow()\|\|f.editing)){var g=this._getItemFieldValue(a,f),h=this._validation.validate(b.extend({value:g,rules:f.validate},e));this._setCellValidity(c.children().eq(this._visibleFieldIndex(f)),h),h.length&&d.push.apply(d,b.map(h,function(a){return{field:f,message:a}}))}}),!d.length)return!0;var f=b.extend({errors:d},e);return this._callEventHandler(this.onItemInvalid,f),this.invalidNotify(f),!1},_setCellValidity:function(a,b){a.toggleClass(this.invalidClass,!!b.length).attr("title",b.join("\n"))},clearInsert:function(){var a=this._createInsertRow();this._insertRow.replaceWith(a),this._insertRow=a,this.refresh()},editItem:function(a){var b=this.rowByItem(a);b.length&&this._editRow(b)},rowByItem:function(a){return a.jquery\|\|a.nodeType?b(a):this._content.find("tr").filter(function(){return b.data(this,g)===a})},_editRow:function(a){if(this.editing){var b=a.data(g),c=this._callEventHandler(this.onItemEditing,{row:a,item:b,itemIndex:this._itemIndex(b)});if(!c.cancel){this._editingRow&&this.cancelEdit();var d=this._createEditRow(b);this._editingRow=a,a.hide(),d.insertBefore(a),a.data(h,d)}}},_createEditRow:function(a){if(b.isFunction(this.editRowRenderer))return b(this.renderTemplate(this.editRowRenderer,this,{item:a,itemIndex:this._itemIndex(a)}));var c=b("
",b,"editcss").append(this.renderTemplate(b.editTemplate\|\|"",b,{value:d,item:a})).appendTo(c)}),c},updateItem:function(a,b){1===arguments.length&&(b=a);var c=a?this.rowByItem(a):this._editingRow;return(b=b\|\|this._getValidatedEditedItem())?this._updateRow(c,b):void 0},_getValidatedEditedItem:function(){var a=this._getEditedItem();return this._validateItem(a,this._getEditRow())?a:null},_updateRow:function(a,c){var d=a.data(g),e=this._itemIndex(d),f=b.extend(!0,{},d,c),h=this._callEventHandler(this.onItemUpdating,{row:a,item:f,itemIndex:e,previousItem:d});return this._controllerCall("updateItem",f,h.cancel,function(g){var h=b.extend(!0,{},d);f=g\|\|b.extend(!0,d,c);var i=this._finishUpdate(a,f,e);this._callEventHandler(this.onItemUpdated,{row:i,item:f,itemIndex:e,previousItem:h})})},_rowIndex:function(a){return this._content.children().index(b(a))},_itemIndex:function(a){return b.inArray(a,this.data)},_finishUpdate:function(a,b,c){this.cancelEdit(),this.data[c]=b;var d=this._createRow(b,c);return a.replaceWith(d),d},_getEditedItem:function(){var a={};return this._eachField(function(b){b.editing&&this._setItemFieldValue(a,b,b.editValue())}),a},cancelEdit:function(){this._editingRow&&(this._getEditRow().remove(),this._editingRow.show(),this._editingRow=null)},_getEditRow:function(){return this._editingRow&&this._editingRow.data(h)},deleteItem:function(b){var c=this.rowByItem(b);if(c.length&&(!this.confirmDeleting\|\|a.confirm(t(this.deleteConfirm,this,c.data(g)))))return this._deleteRow(c)},_deleteRow:function(a){var b=a.data(g),c=this._itemIndex(b),d=this._callEventHandler(this.onItemDeleting,{row:a,item:b,itemIndex:c});return this._controllerCall("deleteItem",b,d.cancel,function(){this._loadStrategy.finishDelete(b,c),this._callEventHandler(this.onItemDeleted,{row:a,item:b,itemIndex:c})})}},b.fn.jsGrid=function(a){var e=b.makeArray(arguments),g=e.slice(1),h=this;return this.each(function(){var e,i=b(this),j=i.data(f);if(j)if("string"==typeof a){if(e=j[a].apply(j,g),e!==c&&e!==j)return h=e,!1}else j._detachWindowResizeCallback(),j._init(a),j.render();else new d(i,a)}),h};var w={},x=function(a){var c;b.isPlainObject(a)?c=d.prototype:(c=w[a].prototype,a=arguments[1]\|\|{}),b.extend(c,a)},y={},z=function(a){var c=b.isPlainObject(a)?a:y[a];if(!c)throw Error("unknown locale "+a);A(jsGrid,c)},A=function(a,c){b.each(c,function(c,d){return b.isPlainObject(d)?void A(a[c]\|\|a[c[0].toUpperCase()+c.slice(1)],d):void(a.hasOwnProperty(c)?a[c]=d:a.prototype[c]=d)})};a.jsGrid={Grid:d,fields:w,setDefaults:x,locales:y,locale:z,version:"1.5.3"}}(window,jQuery),function(a,b){function c(a){this._init(a)}c.prototype={container:"body",message:"Loading...",shading:!0,zIndex:1e3,shaderClass:"jsgrid-load-shader",loadPanelClass:"jsgrid-load-panel",_init:function(a){b.extend(!0,this,a),this._initContainer(),this._initShader(),this._initLoadPanel()},_initContainer:function(){this._container=b(this.container)},_initShader:function(){this.shading&&(this._shader=b(" ").addClass(this.shaderClass).hide().css({position:"absolute",top:0,right:0,bottom:0,left:0,zIndex:this.zIndex}).appendTo(this._container))},_initLoadPanel:function(){this._loadPanel=b(" ").addClass(this.loadPanelClass).text(this.message).hide().css({position:"absolute",top:"50%",left:"50%",zIndex:this.zIndex}).appendTo(this._container)},show:function(){var a=this._loadPanel.show(),b=a.outerWidth(),c=a.outerHeight();a.css({marginTop:-c/2,marginLeft:-b/2}),this._shader.show()},hide:function(){this._loadPanel.hide(),this._shader.hide()}},a.LoadIndicator=c}(jsGrid,jQuery),function(a,b){function c(a){this._grid=a}function d(a){this._grid=a,this._itemsCount=0}c.prototype={firstDisplayIndex:function(){var a=this._grid;return a.option("paging")?(a.option("pageIndex")-1)a.option("pageSize"):0},lastDisplayIndex:function(){var a=this._grid,b=a.option("data").length;return a.option("paging")?Math.min(a.option("pageIndex")a.option("pageSize"),b):b},itemsCount:function(){return this._grid.option("data").length},openPage:function(){this._grid.refresh()},loadParams:function(){return{}},sort:function(){return this._grid._sortData(),this._grid.refresh(),b.Deferred().resolve().promise()},reset:function(){return this._grid.refresh(),b.Deferred().resolve().promise()},finishLoad:function(a){this._grid.option("data",a)},finishInsert:function(a){var b=this._grid;b.option("data").push(a),b.refresh()},finishDelete:function(a,b){var c=this._grid;c.option("data").splice(b,1),c.reset()}},d.prototype={firstDisplayIndex:function(){return 0},lastDisplayIndex:function(){return this._grid.option("data").length},itemsCount:function(){return this._itemsCount},openPage:function(){this._grid.loadData()},loadParams:function(){var a=this._grid;return{pageIndex:a.option("pageIndex"),pageSize:a.option("pageSize")}},reset:function(){return this._grid.loadData()},sort:function(){return this._grid.loadData()},finishLoad:function(a){this._itemsCount=a.itemsCount,this._grid.option("data",a.data)},finishInsert:function(){this._grid.search()},finishDelete:function(){this._grid.search()}},a.loadStrategies={DirectLoadingStrategy:c,PageLoadingStrategy:d}}(jsGrid,jQuery),function(a){var b=function(a){return"undefined"!=typeof a&&null!==a},c={string:function(a,c){return b(a)\|\|b(c)?b(a)?b(c)?(""+a).localeCompare(""+c):1:-1:0},number:function(a,b){return a-b},date:function(a,b){return a-b},numberAsString:function(a,b){return parseFloat(a)-parseFloat(b)}};a.sortStrategies=c}(jsGrid,jQuery),function(a,b,c){function d(a){this._init(a)}d.prototype={_init:function(a){b.extend(!0,this,a)},validate:function(a){var c=[];return b.each(this._normalizeRules(a.rules),function(d,e){if(!e.validator(a.value,a.item,e.param)){var f=b.isFunction(e.message)?e.message(a.value,a.item):e.message;c.push(f)}}),c},_normalizeRules:function(a){return b.isArray(a)\|\|(a=[a]),b.map(a,b.proxy(function(a){return this._normalizeRule(a)},this))},_normalizeRule:function(a){if("string"==typeof a&&(a={validator:a}),b.isFunction(a)&&(a={validator:a}),!b.isPlainObject(a))throw Error("wrong validation config specified");return a=b.extend({},a),b.isFunction(a.validator)?a:this._applyNamedValidator(a,a.validator)},_applyNamedValidator:function(a,c){delete a.validator;var d=e[c];if(!d)throw Error('unknown validator "'+c+'"');return b.isFunction(d)&&(d={validator:d}),b.extend({},d,a)}},a.Validation=d;var e={required:{message:"Field is required",validator:function(a){return a!==c&&null!==a&&""!==a}},rangeLength:{message:"Field value length is out of the defined range",validator:function(a,b,c){return a.length>=c[0]&&a.length<=c[1]}},minLength:{message:"Field value is too short",validator:function(a,b,c){return a.length>=c}},maxLength:{message:"Field value is too long",validator:function(a,b,c){return a.length<=c}},pattern:{message:"Field value is not matching the defined pattern",validator:function(a,b,c){return"string"==typeof c&&(c=new RegExp("^(?:"+c+")$")),c.test(a)}},range:{message:"Field value is out of the defined range",validator:function(a,b,c){return a>=c[0]&&a<=c[1]}},min:{message:"Field value is too small",validator:function(a,b,c){return a>=c}},max:{message:"Field value is too large",validator:function(a,b,c){return c>=a}}};a.validators=e}(jsGrid,jQuery),function(a,b,c){function d(a){b.extend(!0,this,a),this.sortingFunc=this._getSortingFunc()}d.prototype={name:"",title:null,css:"",align:"",width:100,visible:!0,filtering:!0,inserting:!0,editing:!0,sorting:!0,sorter:"string",headerTemplate:function(){return this.title===c\|\|null===this.title?this.name:this.title},itemTemplate:function(a){return a},filterTemplate:function(){return""},insertTemplate:function(){return""},editTemplate:function(a,b){return this._value=a,this.itemTemplate(a,b)},filterValue:function(){return""},insertValue:function(){return""},editValue:function(){return this._value},_getSortingFunc:function(){var c=this.sorter;if(b.isFunction(c))return c;if("string"==typeof c)return a.sortStrategies[c];throw Error('wrong sorter for the field "'+this.name+'"!')}},a.Field=d}(jsGrid,jQuery),function(a,b){function c(a){d.call(this,a)}var d=a.Field;c.prototype=new d({autosearch:!0,readOnly:!1,filterTemplate:function(){if(!this.filtering)return"";var a=this._grid,b=this.filterControl=this._createTextBox();return this.autosearch&&b.on("keypress",function(b){13===b.which&&(a.search(),b.preventDefault())}),b},insertTemplate:function(){return this.inserting?this.insertControl=this._createTextBox():""},editTemplate:function(a){if(!this.editing)return this.itemTemplate.apply(this,arguments);var b=this.editControl=this._createTextBox();return b.val(a),b},filterValue:function(){return this.filterControl.val()},insertValue:function(){return this.insertControl.val()},editValue:function(){return this.editControl.val()},_createTextBox:function(){return b("").attr("type","text").prop("readonly",!!this.readOnly)}}),a.fields.text=a.TextField=c}(jsGrid,jQuery),function(a,b,c){function d(a){e.call(this,a)}var e=a.TextField;d.prototype=new e({sorter:"number",align:"right",readOnly:!1,filterValue:function(){return this.filterControl.val()?parseInt(this.filterControl.val()\|\|0,10):c},insertValue:function(){return this.insertControl.val()?parseInt(this.insertControl.val()\|\|0,10):c},editValue:function(){return this.editControl.val()?parseInt(this.editControl.val()\|\|0,10):c},_createTextBox:function(){return b("").attr("type","number").prop("readonly",!!this.readOnly)}}),a.fields.number=a.NumberField=d}(jsGrid,jQuery),function(a,b){function c(a){d.call(this,a)}var d=a.TextField;c.prototype=new d({insertTemplate:function(){return this.inserting?this.insertControl=this._createTextArea():""},editTemplate:function(a){if(!this.editing)return this.itemTemplate.apply(this,arguments);var b=this.editControl=this._createTextArea();return b.val(a),b},_createTextArea:function(){return b("").prop("readonly",!!this.readOnly)}}),a.fields.textarea=a.TextAreaField=c}(jsGrid,jQuery),function(a,b,c){function d(a){if(this.items=[],this.selectedIndex=-1,this.valueField="",this.textField="",a.valueField&&a.items.length){var b=a.items[0][a.valueField];this.valueType=typeof b===f?f:g}this.sorter=this.valueType,e.call(this,a)}var e=a.NumberField,f="number",g="string";d.prototype=new e({align:"center",valueType:f,itemTemplate:function(a){var d,e=this.items,f=this.valueField,g=this.textField;d=f?b.grep(e,function(b){return b[f]===a})[0]\|\|{}:e[a];var h=g?d[g]:d;return h===c\|\|null===h?"":h},filterTemplate:function(){if(!this.filtering)return"";var a=this._grid,b=this.filterControl=this._createSelect();return this.autosearch&&b.on("change",function(){a.search()}),b},insertTemplate:function(){return this.inserting?this.insertControl=this._createSelect():""},editTemplate:function(a){if(!this.editing)return this.itemTemplate.apply(this,arguments);var b=this.editControl=this._createSelect();return a!==c&&b.val(a),b},filterValue:function(){var a=this.filterControl.val();return this.valueType===f?parseInt(a\|\|0,10):a},insertValue:function(){var a=this.insertControl.val();return this.valueType===f?parseInt(a\|\|0,10):a},editValue:function(){var a=this.editControl.val();return this.valueType===f?parseInt(a\|\|0,10):a},_createSelect:function(){var a=b("<select>"),c=this.valueField,d=this.textField,e=this.selectedIndex;return b.each(this.items,function(f,g){var h=c?g[c]:f,i=d?g[d]:g,j=b("<option>").attr("value",h).text(i).appendTo(a);j.prop("selected",e===f)}),a.prop("disabled",!!this.readOnly),a}}),a.fields.select=a.SelectField=d}(jsGrid,jQuery),function(a,b,c){function d(a){e.call(this,a)}var e=a.Field;d.prototype=new e({sorter:"number",align:"center",autosearch:!0,itemTemplate:function(a){return this._createCheckbox().prop({checked:a,disabled:!0})},filterTemplate:function(){if(!this.filtering)return"";var a=this._grid,c=this.filterControl=this._createCheckbox();return c.prop({readOnly:!0,indeterminate:!0}),c.on("click",function(){var a=b(this); +a.prop("readOnly")?a.prop({checked:!1,readOnly:!1}):a.prop("checked")\|\|a.prop({readOnly:!0,indeterminate:!0})}),this.autosearch&&c.on("click",function(){a.search()}),c},insertTemplate:function(){return this.inserting?this.insertControl=this._createCheckbox():""},editTemplate:function(a){if(!this.editing)return this.itemTemplate.apply(this,arguments);var b=this.editControl=this._createCheckbox();return b.prop("checked",a),b},filterValue:function(){return this.filterControl.get(0).indeterminate?c:this.filterControl.is(":checked")},insertValue:function(){return this.insertControl.is(":checked")},editValue:function(){return this.editControl.is(":checked")},_createCheckbox:function(){return b("<input>").attr("type","checkbox")}}),a.fields.checkbox=a.CheckboxField=d}(jsGrid,jQuery),function(a,b){function c(a){d.call(this,a),this._configInitialized=!1}var d=a.Field;c.prototype=new d({css:"jsgrid-control-field",align:"center",width:50,filtering:!1,inserting:!1,editing:!1,sorting:!1,buttonClass:"jsgrid-button",modeButtonClass:"jsgrid-mode-button",modeOnButtonClass:"jsgrid-mode-on-button",searchModeButtonClass:"jsgrid-search-mode-button",insertModeButtonClass:"jsgrid-insert-mode-button",editButtonClass:"jsgrid-edit-button",deleteButtonClass:"jsgrid-delete-button",searchButtonClass:"jsgrid-search-button",clearFilterButtonClass:"jsgrid-clear-filter-button",insertButtonClass:"jsgrid-insert-button",updateButtonClass:"jsgrid-update-button",cancelEditButtonClass:"jsgrid-cancel-edit-button",searchModeButtonTooltip:"Switch to searching",insertModeButtonTooltip:"Switch to inserting",editButtonTooltip:"Edit",deleteButtonTooltip:"Delete",searchButtonTooltip:"Search",clearFilterButtonTooltip:"Clear filter",insertButtonTooltip:"Insert",updateButtonTooltip:"Update",cancelEditButtonTooltip:"Cancel edit",editButton:!0,deleteButton:!0,clearFilterButton:!0,modeSwitchButton:!0,_initConfig:function(){this._hasFiltering=this._grid.filtering,this._hasInserting=this._grid.inserting,this._hasInserting&&this.modeSwitchButton&&(this._grid.inserting=!1),this._configInitialized=!0},headerTemplate:function(){this._configInitialized\|\|this._initConfig();var a=this._hasFiltering,b=this._hasInserting;return this.modeSwitchButton&&(a\|\|b)?a&&!b?this._createFilterSwitchButton():b&&!a?this._createInsertSwitchButton():this._createModeSwitchButton():""},itemTemplate:function(a,c){var d=b([]);return this.editButton&&(d=d.add(this._createEditButton(c))),this.deleteButton&&(d=d.add(this._createDeleteButton(c))),d},filterTemplate:function(){var a=this._createSearchButton();return this.clearFilterButton?a.add(this._createClearFilterButton()):a},insertTemplate:function(){return this._createInsertButton()},editTemplate:function(){return this._createUpdateButton().add(this._createCancelEditButton())},_createFilterSwitchButton:function(){return this._createOnOffSwitchButton("filtering",this.searchModeButtonClass,!0)},_createInsertSwitchButton:function(){return this._createOnOffSwitchButton("inserting",this.insertModeButtonClass,!1)},_createOnOffSwitchButton:function(a,c,d){var e=d,f=b.proxy(function(){g.toggleClass(this.modeOnButtonClass,e)},this),g=this._createGridButton(this.modeButtonClass+" "+c,"",function(b){e=!e,b.option(a,e),f()});return f(),g},_createModeSwitchButton:function(){var a=!1,c=b.proxy(function(){d.attr("title",a?this.searchModeButtonTooltip:this.insertModeButtonTooltip).toggleClass(this.insertModeButtonClass,!a).toggleClass(this.searchModeButtonClass,a)},this),d=this._createGridButton(this.modeButtonClass,"",function(b){a=!a,b.option("inserting",a),b.option("filtering",!a),c()});return c(),d},_createEditButton:function(a){return this._createGridButton(this.editButtonClass,this.editButtonTooltip,function(b,c){b.editItem(a),c.stopPropagation()})},_createDeleteButton:function(a){return this._createGridButton(this.deleteButtonClass,this.deleteButtonTooltip,function(b,c){b.deleteItem(a),c.stopPropagation()})},_createSearchButton:function(){return this._createGridButton(this.searchButtonClass,this.searchButtonTooltip,function(a){a.search()})},_createClearFilterButton:function(){return this._createGridButton(this.clearFilterButtonClass,this.clearFilterButtonTooltip,function(a){a.clearFilter()})},_createInsertButton:function(){return this._createGridButton(this.insertButtonClass,this.insertButtonTooltip,function(a){a.insertItem().done(function(){a.clearInsert()})})},_createUpdateButton:function(){return this._createGridButton(this.updateButtonClass,this.updateButtonTooltip,function(a,b){a.updateItem(),b.stopPropagation()})},_createCancelEditButton:function(){return this._createGridButton(this.cancelEditButtonClass,this.cancelEditButtonTooltip,function(a,b){a.cancelEdit(),b.stopPropagation()})},_createGridButton:function(a,c,d){var e=this._grid;return b("<input>").addClass(this.buttonClass).addClass(a).attr({type:"button",title:c}).on("click",function(a){d(e,a)})},editValue:function(){return""}}),a.fields.control=a.ControlField=c}(jsGrid,jQuery); \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java =================================================================== diff -u -r23492 -r23559 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java (.../DeviceInterface.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/deviceinterface/DeviceInterface.java (.../DeviceInterface.java) (revision 23559) @@ -44,6 +44,12 @@ / public static final String JIANGHAN = "JiangHan"; + /* + * 长龙（长龙清洗机是史帝瑞的，但是设备接口文件跟以前的不一样）<br> + * 20180606增加 + / + public static final String CHANGLONG = "ChangLong"; + private Long id; /* Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java =================================================================== diff -u -r22860 -r23559 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 22860) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 23559) @@ -13,6 +13,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData; +import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashDataOfChangLong; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecordMaterial; import com.forgon.tools.hibernate.BasePoManager; @@ -211,4 +212,18 @@ / public JSONArray loadContentByBasketBarcode(String basketBarcode, int pageSize, int pageNow); + + /* + * 根据清洗记录的id，获得清洗机的型号（品牌） + * @param washAndDisinfectRecordId + * @return + / + public String getRinserType(String washAndDisinfectRecordId); + + /* + * 根据清洗记录的id,获得关联的长龙清洗数据 + * @param valueOf + * @return + */ + public JSONObject getWashDataOfChangLongById(Long washRecordId); }