Browse Source

日期字段格式化处理

zhouy 2 years ago
parent
commit
d5f2eb2d77

+ 8 - 127
src/main/java/com/uas/eis/entity/PNSSendData.java

@@ -1,11 +1,13 @@
 package com.uas.eis.entity;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import org.codehaus.jackson.annotate.JsonIgnore;
+import lombok.Data;
+import java.io.Serializable;
 import java.util.Date;
-
-public class PNSSendData {
+@Data
+public class PNSSendData implements Serializable {
     /**
      * 序号
      * */
@@ -22,127 +24,6 @@ public class PNSSendData {
      * 部门code
      * */
     private String division_no;
-
-    public Integer getRow_number() {
-        return row_number;
-    }
-
-    public void setRow_number(Integer row_number) {
-        this.row_number = row_number;
-    }
-
-    public String getYmonth() {
-        return ymonth;
-    }
-
-    public void setYmonth(String ymonth) {
-        this.ymonth = ymonth;
-    }
-
-    public String getData_type() {
-        return data_type;
-    }
-
-    public void setData_type(String data_type) {
-        this.data_type = data_type;
-    }
-
-    public String getDivision_no() {
-        return division_no;
-    }
-
-    public void setDivision_no(String division_no) {
-        this.division_no = division_no;
-    }
-
-    public String getCust_id() {
-        return cust_id;
-    }
-
-    public void setCust_id(String cust_id) {
-        this.cust_id = cust_id;
-    }
-
-    public String getCust_code() {
-        return cust_code;
-    }
-
-    public void setCust_code(String cust_code) {
-        this.cust_code = cust_code;
-    }
-
-    public String getCust_name() {
-        return cust_name;
-    }
-
-    public void setCust_name(String cust_name) {
-        this.cust_name = cust_name;
-    }
-
-    public String getFinal_buyer_cust() {
-        return final_buyer_cust;
-    }
-
-    public void setFinal_buyer_cust(String final_buyer_cust) {
-        this.final_buyer_cust = final_buyer_cust;
-    }
-
-    public String getFinal_buyer_isp() {
-        return final_buyer_isp;
-    }
-
-    public void setFinal_buyer_isp(String final_buyer_isp) {
-        this.final_buyer_isp = final_buyer_isp;
-    }
-
-    public String getFinal_buyer_name() {
-        return final_buyer_name;
-    }
-
-    public void setFinal_buyer_name(String final_buyer_name) {
-        this.final_buyer_name = final_buyer_name;
-    }
-
-    public String getModel_no_cust() {
-        return model_no_cust;
-    }
-
-    public void setModel_no_cust(String model_no_cust) {
-        this.model_no_cust = model_no_cust;
-    }
-
-    public String getModel_no_isp() {
-        return model_no_isp;
-    }
-
-    public void setModel_no_isp(String model_no_isp) {
-        this.model_no_isp = model_no_isp;
-    }
-
-    public Date getConfirm_date() {
-        return confirm_date;
-    }
-
-    public void setConfirm_date(Date confirm_date) {
-        this.confirm_date = confirm_date;
-    }
-
-    public Float getQuantity() {
-        return quantity;
-    }
-
-    public void setQuantity(Float quantity) {
-        this.quantity = quantity;
-    }
-
-    public Float getAmount() {
-        return amount;
-    }
-
-    public void setAmount(Float amount) {
-        this.amount = amount;
-    }
-
     /**
      * 经销商id
      * */
@@ -175,8 +56,7 @@ public class PNSSendData {
     /**
      *库存日期or销售日期
      * */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JSONField(format = "yyyy-MM-dd")
     private Date confirm_date;
     /**
      * 数量
@@ -185,5 +65,6 @@ public class PNSSendData {
     /**
      * 金额
      * */
+    @JsonIgnore
     private Float amount;
 }

+ 5 - 2
src/main/java/com/uas/eis/task/PnsDataSyncTask.java

@@ -1,5 +1,8 @@
 package com.uas.eis.task;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.uas.eis.config.PNSConfig;
 import com.uas.eis.dao.BaseDao;
 import com.uas.eis.entity.PNSSendData;
@@ -54,10 +57,10 @@ public class PnsDataSyncTask {
             pageReq.put("current_page", String.valueOf(i+1));
             if((i+1)*pageSize > saleUploads.size()) {
                 pageReq.put("current_data_count", String.valueOf(b));
-                pageReq.put("detail", FlexJsonUtil.toJsonArrayDeep(saleUploads.subList(i*pageSize, i*pageSize+b)));
+                pageReq.put("detail", JSONArray.toJSONString(saleUploads.subList(i*pageSize, i*pageSize+b), SerializerFeature.WriteMapNullValue));
             }else {
                 pageReq.put("current_data_count", String.valueOf(pageSize));
-                pageReq.put("detail", FlexJsonUtil.toJsonArrayDeep(saleUploads.subList(i*pageSize, (i+1)*pageSize)));
+                pageReq.put("detail", JSONArray.toJSONString(saleUploads.subList(i*pageSize, (i+1)*pageSize),SerializerFeature.WriteMapNullValue));
             }
             logger.info("{}",pageReq);
             try {