localdatetime to json string

project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/DispatchBatch.java

@@ -2,6 +2,10 @@ package com.dituhui.pea.dispatch.entity;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -50,10 +54,14 @@ public class DispatchBatch implements Serializable {
     @Column(name = "order_num")
     private Integer orderNum;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "start_time")
     private LocalDateTime startTime;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "end_time")
     private LocalDateTime endTime;
@@ -67,6 +75,8 @@ public class DispatchBatch implements Serializable {
     @Column(name = "memo")
     private String memo;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "update_time")
     private LocalDateTime updateTime;

project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/DispatchEngineer.java

@@ -2,6 +2,10 @@ package com.dituhui.pea.dispatch.entity;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -49,6 +53,8 @@ public class DispatchEngineer implements Serializable {
 
     private String memo;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "update_time")
     private LocalDateTime updateTime;

project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/DispatchOrder.java

@@ -5,6 +5,10 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 import javax.persistence.*;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -57,10 +61,14 @@ public class DispatchOrder implements Serializable {
 
     private Integer seq;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "time_begin")
     private LocalDateTime timeBegin;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "time_end")
     private LocalDateTime timeEnd;
@@ -71,6 +79,8 @@ public class DispatchOrder implements Serializable {
 
     private String memo;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "update_time")
     private LocalDateTime updateTime;

project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/EngineerInfo.java

 package com.dituhui.pea.dispatch.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -53,10 +57,14 @@ public class EngineerInfo implements Serializable {
 
     private String memo;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "create_time")
     private LocalDateTime createTime;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Column(name = "update_time")
     private LocalDateTime updateTime;

project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/OrderAppointment.java

@@ -2,6 +2,10 @@ package com.dituhui.pea.dispatch.entity;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -41,22 +45,35 @@ public class OrderAppointment implements Serializable {
     @Column(name = "is_workshop")
     private Integer isWorkshop;
 
+
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Column(name = "expect_start_time")
     private LocalDateTime expectStartTime;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Column(name = "expect_end_time")
     private LocalDateTime expectEndTime;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Column(name = "actual_time")
     private LocalDateTime actualTime;
 
+
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Column(name = "actual_start_time")
     private LocalDateTime actualStartTime;
 
+
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Column(name = "actual_end_time")
     private LocalDateTime actualEndTime;
@@ -68,10 +85,16 @@ public class OrderAppointment implements Serializable {
 
     private String memo;
 
+
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Column(name = "create_time")
     private LocalDateTime createTime;
 
+
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Column(name = "update_time")
     private LocalDateTime updateTime;

project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/OrderRequest.java

@@ -2,6 +2,10 @@ package com.dituhui.pea.dispatch.entity;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
 import javax.persistence.*;
@@ -53,10 +57,14 @@ public class OrderRequest implements Serializable {
     @Column(name = "fault_describe")
     private String faultDescribe;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Column(name = "expect_time_begin")
     private LocalDateTime expectTimeBegin;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Column(name = "expect_time_end")
     private LocalDateTime expectTimeEnd;
@@ -113,10 +121,14 @@ public class OrderRequest implements Serializable {
 
     private String description;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Column(name = "create_time")
     private LocalDateTime createTime;
 
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Column(name = "update_time")
     private LocalDateTime updateTime;

project-dispatch/src/main/java/com/dituhui/pea/dispatch/entity/OrgGroup.java

 package com.dituhui.pea.dispatch.entity;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.io.Serializable;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import javax.persistence.*;
@@ -14,48 +20,52 @@ import javax.persistence.Table;
 @Table(name = "org_group")
 public class OrgGroup implements Serializable {
 
-	@Id
-	@GeneratedValue(strategy=GenerationType.IDENTITY)
-	private Integer id;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
 
-	@Column(name = "group_id")
-	private String groupId;
+    @Column(name = "group_id")
+    private String groupId;
 
-	@Column(name = "group_name")
-	private String groupName;
+    @Column(name = "group_name")
+    private String groupName;
 
-	@Column(name = "cluster_id")
-	private String clusterId;
+    @Column(name = "cluster_id")
+    private String clusterId;
 
-	@Column(name = "branch_id")
-	private String branchId;
+    @Column(name = "branch_id")
+    private String branchId;
 
-	private String address;
+    private String address;
 
-	@Column(name = "x")
-	private String X;
+    @Column(name = "x")
+    private String X;
 
-	@Column(name = "y")
-	private String Y;
+    @Column(name = "y")
+    private String Y;
 
-	@Column(name = "city_code")
-	private String cityCode;
+    @Column(name = "city_code")
+    private String cityCode;
 
-	private Integer kind;
+    private Integer kind;
 
-	private Integer category;
+    private Integer category;
 
-	@Column(name = "warehouse_id")
-	private Integer warehouseId;
+    @Column(name = "warehouse_id")
+    private Integer warehouseId;
 
-	private String memo;
+    private String memo;
 
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@Column(name = "create_time")
-	private Date createTime;
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Column(name = "create_time")
+    private LocalDateTime createTime;
 
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-	@Column(name = "update_time")
-	private Date updateTime;
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Column(name = "update_time")
+    private LocalDateTime updateTime;
 
 }

project-dispatch/src/main/java/com/dituhui/pea/dispatch/service/impl/SolveServiceImpl.java

@@ -58,7 +58,8 @@ public class SolveServiceImpl implements SolveService {
     private List<String> queryEngineerSkills(String engineerCode) {
         List<String> result = new ArrayList<>();
         String sql = "select concat( b.brand, b.type, b.skill) as skill   from engineer_skill a left join product_category b \n"
-                + "\ton a.category_id= b.product_category_id  where a.engineer_code=? and a.status=1 ";
+                + "\t on a.category_id= b.product_category_id  where a.engineer_code=? and a.status=1 " +
+                " and b.brand is not null ";
         Object[] param = {engineerCode};
         result = jdbcTemplate.queryForList(sql, param, String.class);
         return result;