启用禁用库位增加操作日志

src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java

@@ -399,7 +399,7 @@ public class DeviceController {
         pos.setEnabled(false);
         pos.setEnabled(false);
         storagePosManager.save(pos);
         storagePosManager.save(pos);
         log.info("屏蔽库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]barcode[" + barcode + "]");
         log.info("屏蔽库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]barcode[" + barcode + "]");
-
+        DeviceMessageUtil.addEnabledPosMessage(pos,"");
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
 
 
@@ -435,7 +435,7 @@ public class DeviceController {
         }
         }
         //料仓已存在，判断料仓是否有库位
         //料仓已存在，判断料仓是否有库位
         List<StoragePos> storagePosList = storagePosManager.findByStorage(storage.getId());
         List<StoragePos> storagePosList = storagePosManager.findByStorage(storage.getId());
-        if (storagePosList.size() >= 0) {
+        if (storagePosList.size() > 0) {
             return ResultBean.newErrorResult(1, "smfcore.alreadyHasPos", "料仓[{0}]已有库位数：[{1}]", new String[]{cid, storagePosList.size() + ""});
             return ResultBean.newErrorResult(1, "smfcore.alreadyHasPos", "料仓[{0}]已有库位数：[{1}]", new String[]{cid, storagePosList.size() + ""});
         }
         }
 
 

src/main/java/com/neotel/smfcore/core/message/rest/bean/dto/MessageDto.java

@@ -43,4 +43,7 @@ public class MessageDto implements Serializable {
 
 
     @ApiModelProperty(value = "结束时间")
     @ApiModelProperty(value = "结束时间")
     private Date finishTime;
     private Date finishTime;
+ 
+    @ApiModelProperty(value = "操作人")
+    private String operator;
 }
 }

src/main/java/com/neotel/smfcore/core/message/service/po/Message.java

@@ -24,7 +24,7 @@ public class Message extends BasePo implements Serializable {
 
 
 
 
     public static Message  newMsg(MessageType type,String deviceName,String deviceId,String module,String msgCode,String msg,String[] msgParams){
     public static Message  newMsg(MessageType type,String deviceName,String deviceId,String module,String msgCode,String msg,String[] msgParams){
-        Message message=new Message(deviceName,deviceId,module, type.name(),msgCode,msg,msgParams,null,null);
+        Message message=new Message(deviceName,deviceId,module, type.name(),msgCode,msg,msgParams,null,null,"");
         return message;
         return message;
     }
     }
     /**
     /**
@@ -66,6 +66,12 @@ public class Message extends BasePo implements Serializable {
      */
      */
     private Date finishTime;
     private Date finishTime;
 
 
+    /**
+     * 操作人
+     */
+    private String operator;
+
+
     public void addData(String key,String value){
     public void addData(String key,String value){
         if(dataList==null){
         if(dataList==null){
             dataList=new ArrayList<>();
             dataList=new ArrayList<>();

src/main/java/com/neotel/smfcore/core/message/util/DeviceMessageUtil.java

@@ -7,6 +7,7 @@ import com.neotel.smfcore.core.message.enums.MessageType;
 import com.neotel.smfcore.core.message.service.manager.IMessageManager;
 import com.neotel.smfcore.core.message.service.manager.IMessageManager;
 import com.neotel.smfcore.core.message.service.po.Message;
 import com.neotel.smfcore.core.message.service.po.Message;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.Storage;
+import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
@@ -83,4 +84,24 @@ public class DeviceMessageUtil {
         }
         }
 
 
     }
     }
+
+    public static void addEnabledPosMessage(StoragePos pos, String operator){
+        Storage storage = dataCache.getStorageById(pos.getStorageId());
+        if (storage != null) {
+            String posName = pos.getPosName();
+            Message message;
+            if (pos.isEnabled()) {
+                message = Message.newMsg(MessageType.INFO, storage.getName(), storage.getId(), posName, "smfcore.messages.enabledPos", "启用库位：{0}",
+                        new String[]{posName});
+            } else {
+                message = Message.newMsg(MessageType.INFO, storage.getName(), storage.getId(), posName, "smfcore.messages.disabledPos", "禁用库位：{0}",
+                        new String[]{posName});
+            }
+            message.setOperator(operator);
+            message.addData("posName", posName);
+            message.addData("enabled", pos.isEnabled() + "");
+            messageManager.save(message);
+        }
+    }
+
 }
 }

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -17,6 +17,7 @@ import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.barcode.utils.CodeResolve;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.language.util.MessageUtils;
+import com.neotel.smfcore.core.message.util.DeviceMessageUtil;
 import com.neotel.smfcore.core.storage.rest.dto.CheckOutDto;
 import com.neotel.smfcore.core.storage.rest.dto.CheckOutDto;
 import com.neotel.smfcore.core.storage.rest.dto.StoragePosDto;
 import com.neotel.smfcore.core.storage.rest.dto.StoragePosDto;
 import com.neotel.smfcore.core.storage.rest.dto.StoragePosEnabledDto;
 import com.neotel.smfcore.core.storage.rest.dto.StoragePosEnabledDto;
@@ -215,6 +216,7 @@ public class StoragePosController {
         pos.setEnabled(enabledDto.isEnabled());
         pos.setEnabled(enabledDto.isEnabled());
         storagePosManager.save(pos);
         storagePosManager.save(pos);
         log.info("启用禁用库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]=" + enabledDto.isEnabled());
         log.info("启用禁用库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]=" + enabledDto.isEnabled());
+        DeviceMessageUtil.addEnabledPosMessage(pos,SecurityUtils.getCurrentUsername());
 
 
         return ResultBean.newOkResult("");
         return ResultBean.newOkResult("");
     }
     }
@@ -244,6 +246,8 @@ public class StoragePosController {
         if(pos.isEnabled()!= saveDto.isEnabled()){
         if(pos.isEnabled()!= saveDto.isEnabled()){
             pos.setEnabled(saveDto.isEnabled());
             pos.setEnabled(saveDto.isEnabled());
             enabledStr=saveDto.isEnabled()?",启用库位":",禁用库位";
             enabledStr=saveDto.isEnabled()?",启用库位":",禁用库位";
+            DeviceMessageUtil.addEnabledPosMessage(pos,SecurityUtils.getCurrentUsername());
+
         }
         }
         storagePosManager.save(pos);
         storagePosManager.save(pos);
         log.info("修改库位:库位号[" + pos.getId() + "]=[" + saveDto.toString() + "]"+enabledStr);
         log.info("修改库位:库位号[" + pos.getId() + "]=[" + saveDto.toString() + "]"+enabledStr);

src/main/resources/messages.properties

@@ -229,4 +229,6 @@ smfcore.task.notExist=\u4EFB\u52A1\u4E0D\u5B58\u5728
 smfcore.task.hasEnd=\u4EFB\u52A1\u5DF2\u5B8C\u6210
 smfcore.task.hasEnd=\u4EFB\u52A1\u5DF2\u5B8C\u6210
 smfcore.task.hasCancel=\u66F4\u65B0\u72B6\u6001\u65F6{0}\u7684\u51FA\u5E93\u4EFB\u52A1[{1}]\u5DF2\u88AB\u53D6\u6D88
 smfcore.task.hasCancel=\u66F4\u65B0\u72B6\u6001\u65F6{0}\u7684\u51FA\u5E93\u4EFB\u52A1[{1}]\u5DF2\u88AB\u53D6\u6D88
 smfcore.robotBox.notFound=\u672A\u627E\u5230\u673A\u5668\u4EBA\u6599\u4ED3[{0}]
 smfcore.robotBox.notFound=\u672A\u627E\u5230\u673A\u5668\u4EBA\u6599\u4ED3[{0}]
-smfcore.robotBox.boxHasTask=\u4EFB\u52A1[{0}][{1}]\u7C7B\u578B{2}\u72B6\u6001{3}
\ No newline at end of file
+smfcore.robotBox.boxHasTask=\u4EFB\u52A1[{0}][{1}]\u7C7B\u578B{2}\u72B6\u6001{3}
+smfcore.messages.enabledPos=\u542F\u7528\u5E93\u4F4D\uFF1A{0}
+smfcore.messages.disabledPos=\u7981\u7528\u5E93\u4F4D\uFF1A{0}
\ No newline at end of file

src/main/resources/messages_en_US.properties

@@ -229,5 +229,7 @@ smfcore.task.notExist=Task does not exist
 smfcore.task.hasEnd=Mission completed
 smfcore.task.hasEnd=Mission completed
 smfcore.task.hasCancel={0}'s outgoing task [{1}] has been cancelled
 smfcore.task.hasCancel={0}'s outgoing task [{1}] has been cancelled
 smfcore.robotBox.notFound=ROBOT BOX{0} does not exist
 smfcore.robotBox.notFound=ROBOT BOX{0} does not exist
-smfcore.robotBox.boxHasTask=\u30BF\u30B9\u30AF [{0}][{1}] \u30BF\u30A4\u30D7 {2} \u72B6\u614B {3\uFF5D
+smfcore.robotBox.boxHasTask=Task [{0}][{1}] Type {2} Status {3}
+smfcore.messages.enabledPos=Enable Location\uFF1A{0}
+smfcore.messages.disabledPos=Disable Location\uFF1A{0}
 
 

src/main/resources/messages_ja_JP.properties

@@ -229,5 +229,7 @@ smfcore.task.notExist=\u30DF\u30C3\u30B7\u30E7\u30F3\u304C\u5B58\u5728\u3057\u30
 smfcore.task.hasEnd=\u30DF\u30C3\u30B7\u30E7\u30F3\u9054\u6210
 smfcore.task.hasEnd=\u30DF\u30C3\u30B7\u30E7\u30F3\u9054\u6210
 smfcore.task.hasCancel={0}\u306E\u9001\u4FE1\u30BF\u30B9\u30AF[{1}]\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
 smfcore.task.hasCancel={0}\u306E\u9001\u4FE1\u30BF\u30B9\u30AF[{1}]\u306F\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F
 smfcore.robotBox.notFound=\u30D3\u30F3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F{0}
 smfcore.robotBox.notFound=\u30D3\u30F3\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F{0}
-smfcore.robotBox.boxHasTask=Task [{0}][{1}] Type {2} Status {3}
+smfcore.robotBox.boxHasTask=\u30BF\u30B9\u30AF [{0}][{1}] \u30BF\u30A4\u30D7 {2} \u72B6\u614B {3\uFF5D
+smfcore.messages.enabledPos=\u6709\u52B9\u306B\u3059\u308B\u30B9\u30C8\u30EC\u30FC\u30B8\u4F4D\u7F6E \uFF1A{0}
+smfcore.messages.disabledPos=\u7121\u52B9\u5316\u30B9\u30C8\u30EC\u30FC\u30B8\u4F4D\u7F6E\uFF1A{0}
 
 

src/main/resources/messages_zh_CN.properties

@@ -230,3 +230,5 @@ smfcore.task.hasEnd=\u4EFB\u52A1\u5DF2\u5B8C\u6210
 smfcore.task.hasCancel=\u66F4\u65B0\u72B6\u6001\u65F6{0}\u7684\u51FA\u5E93\u4EFB\u52A1[{1}]\u5DF2\u88AB\u53D6\u6D88
 smfcore.task.hasCancel=\u66F4\u65B0\u72B6\u6001\u65F6{0}\u7684\u51FA\u5E93\u4EFB\u52A1[{1}]\u5DF2\u88AB\u53D6\u6D88
 smfcore.robotBox.notFound=\u672A\u627E\u5230\u673A\u5668\u4EBA\u6599\u4ED3[{0}]
 smfcore.robotBox.notFound=\u672A\u627E\u5230\u673A\u5668\u4EBA\u6599\u4ED3[{0}]
 smfcore.robotBox.boxHasTask=\u4EFB\u52A1[{0}][{1}]\u7C7B\u578B{2}\u72B6\u6001{3}
 smfcore.robotBox.boxHasTask=\u4EFB\u52A1[{0}][{1}]\u7C7B\u578B{2}\u72B6\u6001{3}
+smfcore.messages.enabledPos=\u542F\u7528\u5E93\u4F4D\uFF1A{0}
+smfcore.messages.disabledPos=\u7981\u7528\u5E93\u4F4D\uFF1A{0}

src/main/resources/messages_zh_TW.properties

@@ -230,4 +230,6 @@ smfcore.task.hasEnd=\u4EFB\u52D9\u5DF2\u5B8C\u6210
 smfcore.task.hasCancel=\u66F4\u65B0\u72C0\u614B\u6642{0}\u7684\u51FA\u5EAB\u4EFB\u52D9[{1}]\u5DF2\u88AB\u53D6\u6D88
 smfcore.task.hasCancel=\u66F4\u65B0\u72C0\u614B\u6642{0}\u7684\u51FA\u5EAB\u4EFB\u52D9[{1}]\u5DF2\u88AB\u53D6\u6D88
 smfcore.robotBox.notFound=\u672A\u627E\u5230\u6A5F\u5668\u4EBA\u6599\u5009[{0}]
 smfcore.robotBox.notFound=\u672A\u627E\u5230\u6A5F\u5668\u4EBA\u6599\u5009[{0}]
 smfcore.robotBox.boxHasTask=\u4EFB\u52D9[{0}][{1}]\u985E\u578B{2}\u72C0\u614B{3}
 smfcore.robotBox.boxHasTask=\u4EFB\u52D9[{0}][{1}]\u985E\u578B{2}\u72C0\u614B{3}
+smfcore.messages.enabledPos=\u555F\u7528\u5EAB\u4F4D\uFF1A{0}
+smfcore.messages.disabledPos=\u7981\u7528\u5EAB\u4F4D\uFF1A{0}
 
 

修改记录.txt

+增加机器人料仓代码。
+元器件增加尺寸确认功能。
+
+20220307
+启用禁用库位增加操作日志
\ No newline at end of file