From 53bc050552e6762057826c3ef8c1ca19b0516b80 Mon Sep 17 00:00:00 2001 From: cjl Date: Wed, 23 Jan 2019 15:59:56 +0800 Subject: [PATCH] =?UTF-8?q?createTime=E8=BF=94=E5=9B=9E=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=9C=89=E6=97=B6=E5=88=86=E7=A7=92=EF=BC=8CupdateTime?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=B2=A1=E6=9C=89=EF=BC=8C=E6=9C=89=E4=BA=BA?= =?UTF-8?q?=E5=AF=B9createTime=E5=81=9A=E4=BA=86=E7=89=B9=E6=AE=8A?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C=E5=9C=A8=E6=AD=A4=E5=A4=84=E5=8A=A0?= =?UTF-8?q?=E4=B8=8AupdateTime?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/pages/manage/serialNumber.html | 38 +++- .../com/jsh/erp/utils/ResponseJsonUtil.java | 166 +++++++++--------- 2 files changed, 119 insertions(+), 85 deletions(-) diff --git a/erp_web/pages/manage/serialNumber.html b/erp_web/pages/manage/serialNumber.html index 0c95b92e..5082dde6 100644 --- a/erp_web/pages/manage/serialNumber.html +++ b/erp_web/pages/manage/serialNumber.html @@ -162,8 +162,8 @@ return value ? "是" : "否"; } }, - {title: '创建时间', field: 'createTime', width: 70}, - {title: '更新时间', field: 'updateTime', width: 70}, + {title: '创建时间', field: 'createTime', width: 140,formatter: formatDatebox}, + {title: '更新时间', field: 'updateTime', width: 140,formatter: formatDatebox}, {title: '备注', field: 'remark',width: 300} ]], toolbar: [ @@ -448,6 +448,40 @@ $("#searchBtn").click(); } }); + /**时间格式化*/ + Date.prototype.format = function (format) { + var o = { + "M+": this.getMonth() + 1, // month + "d+": this.getDate(), // day + "h+": this.getHours(), // hour + "m+": this.getMinutes(), // minute + "s+": this.getSeconds(), // second + "q+": Math.floor((this.getMonth() + 3) / 3), // quarter + "S": this.getMilliseconds() + // millisecond + } + if (/(y+)/.test(format)) + format = format.replace(RegExp.$1, (this.getFullYear() + "") + .substr(4 - RegExp.$1.length)); + for (var k in o) + if (new RegExp("(" + k + ")").test(format)) + format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ("00" + o[k]).substr(("" + o[k]).length)); + return format; + } + function formatDatebox(value) { + if (value == null || value == '') { + return ''; + } + var dt; + if (value instanceof Date) { + dt = value; + } else { + dt = new Date(value); + } + + return dt.format("yyyy-MM-dd hh:mm:ss"); //扩展的Date的format方法(上述插件实现) + } + diff --git a/src/main/java/com/jsh/erp/utils/ResponseJsonUtil.java b/src/main/java/com/jsh/erp/utils/ResponseJsonUtil.java index 953cc8d6..2f7fee30 100644 --- a/src/main/java/com/jsh/erp/utils/ResponseJsonUtil.java +++ b/src/main/java/com/jsh/erp/utils/ResponseJsonUtil.java @@ -1,83 +1,83 @@ -package com.jsh.erp.utils; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.alibaba.fastjson.serializer.ValueFilter; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.TimeZone; - -public class ResponseJsonUtil { - public static final SimpleDateFormat FORMAT = new SimpleDateFormat("yyyy-MM-dd"); - - static { - FORMAT.setTimeZone(TimeZone.getTimeZone("GMT+8")); - } - - /** - * 响应过滤器 - */ - public static final class ResponseFilter extends ExtJsonUtils.ExtFilter implements ValueFilter { - @Override - public Object process(Object object, String name, Object value) { - if (name.equals("createTime") || name.equals("modifyTime")) { - return value; - } else if (value instanceof Date) { - return FORMAT.format(value); - } else { - return value; - } - } - } - - /** - * - * @param responseCode - * @return - */ - public static String backJson4HttpApi(ResponseCode responseCode) { - if (responseCode != null) { - String result = JSON.toJSONString(responseCode, new ResponseFilter(), - SerializerFeature.DisableCircularReferenceDetect, - SerializerFeature.WriteNonStringKeyAsString); - result = result.replaceFirst("\"data\":\\{", ""); - return result.substring(0, result.length() - 1); - } - return null; - } - - /** - * 验证失败的json串 - * @param code - * @return - */ - public static String backJson4VerifyFailure(int code) { - Map map = new HashMap(); - map.put("message", "未通过验证"); - return JSON.toJSONString(new ResponseCode(code, map), new ResponseFilter(), - SerializerFeature.DisableCircularReferenceDetect, - SerializerFeature.WriteNonStringKeyAsString); - } - - /** - * 成功的json串 - * @param responseCode - * @return - */ - public static String backJson(ResponseCode responseCode) { - if (responseCode != null) { - return JSON.toJSONString(responseCode, new ResponseFilter(), - SerializerFeature.DisableCircularReferenceDetect, - SerializerFeature.WriteNonStringKeyAsString); - } - return null; - } - - public static String returnJson(Map map, String message, int code) { - map.put("message", message); - return backJson(new ResponseCode(code, map)); - } -} +package com.jsh.erp.utils; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.alibaba.fastjson.serializer.ValueFilter; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.TimeZone; + +public class ResponseJsonUtil { + public static final SimpleDateFormat FORMAT = new SimpleDateFormat("yyyy-MM-dd"); + + static { + FORMAT.setTimeZone(TimeZone.getTimeZone("GMT+8")); + } + + /** + * 响应过滤器 + */ + public static final class ResponseFilter extends ExtJsonUtils.ExtFilter implements ValueFilter { + @Override + public Object process(Object object, String name, Object value) { + if (name.equals("createTime") || name.equals("modifyTime")||name.equals("updateTime")) { + return value; + } else if (value instanceof Date) { + return FORMAT.format(value); + } else { + return value; + } + } + } + + /** + * + * @param responseCode + * @return + */ + public static String backJson4HttpApi(ResponseCode responseCode) { + if (responseCode != null) { + String result = JSON.toJSONString(responseCode, new ResponseFilter(), + SerializerFeature.DisableCircularReferenceDetect, + SerializerFeature.WriteNonStringKeyAsString); + result = result.replaceFirst("\"data\":\\{", ""); + return result.substring(0, result.length() - 1); + } + return null; + } + + /** + * 验证失败的json串 + * @param code + * @return + */ + public static String backJson4VerifyFailure(int code) { + Map map = new HashMap(); + map.put("message", "未通过验证"); + return JSON.toJSONString(new ResponseCode(code, map), new ResponseFilter(), + SerializerFeature.DisableCircularReferenceDetect, + SerializerFeature.WriteNonStringKeyAsString); + } + + /** + * 成功的json串 + * @param responseCode + * @return + */ + public static String backJson(ResponseCode responseCode) { + if (responseCode != null) { + return JSON.toJSONString(responseCode, new ResponseFilter(), + SerializerFeature.DisableCircularReferenceDetect, + SerializerFeature.WriteNonStringKeyAsString); + } + return null; + } + + public static String returnJson(Map map, String message, int code) { + map.put("message", message); + return backJson(new ResponseCode(code, map)); + } +}