扫码nb码规则

src/main/java/com/zehong/service/impl/ScanCodeResultServiceImpl.java

@@ -48,7 +48,7 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
     /**
      * 扫码结果
      * @param message 扫码信息
-     * @return
+     * @return int
      */
     @Override
     public int scanCodeResult(String message) {
@@ -61,7 +61,7 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
 
     /**
      * 解析扫码结果
-     * @param message
+     * @param message 扫码信息
      */
     private Map<String,Object> analysis(String message){
         Map<String,Object> analysisResult = new HashMap<>();
@@ -76,13 +76,13 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
             if(!CollectionUtils.isEmpty(codes)) analysisResult.put(rule.getKey(),codes);
         }
         //nb码无规则
-        if(StringUtils.isNotEmpty(message)) analysisResult.put("nbCode",message);
+        if(StringUtils.isNotEmpty(message)) analysisResult.put("nbCode",getNbCode(message));
         return analysisResult;
     }
 
     /**
      * 处理策略
-     * @param analysisResult
+     * @param analysisResult 解析结果
      */
     private int dealStrategy(Map<String,Object> analysisResult){
         // NB码 + 卡批次码
@@ -100,13 +100,28 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
         return 0;
     }
 
+    /**
+     * 根据不同厂家获取nb码
+     * @param message nb码字符串
+     * @return String
+     */
+    private String getNbCode(String message){
+        if(message.contains("_")){
+            return message.split("_")[0];
+        }
+        if (message.contains(";")){
+            return message.split(";")[0];
+        }
+        return message;
+    }
+
 
     /**
      * 新增nb+卡批次码
-     * @param analysisResult
-     * @return
+     * @param analysisResult 解析结果
+     * @return int
      */
-    public int addNbAndCardCode(Map<String,Object> analysisResult){
+    private int addNbAndCardCode(Map<String,Object> analysisResult){
         Map<String,Object> cache = redisCache.getCacheMap(MesDeviceDataConstant.EQUIPMENT_DOCKING + ":" + MesDeviceDataConstant.PCBA_DEVICE_KEY);
         if(null != cache){
             PCBADevices devices = new PCBADevices();
@@ -123,10 +138,10 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
 
     /**
      * 新增主板码+传感器批次码
-     * @param analysisResult
-     * @return
+     * @param analysisResult 解析结果
+     * @return int
      */
-    public int addMainBoardCodeAndSensorBatchCode(Map<String,Object> analysisResult){
+    private int addMainBoardCodeAndSensorBatchCode(Map<String,Object> analysisResult){
         Map<String,Object> cache = redisCache.getCacheMap(MesDeviceDataConstant.EQUIPMENT_DOCKING + ":" + MesDeviceDataConstant.PCBA_DEVICE_KEY);
         if(null != cache){
             PCBADevices devices = new PCBADevices();
@@ -144,10 +159,10 @@ public class ScanCodeResultServiceImpl implements ScanCodeResultService{
 
     /**
      * 修改主板码和nb码
-     * @param analysisResult
-     * @return
+     * @param analysisResult 解析结果
+     * @return int
      */
-    public int updateNbCodeByMainBoardCode(Map<String,Object> analysisResult){
+    private int updateNbCodeByMainBoardCode(Map<String,Object> analysisResult){
         PCBADevices devices = new PCBADevices();
         List<String> mainCodes = (List<String>) analysisResult.get(PCBACodeRules.MAINBOARDCODE.name());
         devices.setMotherboardCode(mainCodes.get(0));