条码异常中英文提示

myproject/src/main/java/com/myproject/bean/utils/StatusBean.java

@@ -246,7 +246,7 @@ public class StatusBean {
      * 是否需要往数据库保存(5分钟保存一次)
      */
     public boolean needSaveToMongo(){
-        return  System.currentTimeMillis() - lastSaveTime >= 1 * 1000;
+        return  System.currentTimeMillis() - lastSaveTime >= 10 * 60 * 1000;
     }
 
     public long getLastSaveTime() {

myproject/src/main/java/com/myproject/webapp/controller/webService/ITaskService.java

@@ -48,6 +48,8 @@ public interface ITaskService {
      */
     List<DataLog> getWaitingTasks();
 
+    Exception getServerException(String cid);
+
     StatusBean getStatus(String cid);
 
     Map<String, StatusBean> allStatus();

myproject/src/main/java/com/myproject/webapp/controller/webService/StatusController.java

@@ -7,6 +7,7 @@ import com.myproject.bean.update.Humiture;
 import com.myproject.bean.update.Settings;
 import com.myproject.bean.utils.BoxStatusBean;
 import com.myproject.bean.utils.StatusBean;
+import com.myproject.exception.ValidateException;
 import com.myproject.manager.IHumitureManager;
 import com.myproject.webapp.controller.storage.BaseController;
 import org.apache.logging.log4j.LogManager;
@@ -51,6 +52,17 @@ public class StatusController extends BaseController{
 //        }
 
         //log.debug("Get cid: " + cid + " status: " + statusBean.getStatus() + " and error: " + statusBean.getError());
+        Exception e = taskService.getServerException(cid);
+        if(e != null){
+            if(e instanceof ValidateException){
+                String msg = getText(e.getMessage(),((ValidateException) e).getParams(), request.getLocale(),e.getMessage());
+                statusBean.setMsg(msg);
+                statusBean.setMsgEn(msg);
+            }else{
+                statusBean.setMsg(e.getMessage());
+                statusBean.setMsgEn(e.getMessage());
+            }
+        }
         return statusBean;
     }
 

myproject/src/main/java/com/myproject/webapp/controller/webService/TaskService.java

@@ -99,7 +99,7 @@ public class TaskService implements ITaskService {
     /**
      * CID的服务器消息(key 为 cid)
      */
-    private static Map<String, String> serverMsgs = new ConcurrentHashMap<>();
+    private static Map<String, Exception> serverExceptions = new ConcurrentHashMap<>();
 
 
     /**
@@ -248,16 +248,16 @@ public class TaskService implements ITaskService {
 
             log.info(barcode+"["+plateW+"x"+plateH + "]开始入库到"+storage.getCid()+"["+posId+"]");
             //清空展示的消息
-            serverMsgs.put(storage.getCid(),"");
+            serverExceptions.remove(storage.getCid());
 
         } catch (ValidateException e) {
             log.warn("入库到"+storage.getCid() + "失败:"+e.getMessage());
             statusBean.setMsg(e.getMessage());
-            serverMsgs.put(storage.getCid(),e.getMessage());
+            serverExceptions.put(storage.getCid(),e);
         } catch (Exception e) {
             log.error(statusBean.getCode() + "入库到"+storage.getCid() + "失败", e);
             statusBean.setMsg(e.getMessage());
-            serverMsgs.put(storage.getCid(),e.getMessage());
+            serverExceptions.put(storage.getCid(),e);
         }
         return statusBean;
     }
@@ -1176,6 +1176,12 @@ public class TaskService implements ITaskService {
     }
 
     @Override
+    public Exception getServerException(String cid){
+        return serverExceptions.get(cid);
+    }
+
+
+    @Override
     public StatusBean getStatus(String cid) {
         StatusBean statusBean = statusMap.get(cid);
         if (statusBean == null || statusBean.timeOut()) {
@@ -1183,10 +1189,6 @@ public class TaskService implements ITaskService {
             statusBean.setCid(cid);
             statusBean.setStatus(StorageConstants.STATUS.OFFLINE);
         }
-        String serverMsg = serverMsgs.get(cid);
-        if(!Strings.isNullOrEmpty(serverMsg)){
-            statusBean.setMsg(serverMsg);
-        }
         return statusBean;
     }
 

myproject/src/main/webapp/WEB-INF/pages/storage/boxView.jsp

@@ -101,6 +101,13 @@
         text-decoration:line-through;
     }
 
+    .red{
+        color:red;
+    }
+    .green{
+        color:green;
+    }
+
 </style>
 
 <link href="${ctx}/scripts/lobibox/css/lobibox.min.css?id=2" rel="stylesheet" type="text/css"/>
@@ -111,19 +118,6 @@
             <i class="fa fa-sign-out"></i><fmt:message key="button.checkout"/></button>
     </div>
     <div id="chart">
-        <div class='itembox' id="7x8">
-            <div class='item-start barheight'>7 x 8 mm</div>
-            <div class='progress my-progress'>
-                <div class='progress-bar progress-bar-used barheight' style='width: 0%' title=""></div>
-                <div class='progress-bar progress-bar-idle barheight' style='width: 0%' title=""></div>
-            </div>
-        </div>
-        <div class='itembox' id="7x16"><div class='item-start barheight'>7 x 16 mm</div>
-            <div class='progress my-progress'>
-                <div class='progress-bar progress-bar-used barheight' style='width: 0%'></div>
-                <div class='progress-bar progress-bar-idle barheight' style='width: 0%'></div>
-            </div>
-        </div>
 
     </div>
 
@@ -536,17 +530,21 @@
             function flushStatus(){
                 $.get('${ctx}/service/store/status?cid=${show}', function (statusBean) {
                     if(statusBean && statusBean.boxStatus["1"]){
-                        var statusTxt = statusMsg[statusBean.boxStatus["1"].status];
+                        var boxStatusBean = statusBean.boxStatus["1"];
+
+                        var statusTxt = statusMsg[boxStatusBean.status];
                         $("#smdstatus").html("${boxStatus_label}: ["+statusTxt+"]");
-                        var locale = "${locale}";
-                        var msg = statusBean.msg;
-                        if(locale == 'en'){
-                            msg = statusBean.msgEn;
+                        var color = "green";
+                        if(boxStatusBean.status == 2 || boxStatusBean.status == 3 || boxStatusBean.status == 4 || boxStatusBean.status == 5){
+                            color = "red";
                         }
-                        $("#clientMsg").html(msg);
+                        $("#smdstatus").attr("class","smdstatus " + color);
+                        $("#clientMsg").html(statusBean.msg);
                     }else{
                         var statusTxt = statusMsg["999"];
                         $("#smdstatus").html("${boxStatus_label}: ["+statusTxt+"]");
+
+                        $("#smdstatus").attr("class","smdstatus red");
                         $("#clientMsg").html("");
                     }
                 });