增加其他货物

web/src/main/java/com/zhehekeji/web/Application.java

@@ -4,7 +4,9 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
+@EnableSwagger2  //加入EnableSwagger2
 @SpringBootApplication(scanBasePackages = {"com.zhehekeji"})
 @MapperScan("com.zhehekeji.**.mapper.**")
 public class Application {

web/src/main/java/com/zhehekeji/web/pojo/stock/StockStatus.java

@@ -13,6 +13,7 @@ public enum StockStatus {
     SUCCESS(2, "盘点准确"),
 
     ERROR(1, "核对错误"),
+    OTHER(4, "其他"),
     MANUAL(3,"人工核对")
     ;
     private Integer status;

web/src/main/java/com/zhehekeji/web/service/ksec/KsecDecoder.java

@@ -14,7 +14,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
 
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -70,7 +72,8 @@ public class KsecDecoder extends DelimiterBasedFrameDecoder {
 
         @Override
         public void run() {
-            String body = in.toString(Charset.forName("UTF-8"));
+            String body = in.toString(StandardCharsets.UTF_8);
+            //String body = in.toString();
             tcpLogger.info(body);
             if (body.startsWith("<")){
                 // 去掉首尾标识符