Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/common/utils/FileUtil.java

@@ -355,7 +355,11 @@ public class FileUtil extends cn.hutool.core.io.FileUtil {
         if (CollectionUtils.isNotEmpty(dataList)) {
             for (Map<String, Object> data : dataList) {
                 for (String key : titles) {
-                    buf.append(data.get(key)).append(CSV_COLUMN_SEPARATOR);
+                    if(data.get(key).toString().contains(CSV_COLUMN_SEPARATOR)){
+                        buf.append("\""+data.get(key)+"\"").append(CSV_COLUMN_SEPARATOR);
+                    }else{
+                        buf.append(data.get(key)).append(CSV_COLUMN_SEPARATOR);
+                    }
                 }
                 buf.append(CSV_ROW_SEPARATOR);
             }

src/main/java/com/neotel/smfcore/core/device/bean/StatusBean.java

@@ -108,6 +108,10 @@ public class StatusBean {
     private List<PosInfo> posList=null;
 
     /**
+     * 语言，zh-CN，zh-TW，en-US，ja-JP，默认中文
+     */
+    public String language="";
+    /**
      * 料仓类型
      */
     private String deviceType = DeviceType.AUTO.name();
@@ -619,4 +623,31 @@ public class StatusBean {
         }
         return resultMap;
     }
+
+    public void setRMsg(String msgKey, String[] msgParam, String message) {
+
+        String msgEn = MessageUtils.getText(msgKey, msgParam, new Locale("en","US"), message);
+        String msgJp = MessageUtils.getText(msgKey, msgParam, new Locale("ja","JP"), message);
+
+        setMsg(message);
+        setMsgCode(msgKey);
+        setMsgEn(msgEn);
+        setMsgJp(msgJp);
+        if(ObjectUtil.isNotEmpty(language)){
+
+            String[] array = language.split("-");
+            Locale locale = null;
+            if (array.length == 2) {
+                locale = new Locale(array[0], array[1]);
+            } else {
+                locale = new Locale(language);
+            }
+
+            String lanMsg=MessageUtils.getText(msgKey, msgParam, locale, message);
+            setMsg(lanMsg);
+        }else{
+            String lanMsg=MessageUtils.getText(msgKey, msgParam, MessageUtils.getDefaultLocal(), message);
+            setMsg(lanMsg);
+        }
+    }
 }

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -324,13 +324,15 @@ public class BaseDeviceHandler implements IDeviceHandler {
             serverExceptions.remove(storage.getCid());
 
         } catch (ValidateException e) {
-            String msgEn = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("en","US"), e.getMessage());
-            String msgJp = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("ja","JP"), e.getMessage());
-            log.warn(statusBean.getCode() + "入库到" + storage.getCid() + "失败:" + e.getMessage()+","+msgEn+","+msgJp);
-            statusBean.setMsg(e.getMessage());
-            statusBean.setMsgCode(e.getMsgKey());
-            statusBean.setMsgEn(msgEn);
-            statusBean.setMsgJp(msgJp);
+//            String msgEn = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("en","US"), e.getMessage());
+//            String msgJp = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("ja","JP"), e.getMessage());
+//            log.warn(statusBean.getCode() + "入库到" + storage.getCid() + "失败:" + e.getMessage()+","+msgEn+","+msgJp);
+//            statusBean.setMsg(e.getMessage());
+//            statusBean.setMsgCode(e.getMsgKey());
+//            statusBean.setMsgEn(msgEn);
+//            statusBean.setMsgJp(msgJp);
+            statusBean.setRMsg(e.getMsgKey(),e.getMsgParam(),e.getMessage());
+            log.warn(statusBean.getCode() + "入库到" + storage.getCid() + "失败:" + e.getMessage()+","+statusBean.getMsg()+","+statusBean.getMsgEn()+","+statusBean.getMsgJp());
             serverExceptions.put(storage.getCid(), e);
         }catch (Exception e) {
             log.error(statusBean.getCode() + "入库到" + storage.getCid() + "失败", e);

src/main/java/com/neotel/smfcore/core/solder/handler/SpBoxHandler.java

@@ -244,13 +244,16 @@ public class SpBoxHandler extends BaseDeviceHandler {
             serverExceptions.remove(storage.getCid());
 
         } catch (ValidateException e) {
-            log.warn(statusBean.getCode() + "入库到" + storage.getCid() + "失败:" + e.getMessage());
-            statusBean.setMsg(e.getMessage());
-            statusBean.setMsgCode(e.getMsgKey());
-            String msgEn = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("en","US"), e.getMessage());
-            String msgJp = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("ja","JP"), e.getMessage());
-            statusBean.setMsgEn(msgEn);
-            statusBean.setMsgJp(msgJp);
+//            log.warn(statusBean.getCode() + "入库到" + storage.getCid() + "失败:" + e.getMessage());
+//            statusBean.setMsg(e.getMessage());
+//            statusBean.setMsgCode(e.getMsgKey());
+//            String msgEn = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("en","US"), e.getMessage());
+//            String msgJp = MessageUtils.getText(e.getMsgKey(), e.getMsgParam(), new Locale("ja","JP"), e.getMessage());
+//            statusBean.setMsgEn(msgEn);
+//            statusBean.setMsgJp(msgJp);
+            statusBean.setRMsg(e.getMsgKey(),e.getMsgParam(),e.getMessage());
+            log.warn(statusBean.getCode() + "入库到" + storage.getCid() + "失败:" + e.getMessage()+","+statusBean.getMsg()+","+statusBean.getMsgEn()+","+statusBean.getMsgJp());
+
             serverExceptions.put(storage.getCid(), e);
         } catch (Exception e) {
             log.error(statusBean.getCode() + "入库到" + storage.getCid() + "失败", e);

src/main/java/com/neotel/smfcore/custom/micron1053/controller/MicronStatusController.java

@@ -273,7 +273,7 @@ public class MicronStatusController {
             Calendar time = Calendar.getInstance();
             time.setTime(new Date());
             time.add(Calendar.DAY_OF_YEAR, -6);
-            String today = DateUtil.toDateTimeString(new Date());
+            String today = DateUtil.toDateString(new Date(),"MM/dd/yyyy");
             List<ChartItem> chartItems = storageManager.getRunStatusData(time.getTime(), new Date(), "",cids);
 
             for (ChartItem chartItem :