Merge branch 'master' of http://db.comtti.net:80/comtika2019/fad-comtika-safe

src/main/java/com/comtika/safe/service/equip/terminal/impl/EquipTerminalServiceImpl.java

@@ -121,6 +121,12 @@ public class EquipTerminalServiceImpl implements EquipTerminalService {
                 }
                 String dealCount = i < 10 ? ("0" + i) : i + "";
                 serialStr = equip.getSerialNo() + dealCount;
+                if(serialStr.length() < 12){
+                	int length = 12 - serialStr.length();
+                	for(int p =0 ;p < length; p++){
+                		serialStr = "0" + serialStr;
+                	}
+                }
                 socket.setSerialNo(serialStr);
                 socket.setEquipTerminalId(terminal.getTerminalId());
                 socket.setSocketStatus(SocketStatus.IDLE.getId());//插座状态初始化？
@@ -219,6 +225,12 @@ public class EquipTerminalServiceImpl implements EquipTerminalService {
                     }
                     String dealCount = i < 10 ? ("0" + i) : i + "";
                     serialStr = serialNo + dealCount;
+                    if(serialStr.length() < 12){
+                    	int length = 12 - serialStr.length();
+                    	for(int p =0 ;p < length; p++){
+                    		serialStr = "0" + serialStr;
+                    	}
+                    }
                     socket.setSerialNo(serialStr);
                     socket.setEquipTerminalId(terminal.getTerminalId());
                     socket.setSocketStatus(SocketStatus.IDLE.getId());//插座状态初始化？