Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java =================================================================== diff -u -r19781 -r21283 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java (.../ContainerAction.java) (revision 19781) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/action/ContainerAction.java (.../ContainerAction.java) (revision 21283) @@ -23,6 +23,8 @@ import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager; import com.forgon.disinfectsystem.entity.basedatamanager.container.Container; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.tools.StrutsParamUtils; @@ -50,6 +52,8 @@ private ObjectDao objectDao; + private LogManager appLogManager; + public void setObjectDao(ObjectDao objectDao) { this.objectDao = objectDao; } @@ -62,6 +66,10 @@ this.containerManager = containerManager; } + public void setAppLogManager(LogManager appLogManager) { + this.appLogManager = appLogManager; + } + public void resetContainerStatus(){ String ids = StrutsParamUtils.getPraramValue("id", null); if(StringUtils.isNotBlank(ids)){ @@ -71,8 +79,11 @@ if(StringUtils.isNotBlank(id)){ Container container = containerManager.getContainerById(id); if(container != null){ + String orginalStatus = container.getStatus(); container.setStatus(Container.CONTAINER_STATUS_FREE); containerManager.saveOrUpdate(container); + appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_BASEDATA, Log.TYPE_UPDATE, + "篮筐名为【"+ container.getContainerName() +"】的状态由【"+ orginalStatus +"】修改为【" + Container.CONTAINER_STATUS_FREE + "】"); }else{ result = "重置失败!"; }