Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java =================================================================== diff -u -r17573 -r19792 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java (.../SterisDataManagerImpl.java) (revision 17573) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/SterisDataManagerImpl.java (.../SterisDataManagerImpl.java) (revision 19792) @@ -16,10 +16,8 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; -import org.directwebremoting.proxy.dwr.Util; import org.hibernate.Query; import org.hibernate.Session; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.action.SupplyRoomConfigAction; @@ -493,7 +491,7 @@ Query query = session.createQuery(queryString); query.setParameter("deviceInterfaceId", Long.valueOf(devInterfaceId)); query.setParameter("machineNo", machineNo); - List rinsers = (List)query.list(); + List rinsers = query.list(); for(Rinser rs : rinsers) { @@ -508,7 +506,7 @@ { int amounts = washAndDisinfectRecordManager.getWashAndDisinfectRecordsCount(devInterfaceId,machineNo,cycleCounter); wd.setWashDataAmount(Long.valueOf(amounts)); - washAndDisinfectRecordManager.saveOrUpdate(wd); + washAndDisinfectRecordManager.save(wd); } } } Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r19651 -r19792 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 19651) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 19792) @@ -66,11 +66,9 @@ import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.systemsetting.service.HttpOptionManager; -import com.forgon.tools.StrutsParamUtils; -import com.forgon.tools.StrutsResponseUtils; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.db.InitDbConnection; -import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.hibernate.BasePoManagerImpl; import com.forgon.tools.json.JSONUtil; import com.forgon.tools.util.SqlUtils; import com.google.gson.JsonObject; @@ -79,11 +77,9 @@ * @author WangYi */ -public class WashAndDisinfectRecordManagerImpl implements +public class WashAndDisinfectRecordManagerImpl extends BasePoManagerImpl implements WashAndDisinfectRecordManager { - private ObjectDao objectDao; - private BeCleanItemManager beCleanItemManager; private ClassifyBasketManager classifyBasketManager; @@ -175,10 +171,6 @@ this.dateQueryAdapter = dateQueryAdapter; } - public void setObjectDao(ObjectDao objectDao) { - this.objectDao = objectDao; - } - public void setBeCleanItemManager(BeCleanItemManager beCleanItemManager) { this.beCleanItemManager = beCleanItemManager; } @@ -191,11 +183,6 @@ this.serialNumManager = serialNumManager; } - @Override - public void saveOrUpdate(WashAndDisinfectRecord washAndDisinfectRecord) { - objectDao.saveOrUpdate(washAndDisinfectRecord); - } - public void setBarcodeManager(BarcodeManager barcodeManager) { this.barcodeManager = barcodeManager; } @@ -516,6 +503,7 @@ // TODO 以后可能可以改为根据classifyBasket_id去更新装配任务 } + @Override public void saveOrUpdateWashAndDisinfectRecord(WashAndDisinfectRecord washRecord,Map paramMap){ Long recordId = washRecord.getId(); String orgWashStartTime = paramMap.get("orgWashStartTime"); @@ -844,7 +832,7 @@ String logMsg = "serialNumber : " + washRecord.getSerialNumber(); washRecord.setWashAndDisinfectMaterials(null); washRecord.setClassifyBaskets(null); - saveOrUpdate(washRecord); + save(washRecord); objectDao.delete(washRecord); appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_WASH, "D", "id:" + recordId + ",data:" @@ -1521,6 +1509,7 @@ return false; } + @Override public void interfereWashAndDisinfectRecord(WashAndDisinfectRecord washAndDisinfectRecord,Map paramMap) { //校验添加或删除篮筐是否有装配的包实例，如果有，则不能干预 String classifyBasketInfo =paramMap.get("classifyBasketInfo"); Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java =================================================================== diff -u -r18783 -r19792 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 18783) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/BelimedDataManagerImpl.java (.../BelimedDataManagerImpl.java) (revision 19792) @@ -7,24 +7,21 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; +import java.text.DateFormat; import java.util.Date; import java.util.List; -import java.text.DateFormat; -import java.text.SimpleDateFormat; +import jcifs.smb.NtlmPasswordAuthentication; +import jcifs.smb.SmbFile; +import jcifs.smb.SmbFileInputStream; import net.sf.json.JSONArray; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.hibernate.Query; import org.hibernate.Session; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import jcifs.smb.NtlmPasswordAuthentication; -import jcifs.smb.SmbFile; -import jcifs.smb.SmbFileInputStream; - import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.action.SupplyRoomConfigAction; import com.forgon.disinfectsystem.entity.basedatamanager.deviceinterface.DeviceInterface; @@ -530,7 +527,7 @@ Query query = session.createQuery(queryString); query.setParameter("deviceInterfaceId", Long.valueOf(devInterfaceId)); query.setParameter("machineNo", machineNo); - List rinsers = (List)query.list(); + List rinsers = query.list(); for(Rinser rs : rinsers) { @@ -545,7 +542,7 @@ { int amounts = washAndDisinfectRecordManager.getWashAndDisinfectRecordsCount(devInterfaceId,machineNo,cycleCounter); wd.setWashDataAmount(Long.valueOf(amounts)); - washAndDisinfectRecordManager.saveOrUpdate(wd); + washAndDisinfectRecordManager.save(wd); } } } Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java =================================================================== diff -u -r19486 -r19792 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java (.../WebServiceManagerImpl.java) (revision 19486) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/security/service/WebServiceManagerImpl.java (.../WebServiceManagerImpl.java) (revision 19792) @@ -33,7 +33,6 @@ import net.sf.json.util.PropertyFilter; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.FastDateFormat; import org.apache.cxf.transport.http.AbstractHTTPDestination; import org.apache.log4j.Logger; import org.springframework.security.authentication.encoding.Md5PasswordEncoder; @@ -410,7 +409,7 @@ "orgUnitCode"); sql += " and po.orgUnitCoding ='" + orgUnitCode + "'"; } - List list = (List) objectDao + List list = objectDao .findBySql(SterilizationRecord.class.getSimpleName(), sql, index, pageSize, "startDate desc"); @@ -492,7 +491,7 @@ String tomorrowSql = dateQueryAdapter.dateConverAdapter2(tomorrowStr, "yyyy-MM-dd"); String sql = " where po.startDate between " + todaySql + " and " + tomorrowSql + " order by po.id desc"; - List list = (List) objectDao.findBySql(WashAndDisinfectRecord.class.getSimpleName(), sql); + List list = objectDao.findBySql(WashAndDisinfectRecord.class.getSimpleName(), sql); PropertyFilter propertyFilter = new JsonPropertyFilter() { @Override @@ -799,6 +798,7 @@ /** * 加载发货扫描的物品 */ + @Override public String loadGoodsByBarcode(String barcode,String orgUnitCoding) { JsonObject params = new JsonObject(); params.addProperty("barcode", barcode); @@ -830,6 +830,7 @@ } } + @Override public String getTousseOrDiposableGoods(String barcode) { BarcodeDevice barcodeDevice = barcodeManager .getBarcodeByBarcode(barcode); @@ -1167,6 +1168,7 @@ } return new Message(false, "更新失败"); } + @Override public Message endSterilizationRecord2(@WebParam(name = "jsonParams") String jsonParams){ try { JSONObject jsonObj = JSONObject.fromObject(jsonParams); @@ -1587,6 +1589,7 @@ return new Message(true, "保存成功"); } + @Override public Message reviewUseRecordAndCreateApplication(@WebParam(name = "jsonParams") String jsonParams){ JSONObject jsonObj = JSONObject.fromObject(jsonParams); String id = JSONUtil.optString(jsonObj, "id", ""); @@ -1792,7 +1795,7 @@ record.setOperator(logUserName); record.setDisinfectProgram(cleanMethod); record.setDisinfectIdentification(rinser); - washAndDisinfectRecordManager.saveOrUpdate(record); + washAndDisinfectRecordManager.save(record); msg.setSuccess(true); } } Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java =================================================================== diff -u -r19790 -r19792 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 19790) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManager.java (.../WashAndDisinfectRecordManager.java) (revision 19792) @@ -13,14 +13,13 @@ import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washData.WashData; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecordMaterial; +import com.forgon.tools.hibernate.BasePoManager; /** * @author WangYi */ -public interface WashAndDisinfectRecordManager { +public interface WashAndDisinfectRecordManager extends BasePoManager { - public void saveOrUpdate(WashAndDisinfectRecord washAndDisinfectRecord); - @Deprecated public void saveOrUpdateWashAndDisinfectRecordAndMaterials(WashAndDisinfectRecord washRecord, Set classifyBasketIds, List materials);