Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r16397 -r16413 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 16397) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 16413) @@ -120,6 +120,8 @@ import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.action.WashAndDisinfectRecordAction; import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager; import com.forgon.keyvalue.service.KeyValueManager; +import com.forgon.log.model.Log; +import com.forgon.log.service.LogManager; import com.forgon.security.bean.ModelNameBean; import com.forgon.security.bean.OperationBean; import com.forgon.security.bean.OperationDefineBean; @@ -207,10 +209,16 @@ private WashTransitionRecordManager washTransitionRecordManager; private WashTransitionItemManager washTransitionItemManager; private WashTransitionMaterialManager washTransitionMaterialManager; + private LogManager appLogManager; + public void setPackingManager(PackingManager packingManager) { this.packingManager = packingManager; } + public void setAppLogManager(LogManager appLogManager) { + this.appLogManager = appLogManager; + } + public void setRecyclingApplicationManager( RecyclingApplicationManager recyclingApplicationManager) { this.recyclingApplicationManager = recyclingApplicationManager; @@ -2388,11 +2396,16 @@ if (StringUtils.isBlank(taskGroup)) { return JSONUtil.buildErrorMsgJsonResult("缺失参数taskGroup"); } + String barcodeType = null; + String barcodeName = null; BarcodeDevice barcodeDevice = barcodeManager .getBarcodeByBarcode(barcode); if (barcodeDevice != null) { + barcodeType = barcodeDevice.getType(); if (barcodeDevice instanceof Container) { Container container = (Container) barcodeDevice; + barcodeName = container.getContainerName(); + barcodeType = container.getPurpose(); if (!Container.CONTAINERTYPE_BASKET.equals(container .getContainerType())) { return JSONUtil.buildErrorMsgJsonResult("此容器非篮筐"); @@ -2412,10 +2425,12 @@ result.addProperty("barcode", barcode); result.addProperty("type", "container"); result.add("data", data); + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_REVIEW, barcodeType, barcode, barcodeName); return result.toString(); } else if (barcodeDevice instanceof TousseInstance) { TousseInstance tousseInstance = (TousseInstance) barcodeDevice; + barcodeName = tousseInstance.getTousseName(); TousseDefinition tousseDefinition = tousseInstance .getTousseDefinition(); Collection resultTousseInstanceList; @@ -2477,15 +2492,18 @@ JSONArray datasJSONArray = JSONArray.fromObject( resultTousseInstanceList, buildJsonConfigForTousseInstance()); + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_REVIEW, barcodeType, barcode, barcodeName); return new JSONStringer().object().key("success").value(true) .key("barcode").value(barcode).key("type") .value("tousseInstanceList").key("data") .value(datasJSONArray).endObject().toString(); } else { + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_REVIEW, barcodeType, barcode, barcodeName); // 非法物品 return JSONUtil.buildErrorMsgJsonResult("请扫描灭菌篮筐或器械包条码"); } } else { + appLogManager.saveBarcodeScanLog(AcegiHelper.getLoginUser(), Log.MODEL_REVIEW, LogManager.BARCODE_TYPE_INVALID, barcode, barcodeName); return JSONUtil.buildErrorMsgJsonResult("没有找到该条码对应的物品,请检查条码是否正确"); } }