Merge branch 'feature-wcz' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/LiftFaultController.java

@@ -0,0 +1,20 @@
+package cn.com.ty.lift.business.emergency.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author wcz
+ * @since 2020-01-02
+ */
+@RestController
+@RequestMapping("/emergency/lift-fault")
+public class LiftFaultController {
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/entity/LiftFault.java

@@ -0,0 +1,62 @@
+package cn.com.ty.lift.business.emergency.entity;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author wcz
+ * @since 2020-01-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class LiftFault implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId("id")
+    private Long id;
+
+    /**
+     * 故障编码
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 所属的电梯类型1直梯，2扶梯
+     */
+    @TableField("lift_category")
+    private Integer liftCategory;
+
+    /**
+     * 故障类型
+     */
+    @TableField("fault_category")
+    private String faultCategory;
+
+    /**
+     * 故障分类
+     */
+    @TableField("fault_type")
+    private String faultType;
+
+    /**
+     * 故障描述
+     */
+    @TableField("fault_desc")
+    private String faultDesc;
+
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/mapper/LiftFaultMapper.java

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.business.emergency.mapper;
+
+import cn.com.ty.lift.business.emergency.entity.LiftFault;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author wcz
+ * @since 2020-01-02
+ */
+public interface LiftFaultMapper extends BaseMapper<LiftFault> {
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/service/LiftFaultService.java

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.business.emergency.service;
+
+import cn.com.ty.lift.business.emergency.entity.LiftFault;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author wcz
+ * @since 2020-01-02
+ */
+public interface LiftFaultService extends IService<LiftFault> {
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/service/impl/LiftFaultServiceImpl.java

@@ -0,0 +1,20 @@
+package cn.com.ty.lift.business.emergency.service.impl;
+
+import cn.com.ty.lift.business.emergency.entity.LiftFault;
+import cn.com.ty.lift.business.emergency.mapper.LiftFaultMapper;
+import cn.com.ty.lift.business.emergency.service.LiftFaultService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author wcz
+ * @since 2020-01-02
+ */
+@Service
+public class LiftFaultServiceImpl extends ServiceImpl<LiftFaultMapper, LiftFault> implements LiftFaultService {
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/SystemConfiguration.java

@@ -3,9 +3,14 @@ package cn.com.ty.lift.business.framework.conf;
 import cn.com.ty.lift.common.utils.AliyunOSSUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.databind.ser.std.DateSerializer;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
@@ -51,9 +56,14 @@ public class SystemConfiguration {
     @Bean
     public Jackson2ObjectMapperBuilderCustomizer jsonCustomizer() {
         return builder -> {
-            builder.serializers(new LocalDateTimeSerializer(
-                    DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
+            builder.serializers(new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
             builder.serializers(new LocalDateSerializer(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
+            builder.serializers(new LocalTimeSerializer(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN)));
+
+            builder.deserializers(new LocalDateDeserializer(DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
+            builder.deserializers(new LocalDateTimeDeserializer(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
+            builder.deserializers(new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN)));
+
             builder.serializerByType(Long.class, ToStringSerializer.instance);
         };
     }