'表结构类型修改和基础业务类基础修改'

src/main/java/com/taauav/admin/controller/SysConfigController.java

@@ -97,7 +97,7 @@ public class SysConfigController {
         if (config == null) {
             return response.failure("配置信息不存在");
         }
-        config.setMark(Byte.valueOf("0"));
+        config.setMark(0);
         configMapper.updateById(config);
         return response.success("操作成功");
     }

src/main/java/com/taauav/admin/controller/SysDictController.java

@@ -8,6 +8,7 @@ import com.taauav.admin.entity.SysDict;
 import com.taauav.admin.mapper.SysDictMapper;
 import com.taauav.admin.service.ISysAdminService;
 import com.taauav.admin.service.ISysDictService;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -107,8 +108,8 @@ public class SysDictController {
         if (dict == null) {
             return response.failure("对应数据不存在");
         }
-        dict.setMark(Byte.valueOf("0"));
-        dict.setUpdateTime(FunctionUtils.now());
+        dict.setMark(Integer.valueOf("0"));
+        dict.setUpdateTime(DateUtil.now());
         dict.setUpdateUser(ShiroUtils.getAdminId());
         dictMapper.updateById(dict);
         return response.success("操作成功");

src/main/java/com/taauav/admin/controller/SysDictTypeController.java

@@ -7,6 +7,7 @@ import com.taauav.common.constant.PermissionConstants;
 import com.taauav.admin.entity.SysDictType;
 import com.taauav.admin.mapper.SysDictTypeMapper;
 import com.taauav.admin.service.ISysDictTypeService;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -97,8 +98,8 @@ public class SysDictTypeController {
         if (dictType == null) {
             return response.failure("字典分类信息不存在");
         }
-        dictType.setMark(Byte.valueOf("0"));
-        dictType.setUpdateTime(FunctionUtils.now());
+        dictType.setMark(Integer.valueOf("0"));
+        dictType.setUpdateTime(DateUtil.now());
         dictType.setUpdateUser(ShiroUtils.getAdminId());
         dictTypeMapper.updateById(dictType);
         return response.success("操作成功");

src/main/java/com/taauav/admin/entity/SysAdmin.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -12,8 +13,6 @@ import org.hibernate.validator.constraints.Length;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
-import java.io.Serializable;
-import java.lang.reflect.Array;
 import java.util.List;
 import java.util.Map;
 
@@ -27,9 +26,8 @@ import java.util.Map;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 @TableName("sys_admin")
-public class SysAdmin implements Serializable {
+public class SysAdmin extends Entity {
 
     private static final long serialVersionUID = 1L;
 
@@ -38,7 +36,6 @@ public class SysAdmin implements Serializable {
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
-
     /**
      * 姓名
      */
@@ -98,7 +95,6 @@ public class SysAdmin implements Serializable {
     @Override
     public String toString() {
         return "SysAdmin{" +
-                "id=" + id +
                 ", realname='" + realname + '\'' +
                 ", username='" + username + '\'' +
                 ", password='" + password + '\'' +
@@ -112,13 +108,7 @@ public class SysAdmin implements Serializable {
                 ", loginFailure=" + loginFailure +
                 ", lastIp=" + lastIp +
                 ", lastTime=" + lastTime +
-                ", status=" + status +
                 ", sort=" + sort +
-                ", createUser=" + createUser +
-                ", updateUser=" + updateUser +
-                ", createTime=" + createTime +
-                ", updateTime=" + updateTime +
-                ", mark=" + mark +
                 '}';
     }
 
@@ -153,44 +143,13 @@ public class SysAdmin implements Serializable {
     private Integer lastTime;
 
 
-    /**
-     * 状态：1正常 2关闭 3未审核
-     */
-    private Byte status;
 
     /**
      * 排序
      */
     private Integer sort;
 
-    /**
-     * 创建人
-     */
-    @TableField("create_user")
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    @TableField("update_user")
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Integer createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Integer updateTime;
 
-    /**
-     * 有效标记
-     */
-    private Byte mark;
 
     /**
      * 角色描述

src/main/java/com/taauav/admin/entity/SysAuthGroup.java

@@ -1,15 +1,13 @@
 package com.taauav.admin.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import org.hibernate.validator.constraints.Length;
-
 import javax.validation.constraints.NotEmpty;
-import java.io.Serializable;
 
 /**
  * <p>
@@ -23,15 +21,10 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_auth_group")
-public class SysAuthGroup implements Serializable {
+public class SysAuthGroup extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
 
     /**
      * 父级ID
@@ -48,12 +41,12 @@ public class SysAuthGroup implements Serializable {
     /**
      * 有无子级：1有 2无
      */
-    private Byte hasChild;
+    private Integer hasChild;
 
     /**
      * 角色层级
      */
-    private Byte level;
+    private Integer level;
 
     /**
      * 用户组拥有的规则id，多个规则","隔开
@@ -66,58 +59,25 @@ public class SysAuthGroup implements Serializable {
     @Length(max = 200, message = "备注不能超过200字")
     private String remark;
 
-    /**
-     * 状态：1正常 2禁用
-     */
-    private Byte status;
+
 
     /**
      * 排序
      */
     private Integer sort;
 
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
 
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
 
     @Override
     public String toString() {
         return "SysAuthGroup{" +
-                "id=" + id +
                 ", pid=" + pid +
                 ", name='" + name + '\'' +
                 ", hasChild=" + hasChild +
                 ", level=" + level +
                 ", rules='" + rules + '\'' +
                 ", remark='" + remark + '\'' +
-                ", status=" + status +
                 ", sort=" + sort +
-                ", createUser=" + createUser +
-                ", updateUser=" + updateUser +
-                ", createTime=" + createTime +
-                ", updateTime=" + updateTime +
-                ", mark=" + mark +
                 '}';
     }
 }

src/main/java/com/taauav/admin/entity/SysAuthGroupAccess.java

@@ -3,6 +3,8 @@ package com.taauav.admin.entity;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.taauav.common.domain.BaseEntity;
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -22,7 +24,7 @@ import javax.validation.constraints.NotEmpty;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_auth_group_access")
-public class SysAuthGroupAccess implements Serializable {
+public class SysAuthGroupAccess extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/taauav/admin/entity/SysAuthRule.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -28,11 +29,10 @@ import javax.validation.constraints.NotEmpty;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_auth_rule_new")
-public class SysAuthRule implements Serializable {
+public class SysAuthRule extends Entity {
 
     private static final long serialVersionUID = 1L;
-    @TableId(value = "id",type = IdType.AUTO)
-    private Integer id;
+
     /**
      * 规则唯一英文标识,全小写
      */
@@ -64,18 +64,18 @@ public class SysAuthRule implements Serializable {
      * 菜单层级
      */
     @TableField("`level`")
-    private Byte level;
+    private Integer level;
 
     /**
      * 有无子级：1有 2无
      */
-    private Byte hasChild;
+    private Integer hasChild;
 
     /**
      * 分类：1操作 2菜单
      */
     @TableField("`type`")
-    private Byte type;
+    private Integer type;
 
     /**
      * 图标
@@ -95,41 +95,12 @@ public class SysAuthRule implements Serializable {
     @Length(max = 200, message = "备注不能超过200字")
     private String remark;
 
-    /**
-     * 状态：1显示 2隐藏
-     */
-    @TableField("`status`")
-    private Byte status;
-
     /**
      * 排序
      */
     private Integer sort;
 
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
 
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
 
 
     public Map<Integer,String> getStatusList() {

src/main/java/com/taauav/admin/entity/SysCity.java

@@ -5,6 +5,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -21,11 +22,10 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_city")
-public class SysCity implements Serializable {
+public class SysCity extends Entity {
 
     private static final long serialVersionUID = 1L;
-    @TableId(value = "id",type = IdType.AUTO)
-    private Integer id;
+
     /**
      * 父级ID
      */
@@ -76,30 +76,7 @@ public class SysCity implements Serializable {
      */
     private Integer sort;
 
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
 
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Boolean mark;
 
 
 }

src/main/java/com/taauav/admin/entity/SysConfig.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,16 +26,10 @@ import javax.validation.constraints.NotNull;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class SysConfig implements Serializable {
+public class SysConfig extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * id
-     */
-    @TableId(value = "id",type = IdType.AUTO)
-    private Integer id;
-
     /**
      * 变量名
      */
@@ -107,13 +102,6 @@ public class SysConfig implements Serializable {
     @Length(max = 200, message = "备注不能超过200字")
     private String remark;
 
-    /**
-     * 状态：1正常 2禁用
-     */
-    @TableField("`status`")
-    @NotNull(message = "请选择状态")
-    private Byte status;
-
     /**
      * 排序
      */
@@ -121,30 +109,7 @@ public class SysConfig implements Serializable {
     @NotNull(message = "请填写排序")
     private Integer sort;
 
-    /**
-     * 创建人
-     */
-    private Integer createUser;
 
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
 
     /**
      * 获取字段类型配置

src/main/java/com/taauav/admin/entity/SysDep.java

@@ -3,6 +3,7 @@ package com.taauav.admin.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -22,15 +23,10 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class SysDep implements Serializable {
+public class SysDep extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
 
     /**
      * 部门名称
@@ -47,13 +43,13 @@ public class SysDep implements Serializable {
     /**
      * 部门层级
      */
-    private Byte level;
+    private Integer level;
 
     /**
      * 有无子节点：1有 2无
      */
     @TableField("has_child")
-    private Byte hasChild;
+    private Integer hasChild;
 
     /**
      * 部门主管
@@ -65,34 +61,4 @@ public class SysDep implements Serializable {
      */
     private Integer sort;
 
-    /**
-     * 创建人
-     */
-    @TableField("create_user")
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    @TableField("update_user")
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    @TableField("create_time")
-    private Integer createTime;
-
-    /**
-     * 更新时间
-     */
-    @TableField("update_time")
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
-
-
 }

src/main/java/com/taauav/admin/entity/SysDict.java

@@ -1,9 +1,8 @@
 package com.taauav.admin.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
+
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,15 +22,10 @@ import javax.validation.constraints.NotNull;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class SysDict implements Serializable {
+public class SysDict extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
 
     /**
      * 名称
@@ -56,14 +50,14 @@ public class SysDict implements Serializable {
     /**
      * 层级
      */
-    private Byte level;
+    private Integer level;
 
     /**
      * 有无子级：1有 2无
      */
     @NotNull(message = "请选择有无子类")
     @TableField("`has_child`")
-    private Byte hasChild;
+    private Integer hasChild;
 
     /**
      * 分类ID
@@ -85,43 +79,12 @@ public class SysDict implements Serializable {
     @Length(max = 200, message = "备注长度不能超过200字")
     private String remark;
 
-    /**
-     * 状态：1正常 2禁用
-     */
-    @NotNull(message = "请选择状态")
-    @TableField("`status`")
-    private Byte status;
-
     /**
      * 排序
      */
     @TableField("`sort`")
     private Integer sort;
 
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
 
 
 }

src/main/java/com/taauav/admin/entity/SysDictType.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -22,16 +24,10 @@ import javax.validation.constraints.NotNull;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class SysDictType implements Serializable {
+public class SysDictType extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
     /**
      * 名称
      */
@@ -54,30 +50,5 @@ public class SysDictType implements Serializable {
     @NotNull(message = "排序值不能为空")
     private Integer sort;
 
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
-
 
 }

src/main/java/com/taauav/admin/entity/SysLevel.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,15 +25,10 @@ import javax.validation.constraints.Pattern;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class SysLevel implements Serializable {
+public class SysLevel extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
 
     /**
      * 职级名称
@@ -47,42 +43,10 @@ public class SysLevel implements Serializable {
     @Length(max = 200, message = "备注不能超过200字")
     private String remark;
 
-    /**
-     * 状态：1正常 2禁用
-     */
-    @NotNull(message = "状态不能为空")
-    private Byte status;
-
     /**
      * 排序
      */
     @NotNull(message = "排序不能为空")
     private Integer sort;
 
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
-
-
 }

src/main/java/com/taauav/admin/entity/SysPosition.java

@@ -4,6 +4,7 @@ import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -23,16 +24,10 @@ import javax.validation.constraints.NotNull;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class SysPosition implements Serializable {
+public class SysPosition extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 编号
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
     /**
      * 名称
      */
@@ -51,41 +46,9 @@ public class SysPosition implements Serializable {
     @Length(max = 200, message = "备注不能超过200字")
     private String remark;
 
-    /**
-     * 状态：1正常 2禁用
-     */
-    @NotNull(message = "状态不能为空")
-    private Byte status;
-
     /**
      * 排序
      */
     private Integer sort;
 
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
-
-
 }

src/main/java/com/taauav/admin/entity/TauvDriver.java

@@ -56,7 +56,7 @@ public class TauvDriver extends Entity {
     /**
      * 是否省/国考河道：1是 2否
      */
-    private Byte isExam;
+    private Integer isExam;
 
     /**
      * 起点

src/main/java/com/taauav/admin/entity/TauvEquipment.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,11 +25,10 @@ import javax.validation.constraints.NotEmpty;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TauvEquipment implements Serializable {
+public class TauvEquipment extends Entity {
 
     private static final long serialVersionUID = 1L;
-    @TableId(value = "id",type = IdType.AUTO)
-    private Integer id;
+
     /**
      * 产品序号
      */
@@ -70,42 +70,13 @@ public class TauvEquipment implements Serializable {
     /**
      * 类型：1多旋翼 2固定翼
      */
-    private Byte type;
+    private Integer type;
 
     /**
      * 注册时间
      */
     private Integer registerTime;
 
-    /**
-     * 状态：1正常 2停用
-     */
-    private Byte status;
-
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
 
     public Map<Integer,String> getStatusList() {
         Map<Integer,String> map = new HashMap<>();

src/main/java/com/taauav/admin/entity/TauvInspect.java

@@ -11,6 +11,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -29,16 +30,10 @@ import javax.validation.constraints.*;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TauvInspect implements Serializable {
+public class TauvInspect extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
     /**
      * 巡检任务单号
      */
@@ -48,7 +43,7 @@ public class TauvInspect implements Serializable {
      * 类型：1日常任务 2周期性任务
      */
     @NotNull(message = "巡检类型不能为空")
-    private Byte type;
+    private Integer type;
 
     /**
      * 巡检目的
@@ -88,30 +83,7 @@ public class TauvInspect implements Serializable {
      */
     private String inspectResult;
 
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
 
-    /**
-     * 有效标记
-     */
-    private Byte mark;
     /**
      * 河道任务
      */

src/main/java/com/taauav/admin/entity/TauvInspectDriver.java

@@ -8,6 +8,7 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -25,15 +26,10 @@ import javax.validation.constraints.NotEmpty;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TauvInspectDriver implements Serializable {
+public class TauvInspectDriver extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
 
     /**
      * 巡检任务ID
@@ -99,7 +95,7 @@ public class TauvInspectDriver implements Serializable {
     /**
      * 是否省/国考河道：1是 2否
      */
-    private Byte driverExam;
+    private Integer driverExam;
 
     /**
      * 飞行小组
@@ -151,10 +147,6 @@ public class TauvInspectDriver implements Serializable {
      */
     private String remark;
 
-    /**
-     * 状态：1待分配 2待执行 3执行中 4已完成 5复核中 6复核完成
-     */
-    private Byte status;
     /**
      * 复核人
      */
@@ -163,29 +155,4 @@ public class TauvInspectDriver implements Serializable {
      * 复核时间
      */
     private Integer reviewTime;
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
-
 }

src/main/java/com/taauav/admin/entity/TauvInspectFile.java

@@ -7,6 +7,7 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -22,15 +23,10 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TauvInspectFile implements Serializable {
+public class TauvInspectFile extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
 
     /**
      * 巡检任务ID
@@ -57,7 +53,7 @@ public class TauvInspectFile implements Serializable {
     /**
      * 附件类型：1图片 2视频
      */
-    private Byte fileType;
+    private Integer fileType;
 
     /**
      * 文件类型：文件夹/文件
@@ -142,47 +138,17 @@ public class TauvInspectFile implements Serializable {
     /**
      * 是否已复核 1是 2否
      */
-    private Byte isReview;
+    private Integer isReview;
     /**
      * 是否有效：1是 2否
      */
-    private Byte isEffective;
-
-    /**
-     * 是否已标记：1是 2否
-     */
-    @TableField("`status`")
-    private Byte status;
+    private Integer isEffective;
 
     /**
      * 坐标检查：1处理成功 2待处理 3处理失败
      */
-    private Byte checkStatus;
+    private Integer checkStatus;
 
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
 
     public Map<String,String> getFileDocumentList() {
         Map<String,String> map = new HashMap<>(4);

src/main/java/com/taauav/admin/entity/TauvInspectFileBak.java

@@ -3,6 +3,8 @@ package com.taauav.admin.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -18,15 +20,10 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TauvInspectFileBak implements Serializable {
+public class TauvInspectFileBak extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
 
     /**
      * 巡检任务ID
@@ -51,7 +48,7 @@ public class TauvInspectFileBak implements Serializable {
     /**
      * 附件类型：1图片 2视频
      */
-    private Byte fileType;
+    private Integer fileType;
 
     /**
      * 文件类型：文件夹/文件
@@ -129,47 +126,17 @@ public class TauvInspectFileBak implements Serializable {
     /**
      * 是否已复核：1是 2否
      */
-    private Byte isReview;
+    private Integer isReview;
 
     /**
      * 是否有效：1是 2否
      */
-    private Byte isEffective;
-
-    /**
-     * 是否已标记：1是 2否
-     */
-    private Byte status;
+    private Integer isEffective;
 
     /**
      * 坐标检查：1处理成功 2待处理 3处理失败
      */
-    private Byte checkStatus;
-
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
+    private Integer checkStatus;
 
 
 }

src/main/java/com/taauav/admin/entity/TauvQuestionOptions.java

@@ -6,6 +6,7 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -27,23 +28,21 @@ import javax.validation.constraints.NotNull;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TauvQuestionOptions implements Serializable {
+public class TauvQuestionOptions extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
     /**
      * 分类：1水面 2岸线 3排口 4水质
      */
     @NotNull(message = "请选项分类")
-    private Byte category;
+    private Integer category;
 
     /**
      * 类型：1日常监测 2重点核查
      */
     @NotNull(message = "请选择类型")
-    private Byte type;
+    private Integer type;
 
     /**
      * 问题选项
@@ -89,36 +88,6 @@ public class TauvQuestionOptions implements Serializable {
      */
     private Integer sort;
 
-    /**
-     * 状态1：启用、2：禁用
-     */
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
-
     public Map<Integer,String> getStatusList() {
         Map<Integer,String> map = new HashMap<>(2);
         map.put(1,"正常");

src/main/java/com/taauav/admin/entity/TauvReport.java

@@ -7,6 +7,7 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -22,15 +23,10 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TauvReport implements Serializable {
+public class TauvReport extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
 
     /**
      * 报告编号
@@ -87,7 +83,7 @@ public class TauvReport implements Serializable {
     /**
      * 是否省/国考河道：1是 2否
      */
-    private Byte driverExam;
+    private Integer driverExam;
 
     /**
      * 巡检总长
@@ -163,37 +159,13 @@ public class TauvReport implements Serializable {
      */
     private Integer totalCheckScore;
 
-    /**
-     * 巡检任务状态：1待生成 2审核中 3审核通过 4审核驳回
-     */
-    @TableField(value = "`status`")
-    private Byte status;
-
     /**
      * 报告描述
      */
     @TableField(value = "`desc`")
     private String desc;
 
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
 
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
 
     /**
      * 创建人
@@ -205,10 +177,7 @@ public class TauvReport implements Serializable {
      */
     private Integer inputTime;
 
-    /**
-     * 有效标记
-     */
-    private Byte mark;
+
 
     /**
      * 是否省/国考

src/main/java/com/taauav/admin/entity/TauvReportCheck.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -19,12 +21,10 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TauvReportCheck implements Serializable {
+public class TauvReportCheck extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
 
     /**
      * 报告编号
@@ -36,24 +36,17 @@ public class TauvReportCheck implements Serializable {
      */
     private String remark;
 
-    /**
-     * 3.通过 4.驳回
-     */
-    private Byte status;
-
     /**
      * 审核人编号
      */
     private Integer checkUser;
+
     @TableField(exist = false)
     private String formatCheckUser;
 
-    private Integer createTime;
     @TableField(exist = false)
     private String formatCreateTime;
-    private Integer updateTime;
 
-    private Byte mark;
 
 
 }

src/main/java/com/taauav/admin/entity/TauvReportEvaluation.java

@@ -6,6 +6,7 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,16 +25,10 @@ import javax.validation.constraints.NotEmpty;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TauvReportEvaluation implements Serializable {
+public class TauvReportEvaluation extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * ID
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
     /**
      * 评价内容
      */
@@ -52,35 +47,6 @@ public class TauvReportEvaluation implements Serializable {
      */
     private Integer sort;
 
-    /**
-     * 状态1：启用、2：禁用
-     */
-    private Integer status;
-
-    /**
-     * 创建人
-     */
-    private Integer createUser;
-
-    /**
-     * 更新人
-     */
-    private Integer updateUser;
-
-    /**
-     * 创建时间
-     */
-    private Integer createTime;
-
-    /**
-     * 更新时间
-     */
-    private Integer updateTime;
-
-    /**
-     * 有效标记
-     */
-    private Byte mark;
 
     public Map<Integer,String> getStatusList() {
         Map<Integer,String> map = new HashMap<>(2);

src/main/java/com/taauav/admin/entity/TauvReportRemark.java

@@ -3,6 +3,8 @@ package com.taauav.admin.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.taauav.common.domain.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -18,12 +20,10 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TauvReportRemark implements Serializable {
+public class TauvReportRemark extends Entity {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
 
     /**
      * 报告表编号
@@ -49,12 +49,4 @@ public class TauvReportRemark implements Serializable {
      * 备注
      */
     private String remark;
-
-    private Integer createTime;
-
-    private Integer updateTime;
-
-    private Boolean mark;
-
-
 }

src/main/java/com/taauav/admin/service/ISysAdminService.java

@@ -3,6 +3,7 @@ package com.taauav.admin.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysAdmin;
+import com.taauav.common.service.IBaseService;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +16,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-04
  */
-public interface ISysAdminService extends IService<SysAdmin> {
+public interface ISysAdminService extends IBaseService<SysAdmin> {
     /**
      * 根据用户获取数据
      * @param username

src/main/java/com/taauav/admin/service/ISysAuthGroupAccessService.java

@@ -1,7 +1,7 @@
 package com.taauav.admin.service;
 
 import com.taauav.admin.entity.SysAuthGroupAccess;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.List;
 import java.util.Map;
@@ -11,7 +11,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-04
  */
-public interface ISysAuthGroupAccessService extends IService<SysAuthGroupAccess> {
+public interface ISysAuthGroupAccessService extends IBaseService<SysAuthGroupAccess> {
     /**
      * 根据角色编号获取用户列表
      * @param groupId

src/main/java/com/taauav/admin/service/ISysAuthGroupService.java

@@ -3,7 +3,7 @@ package com.taauav.admin.service;
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysAdmin;
 import com.taauav.admin.entity.SysAuthGroup;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.List;
 import java.util.Map;
@@ -16,7 +16,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-04
  */
-public interface ISysAuthGroupService extends IService<SysAuthGroup> {
+public interface ISysAuthGroupService extends IBaseService<SysAuthGroup> {
 
     /**
      * 根据用户编号获取权限

src/main/java/com/taauav/admin/service/ISysAuthRuleService.java

@@ -4,7 +4,8 @@ import com.taauav.common.bean.Menu;
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysAdmin;
 import com.taauav.admin.entity.SysAuthRule;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
+
 import java.util.List;
 import java.util.Map;
 
@@ -16,7 +17,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-04
  */
-public interface ISysAuthRuleService extends IService<SysAuthRule> {
+public interface ISysAuthRuleService extends IBaseService<SysAuthRule> {
     /**
      * 获取用户拥有的菜单权限
      * @return

src/main/java/com/taauav/admin/service/ISysCityService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysCity;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +15,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-13
  */
-public interface ISysCityService extends IService<SysCity> {
+public interface ISysCityService extends IBaseService<SysCity> {
     /**
      * 根据父级编号获取数据
      * @param pid 320100  南京编号

src/main/java/com/taauav/admin/service/ISysConfigService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysConfig;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.Map;
 
@@ -14,7 +14,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-12
  */
-public interface ISysConfigService extends IService<SysConfig> {
+public interface ISysConfigService extends IBaseService<SysConfig> {
     /**
      * 获取列表分页数据
      * @param map

src/main/java/com/taauav/admin/service/ISysDepService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysDep;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.Map;
 
@@ -14,7 +14,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-07
  */
-public interface ISysDepService extends IService<SysDep> {
+public interface ISysDepService extends IBaseService<SysDep> {
 
     /**
      * 列表

src/main/java/com/taauav/admin/service/ISysDictService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysDict;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +15,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-14
  */
-public interface ISysDictService extends IService<SysDict> {
+public interface ISysDictService extends IBaseService<SysDict> {
     /**
      * 获取列表分页数据
      * @param map

src/main/java/com/taauav/admin/service/ISysDictTypeService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysDictType;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.Map;
 
@@ -14,7 +14,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-14
  */
-public interface ISysDictTypeService extends IService<SysDictType> {
+public interface ISysDictTypeService extends IBaseService<SysDictType> {
     /**
      * 获取列表分页数据
      * @param map

src/main/java/com/taauav/admin/service/ISysLevelService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysLevel;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.Map;
 
@@ -14,7 +14,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-11
  */
-public interface ISysLevelService extends IService<SysLevel> {
+public interface ISysLevelService extends IBaseService<SysLevel> {
     /**
      * 获取职级分页列表
      * @param map
@@ -49,5 +49,5 @@ public interface ISysLevelService extends IService<SysLevel> {
      * @param status
      * @return
      */
-    Response changeStatus(Integer id, Byte status);
+    Response changeStatus(Integer id, Integer status);
 }

src/main/java/com/taauav/admin/service/ISysPositionService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysPosition;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.Map;
 
@@ -14,7 +14,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-12
  */
-public interface ISysPositionService extends IService<SysPosition> {
+public interface ISysPositionService extends IBaseService<SysPosition> {
     /**
      * 岗位列表
      * @param map
@@ -49,5 +49,5 @@ public interface ISysPositionService extends IService<SysPosition> {
      * @param status
      * @return
      */
-    Response changeStatus(Integer id, Byte status);
+    Response changeStatus(Integer id, Integer status);
 }

src/main/java/com/taauav/admin/service/ITauvEquipmentService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.TauvEquipment;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.Map;
 
@@ -14,7 +14,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-13
  */
-public interface ITauvEquipmentService extends IService<TauvEquipment> {
+public interface ITauvEquipmentService extends IBaseService<TauvEquipment> {
     /**
      * 获取设备分页数据
      * @param map

src/main/java/com/taauav/admin/service/ITauvInspectDriverService.java

@@ -3,8 +3,8 @@ package com.taauav.admin.service;
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.TauvInspect;
 import com.taauav.admin.entity.TauvInspectDriver;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.taauav.admin.validate.ExecuteTask;
+import com.taauav.common.service.IBaseService;
 
 import java.util.Map;
 
@@ -16,7 +16,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-14
  */
-public interface ITauvInspectDriverService extends IService<TauvInspectDriver> {
+public interface ITauvInspectDriverService extends IBaseService<TauvInspectDriver> {
 
     /**
      * 添加任务对应数据

src/main/java/com/taauav/admin/service/ITauvInspectFileBakService.java

@@ -1,7 +1,7 @@
 package com.taauav.admin.service;
 
 import com.taauav.admin.entity.TauvInspectFileBak;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author dyg
  * @since 2019-11-29
  */
-public interface ITauvInspectFileBakService extends IService<TauvInspectFileBak> {
+public interface ITauvInspectFileBakService extends IBaseService<TauvInspectFileBak> {
 
 }

src/main/java/com/taauav/admin/service/ITauvInspectFileService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.TauvInspectFile;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.io.File;
 import java.io.IOException;
@@ -17,7 +17,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-14
  */
-public interface ITauvInspectFileService extends IService<TauvInspectFile> {
+public interface ITauvInspectFileService extends IBaseService<TauvInspectFile> {
     /**
      * 根据条件获取分页数据
      * @return

src/main/java/com/taauav/admin/service/ITauvInspectService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.TauvInspect;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 /**
  * <p>
@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author dyg
  * @since 2019-11-14
  */
-public interface ITauvInspectService extends IService<TauvInspect> {
+public interface ITauvInspectService extends IBaseService<TauvInspect> {
     /**
      * 添加任务
      * @param inspect

src/main/java/com/taauav/admin/service/ITauvQuestionOptionsService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.TauvQuestionOptions;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +15,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-13
  */
-public interface ITauvQuestionOptionsService extends IService<TauvQuestionOptions> {
+public interface ITauvQuestionOptionsService extends IBaseService<TauvQuestionOptions> {
     /**
      * 分页数据列表
      * @param map

src/main/java/com/taauav/admin/service/ITauvReportCheckService.java

@@ -1,7 +1,7 @@
 package com.taauav.admin.service;
 
 import com.taauav.admin.entity.TauvReportCheck;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @author dyg
  * @since 2019-11-29
  */
-public interface ITauvReportCheckService extends IService<TauvReportCheck> {
+public interface ITauvReportCheckService extends IBaseService<TauvReportCheck> {
     /**
      * 根据报告编号获取审核数据
      * @param reportId

src/main/java/com/taauav/admin/service/ITauvReportEvaluationService.java

@@ -2,7 +2,7 @@ package com.taauav.admin.service;
 
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.TauvReportEvaluation;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +15,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-14
  */
-public interface ITauvReportEvaluationService extends IService<TauvReportEvaluation> {
+public interface ITauvReportEvaluationService extends IBaseService<TauvReportEvaluation> {
 
     Response getPageList(Map<String,String> map);
 

src/main/java/com/taauav/admin/service/ITauvReportRemarkService.java

@@ -1,7 +1,7 @@
 package com.taauav.admin.service;
 
 import com.taauav.admin.entity.TauvReportRemark;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 /**
  * <p>
@@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author dyg
  * @since 2019-11-29
  */
-public interface ITauvReportRemarkService extends IService<TauvReportRemark> {
+public interface ITauvReportRemarkService extends IBaseService<TauvReportRemark> {
     /**
      * 根据报告编号和问题编号获取数据
      * @param reportId

src/main/java/com/taauav/admin/service/ITauvReportService.java

@@ -3,7 +3,7 @@ package com.taauav.admin.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.TauvReport;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.taauav.common.service.IBaseService;
 
 import java.util.List;
 import java.util.Map;
@@ -16,7 +16,7 @@ import java.util.Map;
  * @author dyg
  * @since 2019-11-22
  */
-public interface ITauvReportService extends IService<TauvReport> {
+public interface ITauvReportService extends IBaseService<TauvReport> {
     /**
      * 添加报告
      * @param report

src/main/java/com/taauav/admin/service/impl/SysAdminServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.taauav.common.bean.CacheUser;
 import com.taauav.common.bean.Response;
 import com.taauav.common.constant.SysAdminConstant;
@@ -17,6 +16,8 @@ import com.taauav.admin.service.ISysAdminService;
 import com.taauav.admin.service.ISysAuthGroupAccessService;
 import com.taauav.admin.service.ISysAuthRuleService;
 import com.taauav.admin.service.ISysCityService;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.apache.shiro.SecurityUtils;
@@ -45,7 +46,7 @@ import java.util.*;
  * @since 2019-11-04
  */
 @Service
-public class SysAdminServiceImpl extends ServiceImpl<SysAdminMapper, SysAdmin> implements ISysAdminService {
+public class SysAdminServiceImpl extends BaseServiceImpl<SysAdminMapper, SysAdmin> implements ISysAdminService {
     @Resource
     private Response response;
     @Value("${spring.pageSize}")
@@ -322,11 +323,11 @@ public class SysAdminServiceImpl extends ServiceImpl<SysAdminMapper, SysAdmin> i
         }
         if (id != null && id > 0) {
             admin.setUpdateUser(ShiroUtils.getAdminId());
-            admin.setUpdateTime(FunctionUtils.now());
+            admin.setUpdateTime(DateUtil.now());
             Integer res = sysAdminMapper.updateById(admin);
         } else {
             admin.setCreateUser(ShiroUtils.getAdminId());
-            admin.setCreateTime(FunctionUtils.now());
+            admin.setCreateTime(DateUtil.now());
             Integer res = sysAdminMapper.insert(admin);
             id = admin.getId();
         }
@@ -368,7 +369,7 @@ public class SysAdminServiceImpl extends ServiceImpl<SysAdminMapper, SysAdmin> i
         String savePermit = "savePermit";
         if (drop.equals(act)) {
             //逻辑删除
-            admin.setMark(Byte.valueOf("0"));
+            admin.setMark(Integer.valueOf("0"));
         } else if (reset.equals(act)) {
             //重置密码
             admin.setPassword(FunctionUtils.password("123456"));
@@ -379,9 +380,9 @@ public class SysAdminServiceImpl extends ServiceImpl<SysAdminMapper, SysAdmin> i
                 return response.failure("管理员状态不能为空");
             }
             if (Integer.valueOf(status) == 1) {
-                admin.setStatus(Byte.valueOf("2"));
+                admin.setStatus(Integer.valueOf("2"));
             } else {
-                admin.setStatus(Byte.valueOf("1"));
+                admin.setStatus(Integer.valueOf("1"));
             }
         } else if (savePermit.equals(act)){
             //保存权限数据
@@ -391,7 +392,7 @@ public class SysAdminServiceImpl extends ServiceImpl<SysAdminMapper, SysAdmin> i
             return response.failure("操作方法不存在");
         }
         admin.setUpdateUser(ShiroUtils.getAdminId());
-        admin.setUpdateTime(FunctionUtils.now());
+        admin.setUpdateTime(DateUtil.now());
         Boolean res = updateById(admin);
         return response.success("操作成功");
     }

src/main/java/com/taauav/admin/service/impl/SysAuthGroupAccessServiceImpl.java

@@ -5,7 +5,7 @@ import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysAuthGroupAccess;
 import com.taauav.admin.mapper.SysAuthGroupAccessMapper;
 import com.taauav.admin.service.ISysAuthGroupAccessService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -21,7 +21,7 @@ import java.util.*;
  * @since 2019-11-04
  */
 @Service
-public class SysAuthGroupAccessServiceImpl extends ServiceImpl<SysAuthGroupAccessMapper, SysAuthGroupAccess> implements ISysAuthGroupAccessService {
+public class SysAuthGroupAccessServiceImpl extends BaseServiceImpl<SysAuthGroupAccessMapper, SysAuthGroupAccess> implements ISysAuthGroupAccessService {
     @Autowired
     private Response response;
     @Autowired

src/main/java/com/taauav/admin/service/impl/SysAuthGroupServiceImpl.java

@@ -12,6 +12,8 @@ import com.taauav.admin.service.ISysAuthGroupAccessService;
 import com.taauav.admin.service.ISysAuthGroupService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.taauav.admin.service.ISysConfigService;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +32,7 @@ import java.util.*;
  * @since 2019-11-04
  */
 @Service
-public class SysAuthGroupServiceImpl extends ServiceImpl<SysAuthGroupMapper, SysAuthGroup> implements ISysAuthGroupService {
+public class SysAuthGroupServiceImpl extends BaseServiceImpl<SysAuthGroupMapper, SysAuthGroup> implements ISysAuthGroupService {
     @Resource
     private SysAuthGroupMapper authGroupMapper;
     @Resource
@@ -155,9 +157,8 @@ public class SysAuthGroupServiceImpl extends ServiceImpl<SysAuthGroupMapper, Sys
      */
     @Override
     public Response add(SysAuthGroup authGroup) {
-        Integer t = FunctionUtils.getCurrentTime();
         Integer adminId = ShiroUtils.getAdminId();
-        authGroup.setCreateTime(t);
+        authGroup.setCreateTime(DateUtil.now());
         authGroup.setCreateUser(adminId);
         SysAuthGroup exit = getInfoByName(authGroup.getName());
         if (!StringUtils.isEmpty(exit)) {
@@ -214,7 +215,7 @@ public class SysAuthGroupServiceImpl extends ServiceImpl<SysAuthGroupMapper, Sys
         }
         SysAuthGroup delSet = new SysAuthGroup();
         delSet.setId(authGroup.getId());
-        delSet.setMark(Byte.valueOf("0"));
+        delSet.setMark(0);
         Integer res = authGroupMapper.updateById(delSet);
         return response.success("操作成功", res);
     }
@@ -274,7 +275,7 @@ public class SysAuthGroupServiceImpl extends ServiceImpl<SysAuthGroupMapper, Sys
         if ("2".equals(status) || "1".equals(status)) {
             SysAuthGroup sysAuthGroup= new SysAuthGroup();
             sysAuthGroup.setId(Integer.valueOf(idStr));
-            sysAuthGroup.setStatus(Byte.valueOf(status));
+            sysAuthGroup.setStatus(Integer.valueOf(status));
             authGroupMapper.updateById(sysAuthGroup);
             return response.success("操作成功");
         } else {
@@ -289,7 +290,7 @@ public class SysAuthGroupServiceImpl extends ServiceImpl<SysAuthGroupMapper, Sys
     private Map<String,Object> formatInfo(Map<String,Object> map) {
         String createTime = map.get("create_time").toString();
         String status = map.get("status").toString();
-        map.put("format_create_time",FunctionUtils.formatTime(Integer.valueOf(createTime),"yyyy-MM-dd HH:mm:ss"));
+        map.put("format_create_time",createTime);
         String statusText = "1".equals(status) ? "正常" : "禁用";
         map.put("status_text",statusText);
         map.put("format_create_user","");

src/main/java/com/taauav/admin/service/impl/SysAuthRuleServiceImpl.java

@@ -11,7 +11,8 @@ import com.taauav.admin.mapper.SysAuthRuleMapper;
 import com.taauav.admin.service.ISysAdminService;
 import com.taauav.admin.service.ISysAuthGroupService;
 import com.taauav.admin.service.ISysAuthRuleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.MenuTree;
 import com.taauav.common.util.ShiroUtils;
@@ -38,7 +39,7 @@ import java.util.*;
 @Service
 @Slf4j
 @Data
-public class SysAuthRuleServiceImpl extends ServiceImpl<SysAuthRuleMapper, SysAuthRule> implements ISysAuthRuleService {
+public class SysAuthRuleServiceImpl extends BaseServiceImpl<SysAuthRuleMapper, SysAuthRule> implements ISysAuthRuleService {
     @Value("${spring.pageSize}")
     private Integer pageSize;
 
@@ -170,7 +171,7 @@ public class SysAuthRuleServiceImpl extends ServiceImpl<SysAuthRuleMapper, SysAu
                 return response.failure("名称已经存在");
             }
         }
-        Integer addTime = FunctionUtils.getCurrentTime();
+        Date addTime = DateUtil.now();
         authRule.setUpdateTime(addTime);
         authRule.setUpdateUser(ShiroUtils.getAdminId());
         authRuleMapper.updateById(authRule);
@@ -207,14 +208,14 @@ public class SysAuthRuleServiceImpl extends ServiceImpl<SysAuthRuleMapper, SysAu
         if ( !StringUtils.isEmpty(pid)) {
             SysAuthRule authRuleInfo = authRuleMapper.selectById(pid);
             if (!StringUtils.isEmpty(authRuleInfo)) {
-                Byte level = authRuleInfo.getLevel();
-                authRule.setLevel(Byte.valueOf((Integer.valueOf(level) +1)+""));
+                Integer level = authRuleInfo.getLevel();
+                authRule.setLevel(level+1);
             }
         }
         Integer addTime = FunctionUtils.getCurrentTime();
-        authRule.setCreateTime(addTime);
+        authRule.setCreateTime(DateUtil.now());
         authRule.setCreateUser(ShiroUtils.getAdminId());
-        authRule.setMark(Byte.valueOf("1"));
+        authRule.setMark(1);
         authRuleMapper.insert(authRule);
         return response.success("添加成功");
     }
@@ -235,7 +236,7 @@ public class SysAuthRuleServiceImpl extends ServiceImpl<SysAuthRuleMapper, SysAu
             return response.failure("数据不存在");
         }
         SysAuthRule delSet = new SysAuthRule();
-        delSet.setMark(Byte.valueOf("0"));
+        delSet.setMark(0);
         delSet.setId(authRule.getId());
         authRuleMapper.updateById(delSet);
         return response.success("删除成功");
@@ -298,7 +299,7 @@ public class SysAuthRuleServiceImpl extends ServiceImpl<SysAuthRuleMapper, SysAu
         if ("2".equals(status) || "1".equals(status)) {
             SysAuthRule sysAuthRule = new SysAuthRule();
             sysAuthRule.setId(Integer.valueOf(idStr));
-            sysAuthRule.setStatus(Byte.valueOf(status));
+            sysAuthRule.setStatus(Integer.valueOf(status));
             authRuleMapper.updateById(sysAuthRule);
             return response.success("操作成功");
         } else {

src/main/java/com/taauav/admin/service/impl/SysCityServiceImpl.java

@@ -8,8 +8,9 @@ import com.taauav.admin.mapper.SysAdminMapper;
 import com.taauav.admin.mapper.SysCityMapper;
 import com.taauav.admin.mapper.TauvDriverMapper;
 import com.taauav.admin.service.ISysCityService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
 import com.taauav.common.util.ShiroUtils;
+import com.taauav.common.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,7 +27,7 @@ import java.util.Map;
  * @since 2019-11-13
  */
 @Service
-public class SysCityServiceImpl extends ServiceImpl<SysCityMapper, SysCity> implements ISysCityService {
+public class SysCityServiceImpl extends BaseServiceImpl<SysCityMapper, SysCity> implements ISysCityService {
     @Autowired
     private SysCityMapper sysCityMapper;
     @Autowired
@@ -62,10 +63,12 @@ public class SysCityServiceImpl extends ServiceImpl<SysCityMapper, SysCity> impl
         SysAdmin admin = adminMapper.selectById(adminId);
         if (!"".equals(admin.getCityIds())) {
             QueryWrapper<SysCity> wrapper = new QueryWrapper<>();
-            String[] ids = admin.getCityIds().split(",");
+            if (!StringUtils.isEmpty(admin.getCityIds())) {
+                String[] ids = admin.getCityIds().split(",");
+                wrapper.in("id", ids);
+            }
             wrapper.eq("pid", pid);
             wrapper.eq("mark", 1);
-            wrapper.in("id", ids);
             wrapper.select("id,pid,name,longitude,latitude");
             List<Map<String,Object>> list = sysCityMapper.selectMaps(wrapper);
             return list;

src/main/java/com/taauav/admin/service/impl/SysConfigServiceImpl.java

@@ -7,7 +7,8 @@ import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.SysConfig;
 import com.taauav.admin.mapper.SysConfigMapper;
 import com.taauav.admin.service.ISysConfigService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@ import java.util.Set;
  * @since 2019-11-12
  */
 @Service
-public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
+public class SysConfigServiceImpl extends BaseServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
     @Autowired
     private Response response;
     @Value("${spring.pageSize}")
@@ -135,11 +136,11 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
             }
         }
         if (map.getId() != null && map.getId() > 0) {
-            map.setUpdateTime(FunctionUtils.now());
+            map.setUpdateTime(DateUtil.now());
             map.setUpdateUser(ShiroUtils.getAdminId());
             updateById(map);
         } else {
-            map.setCreateTime(FunctionUtils.now());
+            map.setCreateTime(DateUtil.now());
             map.setCreateUser(ShiroUtils.getAdminId());
             save(map);
         }
@@ -166,9 +167,9 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
             return response.failure("对应配置数据不存在");
         }
         if (status == 1) {
-            config.setStatus(Byte.valueOf("2"));
+            config.setStatus(Integer.valueOf("2"));
         } else {
-            config.setStatus(Byte.valueOf("1"));
+            config.setStatus(Integer.valueOf("1"));
         }
         updateById(config);
         return response.success("操作成功");

src/main/java/com/taauav/admin/service/impl/SysDepServiceImpl.java

@@ -8,7 +8,8 @@ import com.taauav.admin.mapper.SysAdminMapper;
 import com.taauav.admin.mapper.SysDepMapper;
 import com.taauav.admin.service.ISysAdminService;
 import com.taauav.admin.service.ISysDepService;
-import com.taauav.common.util.FunctionUtils;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,7 +28,7 @@ import java.util.*;
  * @since 2019-11-07
  */
 @Service
-public class SysDepServiceImpl extends ServiceImpl<SysDepMapper, SysDep> implements ISysDepService {
+public class SysDepServiceImpl extends BaseServiceImpl<SysDepMapper, SysDep> implements ISysDepService {
     @Resource
     private Response response;
     @Autowired
@@ -73,11 +74,11 @@ public class SysDepServiceImpl extends ServiceImpl<SysDepMapper, SysDep> impleme
                 }
                 map.put("createUserName", pCreateUser);
                 String pCreateTime = "";
-                if (sysDep.getCreateTime() > 0) {
-                    pCreateTime = FunctionUtils.formatTime(sysDep.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+                if (sysDep.getCreateTime() != null) {
+                    pCreateTime = DateUtil.format(sysDep.getCreateTime(),"yyyy-MM-dd HH:mm:ss");
                 }
                 map.put("formatCreateTime", pCreateTime);
-                Byte hasChild = sysDep.getHasChild();
+                Integer hasChild = sysDep.getHasChild();
                 if (Integer.valueOf(hasChild) == 1) {
                     QueryWrapper wrp = new QueryWrapper();
                     wrp.eq("mark", 1);
@@ -110,8 +111,8 @@ public class SysDepServiceImpl extends ServiceImpl<SysDepMapper, SysDep> impleme
                             }
                             vl.put("createUserName", fCreateUser);
                             String fCreateTime = "";
-                            if (child.getCreateTime() > 0) {
-                                fCreateTime = FunctionUtils.formatTime(child.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+                            if (child.getCreateTime() != null) {
+                                fCreateTime = DateUtil.format(child.getCreateTime(),"yyyy-MM-dd HH:mm:ss");
                             }
                             vl.put("formatCreateTime", fCreateTime);
                             if (Integer.valueOf(child.getHasChild()) == 1) {
@@ -141,8 +142,8 @@ public class SysDepServiceImpl extends ServiceImpl<SysDepMapper, SysDep> impleme
                                         }
                                         cld.put("createUserName", createUserName);
                                         String formatCreateTime = "";
-                                        if (cl.getCreateTime() > 0) {
-                                            formatCreateTime = FunctionUtils.formatTime(cl.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+                                        if (cl.getCreateTime() != null) {
+                                            formatCreateTime = DateUtil.format(cl.getCreateTime(),"yyyy-MM-dd HH:mm:ss");
                                         }
                                         cld.put("formatCreateTime", formatCreateTime);
                                         thirdChild.add(cld);
@@ -214,11 +215,11 @@ public class SysDepServiceImpl extends ServiceImpl<SysDepMapper, SysDep> impleme
         Integer id = map.getId();
         if (id == null) {
             dep.setCreateUser(ShiroUtils.getAdminId());
-            dep.setCreateTime(FunctionUtils.now());
+            dep.setCreateTime(DateUtil.now());
         } else {
             dep.setId(id);
             dep.setUpdateUser(ShiroUtils.getAdminId());
-            dep.setUpdateTime(FunctionUtils.now());
+            dep.setUpdateTime(DateUtil.now());
         }
         dep.setName(map.getName());
         dep.setPid(map.getPid());
@@ -229,7 +230,7 @@ public class SysDepServiceImpl extends ServiceImpl<SysDepMapper, SysDep> impleme
                 level = pInfo.getLevel() + 1;
             }
         }
-        dep.setLevel(Byte.valueOf(String.valueOf(level)));
+        dep.setLevel(level);
         dep.setManager(map.getManager());
         dep.setHasChild(map.getHasChild());
         dep.setSort(map.getSort());
@@ -262,9 +263,9 @@ public class SysDepServiceImpl extends ServiceImpl<SysDepMapper, SysDep> impleme
         }
         SysDep dep = new SysDep();
         dep.setId(Integer.valueOf(id));
-        dep.setMark(Byte.valueOf("0"));
+        dep.setMark(Integer.valueOf("0"));
         dep.setUpdateUser(ShiroUtils.getAdminId());
-        dep.setUpdateTime(FunctionUtils.now());
+        dep.setUpdateTime(DateUtil.now());
         Boolean res = updateById(dep);
         if (res.equals(false)) {
             return response.failure("操作失败");

src/main/java/com/taauav/admin/service/impl/SysDictServiceImpl.java

@@ -8,7 +8,8 @@ import com.taauav.admin.entity.SysDict;
 import com.taauav.admin.mapper.SysDictMapper;
 import com.taauav.admin.service.ISysAdminService;
 import com.taauav.admin.service.ISysDictService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +33,7 @@ import java.util.Set;
  * @since 2019-11-14
  */
 @Service
-public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> implements ISysDictService {
+public class SysDictServiceImpl extends BaseServiceImpl<SysDictMapper, SysDict> implements ISysDictService {
     @Value("${spring.pageSize}")
     private Integer pageSize;
     @Autowired
@@ -74,8 +75,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
             //添加时间筛选
             String startTime = "startTime";
             String endTime = "endTime";
-            if (map.containsKey(startTime) && map.containsKey(endTime) && FunctionUtils.isNumeric(map.get(startTime)) && FunctionUtils.isNumeric(map.get(endTime))) {
-                wrapper.between("`create_time`", Integer.valueOf(map.get(startTime)), Integer.valueOf(map.get(endTime)));
+            if (map.containsKey(startTime) && map.containsKey(endTime) ) {
+                wrapper.between("`create_time`", map.get(startTime), map.get(endTime));
             }
             pageNo = map.containsKey("page") && Integer.valueOf(map.get("page")) > 0 ? Integer.valueOf(map.get("page")) : 1;
             //每页条数
@@ -90,8 +91,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
             for (Map<String, Object> mp : data.getRecords()) {
                 Integer createUser = new Long(mp.get("create_user").toString()).intValue();
                 mp.put("createUserName", adminService.getRealNameById(createUser));
-                Integer createTime = new Long(mp.get("create_time").toString()).intValue();
-                mp.put("formatCreateTime", FunctionUtils.formatTime(createTime, "yyyy-MM-dd HH:mm:ss"));
+
+                mp.put("formatCreateTime", mp.get("create_time").toString());
                 if ((Integer) mp.get("has_child") == 1) {
                     QueryWrapper query = new QueryWrapper();
                     query.eq("mark", 1);
@@ -101,8 +102,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
                         for (Map<String, Object> val : fChild) {
                             createUser = new Long(val.get("create_user").toString()).intValue();
                             val.put("createUserName", adminService.getRealNameById(createUser));
-                            createTime = new Long(val.get("create_time").toString()).intValue();
-                            val.put("formatCreateTime", FunctionUtils.formatTime(createTime, "yyyy-MM-dd HH:mm:ss"));
+                            val.put("formatCreateTime", val.get("create_time").toString());
                             if ((Integer) val.get("has_child") == 1) {
                                 QueryWrapper cond = new QueryWrapper();
                                 cond.eq("pid", val.get("id"));
@@ -112,8 +112,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
                                     for (Map<String, Object> item : sChild) {
                                         createUser = new Long(item.get("create_user").toString()).intValue();
                                         item.put("createUserName", adminService.getRealNameById(createUser));
-                                        createTime = new Long(item.get("create_time").toString()).intValue();
-                                        item.put("formatCreateTime", FunctionUtils.formatTime(createTime, "yyyy-MM-dd HH:mm:ss"));
+                                        item.put("formatCreateTime", item.get("create_time").toString());
                                     }
                                     val.put("children", sChild);
                                 }
@@ -153,11 +152,11 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
             }
         }
         if (map.getId() != null && map.getId() > 0) {
-            map.setUpdateTime(FunctionUtils.now());
+            map.setUpdateTime(DateUtil.now());
             map.setUpdateUser(ShiroUtils.getAdminId());
             updateById(map);
         } else {
-            map.setCreateTime(FunctionUtils.now());
+            map.setCreateTime(DateUtil.now());
             map.setCreateUser(ShiroUtils.getAdminId());
             save(map);
         }

src/main/java/com/taauav/admin/service/impl/SysDictTypeServiceImpl.java

@@ -8,7 +8,8 @@ import com.taauav.admin.entity.SysDictType;
 import com.taauav.admin.mapper.SysDictTypeMapper;
 import com.taauav.admin.service.ISysAdminService;
 import com.taauav.admin.service.ISysDictTypeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +32,7 @@ import java.util.Set;
  * @since 2019-11-14
  */
 @Service
-public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {
+public class SysDictTypeServiceImpl extends BaseServiceImpl<SysDictTypeMapper, SysDictType> implements ISysDictTypeService {
     @Value("${spring.pageSize}")
     private Integer pageSize;
     @Autowired
@@ -90,8 +91,7 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
             for (Map<String, Object> mp : data.getRecords()) {
                 Integer createUser = new Long(mp.get("create_user").toString()).intValue();
                 mp.put("createUserName", adminService.getRealNameById(createUser));
-                Integer createTime = new Long(mp.get("create_time").toString()).intValue();
-                mp.put("formatCreateTime", FunctionUtils.formatTime(createTime, "yyyy-MM-dd HH:mm:ss"));
+                mp.put("formatCreateTime", mp.get("create_time").toString());
             }
         }
         return response.success("操作成功", data);
@@ -123,11 +123,11 @@ public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDi
             }
         }
         if (map.getId() != null && map.getId() > 0) {
-            map.setUpdateTime(FunctionUtils.now());
+            map.setUpdateTime(DateUtil.now());
             map.setUpdateUser(ShiroUtils.getAdminId());
             updateById(map);
         } else {
-            map.setCreateTime(FunctionUtils.now());
+            map.setCreateTime(DateUtil.now());
             map.setCreateUser(ShiroUtils.getAdminId());
             save(map);
         }

src/main/java/com/taauav/admin/service/impl/SysLevelServiceImpl.java

@@ -11,6 +11,8 @@ import com.taauav.admin.mapper.SysAdminMapper;
 import com.taauav.admin.mapper.SysLevelMapper;
 import com.taauav.admin.service.ISysLevelService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +33,7 @@ import java.util.*;
  * @since 2019-11-11
  */
 @Service
-public class SysLevelServiceImpl extends ServiceImpl<SysLevelMapper, SysLevel> implements ISysLevelService {
+public class SysLevelServiceImpl extends BaseServiceImpl<SysLevelMapper, SysLevel> implements ISysLevelService {
     @Autowired
     private SysLevelMapper levelMapper;
     @Autowired
@@ -108,7 +110,7 @@ public class SysLevelServiceImpl extends ServiceImpl<SysLevelMapper, SysLevel> i
                     mp.put("createUsername", "");
                 }
                 mp.put("createTime", val.getCreateTime());
-                mp.put("formatCreateTime", FunctionUtils.formatTime(val.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+                mp.put("formatCreateTime", DateUtil.format(val.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
                 records.add(mp);
             });
             list.put("records", records);
@@ -142,11 +144,11 @@ public class SysLevelServiceImpl extends ServiceImpl<SysLevelMapper, SysLevel> i
         Boolean res = true;
         if (id != null && id > 0) {
             level.setId(id);
-            level.setUpdateTime(FunctionUtils.now());
+            level.setUpdateTime(DateUtil.now());
             level.setUpdateUser(ShiroUtils.getAdminId());
             res = updateById(level);
         } else {
-            level.setCreateTime(FunctionUtils.now());
+            level.setCreateTime(DateUtil.now());
             level.setCreateUser(ShiroUtils.getAdminId());
             res = save(level);
         }
@@ -188,8 +190,8 @@ public class SysLevelServiceImpl extends ServiceImpl<SysLevelMapper, SysLevel> i
         info.put("createUserName", createUserName);
         info.put("createTime", levelInfo.getCreateTime());
         String formatCreateTime = "";
-        if (levelInfo.getCreateTime() > 0) {
-            formatCreateTime = FunctionUtils.formatTime(levelInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+        if (levelInfo.getCreateTime() != null) {
+            formatCreateTime = DateUtil.format(levelInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
         }
         info.put("formatCreateTime", formatCreateTime);
         info.put("updateUser", levelInfo.getUpdateUser());
@@ -203,8 +205,8 @@ public class SysLevelServiceImpl extends ServiceImpl<SysLevelMapper, SysLevel> i
         info.put("updateUserName", updateUserName);
         info.put("updateTime", levelInfo.getUpdateTime());
         String formatUpdateTime = "";
-        if (levelInfo.getUpdateTime() > 0) {
-            formatUpdateTime = FunctionUtils.formatTime(levelInfo.getUpdateTime(), "yyyy-MM-dd HH:mm:ss");
+        if (levelInfo.getUpdateTime() != null) {
+            formatUpdateTime = DateUtil.format(levelInfo.getUpdateTime(), "yyyy-MM-dd HH:mm:ss");
         }
         info.put("formatUpdateTime", formatUpdateTime);
         return response.success("操作成功", info);
@@ -225,8 +227,8 @@ public class SysLevelServiceImpl extends ServiceImpl<SysLevelMapper, SysLevel> i
             return response.failure("职级数据不存在");
         }
         level.setUpdateUser(ShiroUtils.getAdminId());
-        level.setUpdateTime(FunctionUtils.now());
-        level.setMark(Byte.valueOf("0"));
+        level.setUpdateTime(DateUtil.now());
+        level.setMark(Integer.valueOf("0"));
         Boolean res = updateById(level);
         if (res.equals(false)) {
             return response.failure("操作失败");
@@ -241,7 +243,7 @@ public class SysLevelServiceImpl extends ServiceImpl<SysLevelMapper, SysLevel> i
      * @return
      */
     @Override
-    public Response changeStatus(Integer id, Byte status) {
+    public Response changeStatus(Integer id, Integer status) {
         if (id < 1) {
             return response.failure("职级id必须大于0");
         }
@@ -249,7 +251,7 @@ public class SysLevelServiceImpl extends ServiceImpl<SysLevelMapper, SysLevel> i
         if (info == null) {
             return response.failure("职级数据不存在");
         }
-        Byte st = 0;
+        Integer st = 0;
         if (status == 1) {
             st = 2;
         } else {
@@ -257,7 +259,7 @@ public class SysLevelServiceImpl extends ServiceImpl<SysLevelMapper, SysLevel> i
         }
         info.setStatus(st);
         info.setUpdateUser(ShiroUtils.getAdminId());
-        info.setUpdateTime(FunctionUtils.now());
+        info.setUpdateTime(DateUtil.now());
         Boolean res = updateById(info);
         if (res.equals(false)) {
             return response.failure("操作失败");

src/main/java/com/taauav/admin/service/impl/SysPositionServiceImpl.java

@@ -11,7 +11,8 @@ import com.taauav.admin.entity.SysPosition;
 import com.taauav.admin.mapper.SysAdminMapper;
 import com.taauav.admin.mapper.SysPositionMapper;
 import com.taauav.admin.service.ISysPositionService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,7 +33,7 @@ import java.util.*;
  * @since 2019-11-12
  */
 @Service
-public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPosition> implements ISysPositionService {
+public class SysPositionServiceImpl extends BaseServiceImpl<SysPositionMapper, SysPosition> implements ISysPositionService {
     @Autowired
     private SysPositionMapper positionMapper;
     @Autowired
@@ -129,7 +130,7 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
                     mp.put("createUsername", "");
                 }
                 mp.put("createTime", val.getCreateTime());
-                mp.put("formatCreateTime", FunctionUtils.formatTime(val.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+                mp.put("formatCreateTime", DateUtil.format(val.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
                 records.add(mp);
             });
             list.put("records", records);
@@ -163,12 +164,12 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
         Integer id = map.getId();
         Boolean res;
         if (id != null && id > 0) {
-            position.setUpdateTime(FunctionUtils.now());
+            position.setUpdateTime(DateUtil.now());
             position.setUpdateUser(ShiroUtils.getAdminId());
             position.setId(id);
             res = updateById(position);
         } else {
-            position.setCreateTime(FunctionUtils.now());
+            position.setCreateTime(DateUtil.now());
             position.setCreateUser(ShiroUtils.getAdminId());
             res = save(position);
         }
@@ -211,8 +212,8 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
         info.put("createUserName", createUserName);
         info.put("createTime", position.getCreateTime());
         String formatCreateTime = "";
-        if (position.getCreateTime() > 0) {
-            formatCreateTime = FunctionUtils.formatTime(position.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
+        if (position.getCreateTime() != null) {
+            formatCreateTime = DateUtil.format(position.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
         }
         info.put("formatCreateTime", formatCreateTime);
         info.put("updateUser", position.getUpdateUser());
@@ -226,8 +227,8 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
         info.put("updateUserName", updateUserName);
         info.put("updateTime", position.getUpdateTime());
         String formatUpdateTime = "";
-        if (position.getUpdateTime() > 0) {
-            formatUpdateTime = FunctionUtils.formatTime(position.getUpdateTime(), "yyyy-MM-dd HH:mm:ss");
+        if (position.getUpdateTime() != null) {
+            formatUpdateTime = DateUtil.format(position.getUpdateTime(), "yyyy-MM-dd HH:mm:ss");
         }
         info.put("formatUpdateTime", formatUpdateTime);
         return response.success("操作成功", info);
@@ -247,9 +248,9 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
         if (position == null) {
             return response.failure("岗位数据不存在");
         }
-        position.setMark(Byte.valueOf("0"));
+        position.setMark(Integer.valueOf("0"));
         position.setUpdateUser(ShiroUtils.getAdminId());
-        position.setUpdateTime(FunctionUtils.now());
+        position.setUpdateTime(DateUtil.now());
         Boolean res = updateById(position);
         if (res.equals(false)) {
             return response.failure("操作失败");
@@ -264,7 +265,7 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
      * @return
      */
     @Override
-    public Response changeStatus(Integer id, Byte status) {
+    public Response changeStatus(Integer id, Integer status) {
         if (id < 1) {
             return response.failure("岗位id必须大于0");
         }
@@ -272,7 +273,7 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
         if (info == null) {
             return response.failure("岗位数据不存在");
         }
-        Byte st = 0;
+        Integer st = 0;
         if (status == 1) {
             st = 2;
         } else {
@@ -280,7 +281,7 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
         }
         info.setStatus(st);
         info.setUpdateUser(ShiroUtils.getAdminId());
-        info.setUpdateTime(FunctionUtils.now());
+        info.setUpdateTime(DateUtil.now());
         Boolean res = updateById(info);
         if (res.equals(false)) {
             return response.failure("操作失败");

src/main/java/com/taauav/admin/service/impl/TauvDriverServiceImpl.java

@@ -10,17 +10,13 @@ import com.taauav.admin.mapper.TauvDriverMapper;
 import com.taauav.admin.service.ISysAdminService;
 import com.taauav.admin.service.ISysCityService;
 import com.taauav.admin.service.ITauvDriverService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.taauav.common.service.impl.BaseServiceImpl;
 import com.taauav.common.util.DateUtil;
-import com.taauav.common.util.FunctionUtils;
-import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/java/com/taauav/admin/service/impl/TauvEquipmentServiceImpl.java

@@ -7,7 +7,8 @@ import com.taauav.common.bean.Response;
 import com.taauav.admin.entity.TauvEquipment;
 import com.taauav.admin.mapper.TauvEquipmentMapper;
 import com.taauav.admin.service.ITauvEquipmentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,7 +28,7 @@ import java.util.Map;
  * @since 2019-11-13
  */
 @Service
-public class TauvEquipmentServiceImpl extends ServiceImpl<TauvEquipmentMapper, TauvEquipment> implements ITauvEquipmentService {
+public class TauvEquipmentServiceImpl extends BaseServiceImpl<TauvEquipmentMapper, TauvEquipment> implements ITauvEquipmentService {
     @Value("${spring.pageSize}")
     private Integer pageSize;
     @Autowired
@@ -72,7 +73,7 @@ public class TauvEquipmentServiceImpl extends ServiceImpl<TauvEquipmentMapper, T
      */
     @Override
     public Response edit(TauvEquipment equipment) {
-        equipment.setUpdateTime(FunctionUtils.getCurrentTime());
+        equipment.setUpdateTime(DateUtil.now());
         equipment.setUpdateUser(ShiroUtils.getAdminId());
         equipmentMapper.updateById(equipment);
         return response.success("操作成功");
@@ -85,7 +86,7 @@ public class TauvEquipmentServiceImpl extends ServiceImpl<TauvEquipmentMapper, T
      */
     @Override
     public Response add(TauvEquipment equipment) {
-        equipment.setCreateTime(FunctionUtils.getCurrentTime());
+        equipment.setCreateTime(DateUtil.now());
         equipment.setCreateUser(ShiroUtils.getAdminId());
         equipmentMapper.insert(equipment);
         return response.success("操作成功");
@@ -113,7 +114,7 @@ public class TauvEquipmentServiceImpl extends ServiceImpl<TauvEquipmentMapper, T
             return response.failure("状态值不合法");
         }
         TauvEquipment tauvEquipment = new TauvEquipment();
-        tauvEquipment.setStatus(Byte.valueOf(statusStr));
+        tauvEquipment.setStatus(Integer.valueOf(statusStr));
         tauvEquipment.setId(Integer.valueOf(idStr));
         equipmentMapper.updateById(tauvEquipment);
         return response.success("操作成功");

src/main/java/com/taauav/admin/service/impl/TauvInspectDriverServiceImpl.java

@@ -9,6 +9,8 @@ import com.taauav.admin.mapper.TauvInspectDriverMapper;
 import com.taauav.admin.mapper.TauvInspectMapper;
 import com.taauav.admin.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FileUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
@@ -34,7 +36,7 @@ import java.util.*;
  */
 @Service
 @Slf4j
-public class TauvInspectDriverServiceImpl extends ServiceImpl<TauvInspectDriverMapper, TauvInspectDriver> implements ITauvInspectDriverService {
+public class TauvInspectDriverServiceImpl extends BaseServiceImpl<TauvInspectDriverMapper, TauvInspectDriver> implements ITauvInspectDriverService {
     @Value("${spring.pageSize}")
     private Integer pageSize;
     @Value("${server.UPLOAD_URL}")
@@ -114,7 +116,7 @@ public class TauvInspectDriverServiceImpl extends ServiceImpl<TauvInspectDriverM
                 }
                 driver.setInspectId(inspectId);
                 driver.setInspectNo(inspect.getInspectNo());
-                driver.setCreateTime(FunctionUtils.getCurrentTime());
+                driver.setCreateTime(DateUtil.now());
                 driver.setCreateUser(ShiroUtils.getAdminId());
                 driver.setNum(i*10);
                 i++;
@@ -249,7 +251,7 @@ public class TauvInspectDriverServiceImpl extends ServiceImpl<TauvInspectDriverM
         TauvInspectDriver inspectDriver = new TauvInspectDriver();
         inspectDriver.setId(id);
         inspectDriver.setFlightGroup(flightGroupId);
-        inspectDriver.setStatus(Byte.valueOf("2"));
+        inspectDriver.setStatus(Integer.valueOf("2"));
         Integer res = inspectDriverMapper.updateById(inspectDriver);
         if (res > 0) {
             return true;
@@ -345,7 +347,7 @@ public class TauvInspectDriverServiceImpl extends ServiceImpl<TauvInspectDriverM
         }
         TauvInspectDriver inspectDriver = new TauvInspectDriver();
         inspectDriver.setId(id);
-        inspectDriver.setStatus(Byte.valueOf("1"));
+        inspectDriver.setStatus(Integer.valueOf("1"));
         inspectDriverMapper.updateById(inspectDriver);
         return response.success("操作成功");
     }
@@ -379,7 +381,7 @@ public class TauvInspectDriverServiceImpl extends ServiceImpl<TauvInspectDriverM
         inspectDriver.setFlightSpeed(new BigDecimal(task.getFlightSpeed()));
         inspectDriver.setFlightTime(new BigDecimal(task.getFlightTime()));
         inspectDriver.setRemark(task.getRemark());
-        inspectDriver.setStatus(Byte.valueOf("3"));
+        inspectDriver.setStatus(Integer.valueOf("3"));
         inspectDriver.setFlightGroup(adminId);
         inspectDriver.setExecutionStartTime(Integer.valueOf(executionStartTime));
         inspectDriver.setExecutionEndTime(Integer.valueOf(executionEndTime));
@@ -536,7 +538,7 @@ public class TauvInspectDriverServiceImpl extends ServiceImpl<TauvInspectDriverM
             if (reportInfo != null) {
                 return response.failure("该任务已经生成报告，请先删除报告后再处理。");
             }
-            info.setMark(Byte.valueOf("0"));
+            info.setMark(Integer.valueOf("0"));
             inspectDriverMapper.updateById(info);
             return response.success("操作成功");
         } else {
@@ -567,7 +569,7 @@ public class TauvInspectDriverServiceImpl extends ServiceImpl<TauvInspectDriverM
             if (info == null) {
                 return response.failure("任务数据不存在");
             }
-            info.setStatus(Byte.valueOf("3"));
+            info.setStatus(Integer.valueOf("3"));
             inspectDriverMapper.updateById(info);
             return response.success("操作成功");
         } else {

src/main/java/com/taauav/admin/service/impl/TauvInspectFileBakServiceImpl.java

@@ -3,7 +3,7 @@ package com.taauav.admin.service.impl;
 import com.taauav.admin.entity.TauvInspectFileBak;
 import com.taauav.admin.mapper.TauvInspectFileBakMapper;
 import com.taauav.admin.service.ITauvInspectFileBakService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2019-11-29
  */
 @Service
-public class TauvInspectFileBakServiceImpl extends ServiceImpl<TauvInspectFileBakMapper, TauvInspectFileBak> implements ITauvInspectFileBakService {
+public class TauvInspectFileBakServiceImpl extends BaseServiceImpl<TauvInspectFileBakMapper, TauvInspectFileBak> implements ITauvInspectFileBakService {
 
 }

src/main/java/com/taauav/admin/service/impl/TauvInspectFileServiceImpl.java

@@ -14,6 +14,7 @@ import com.taauav.admin.mapper.TauvQuestionOptionsMapper;
 import com.taauav.admin.mapper.TauvReportMapper;
 import com.taauav.admin.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
 import com.taauav.common.util.FileUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ImageUtil;
@@ -40,7 +41,7 @@ import java.util.List;
  * @since 2019-11-14
  */
 @Service
-public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMapper, TauvInspectFile> implements ITauvInspectFileService {
+public class TauvInspectFileServiceImpl extends BaseServiceImpl<TauvInspectFileMapper, TauvInspectFile> implements ITauvInspectFileService {
     @Value("${spring.pageSize}")
     private Integer pageSize;
     @Value("${file.uploadFolder}")
@@ -242,7 +243,7 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
             inspectFile.setFileDocument(fileDocument);
             inspectFile.setExtension(extension);
             inspectFile.setName(originName);
-            inspectFile.setFileType(Byte.valueOf("1"));
+            inspectFile.setFileType(Integer.valueOf("1"));
             inspectFile.setSize(size.intValue());
             inspectFile.setFileName(originName);
             inspectFile.setType(extension);
@@ -269,7 +270,7 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
                 inspectFile.setSrc(filePath);
                 inspectFile.setOriginalImg(filePath);
                 inspectFile.setCreateUser(ShiroUtils.getAdminId());
-                inspectFile.setCreateTime(FunctionUtils.getCurrentTime());
+                inspectFile.setCreateTime(com.taauav.common.util.DateUtil.now());
                 inspectFile.setThumbImg(thumbImg);
                 inspectFileMapper.insert(inspectFile);
                 mapReturn.put("msg","success");
@@ -366,8 +367,8 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
         TauvInspectFile inspectFile = new TauvInspectFile();
         inspectFile.setId(id);
         inspectFile.setSrc(newFilePath);
-        inspectFile.setStatus(Byte.valueOf("1"));
-        inspectFile.setUpdateTime(FunctionUtils.getCurrentTime());
+        inspectFile.setStatus(Integer.valueOf("1"));
+        inspectFile.setUpdateTime(com.taauav.common.util.DateUtil.now());
         inspectFile.setUpdateUser(ShiroUtils.getAdminId());
         if (!StringUtils.isEmpty(questionId)) {
             inspectFile.setQuestionId(Integer.valueOf(questionId));
@@ -395,9 +396,9 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
         }
         TauvInspectFile inspectFile = new TauvInspectFile();
         inspectFile.setId(id);
-        inspectFile.setStatus(Byte.valueOf("2"));
+        inspectFile.setStatus(Integer.valueOf("2"));
         inspectFile.setSrc("");
-        inspectFile.setUpdateTime(FunctionUtils.getCurrentTime());
+        inspectFile.setUpdateTime(com.taauav.common.util.DateUtil.now());
         inspectFile.setUpdateUser(ShiroUtils.getAdminId());
         inspectFileMapper.updateById(inspectFile);
         return response.success("操作成功");
@@ -416,7 +417,7 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
         if (StringUtils.isEmpty(info)) {
             return response.failure("数据不存在");
         }
-        byte mark = Byte.valueOf("0");
+        Integer mark = 0;
 //        TauvInspectDriver inspectDriver = new TauvInspectDriver();
 //        inspectDriver.setMark(mark);
 //        inspectDriver.setId(id);
@@ -445,8 +446,8 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
         }
         TauvInspectFile inspectFile = new TauvInspectFile();
         inspectFile.setId(id);
-        inspectFile.setMark(Byte.valueOf("0"));
-        inspectFile.setUpdateTime(FunctionUtils.getCurrentTime());
+        inspectFile.setMark(Integer.valueOf("0"));
+        inspectFile.setUpdateTime(com.taauav.common.util.DateUtil.now());
         inspectFile.setUpdateUser(ShiroUtils.getAdminId());
         inspectFileMapper.updateById(inspectFile);
         return response.success("操作成功");
@@ -516,9 +517,9 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
             return response.failure("您还有【" + fileList.size() + "】张图片未标记");
         }
         TauvInspectDriver inspectDriver = new TauvInspectDriver();
-        inspectDriver.setStatus(Byte.valueOf("5"));
+        inspectDriver.setStatus(Integer.valueOf("5"));
         inspectDriver.setId(id);
-        inspectDriver.setUpdateTime(FunctionUtils.getCurrentTime());
+        inspectDriver.setUpdateTime(com.taauav.common.util.DateUtil.now());
         inspectDriver.setUpdateUser(ShiroUtils.getAdminId());
         inspectDriverMapper.updateById(inspectDriver);
         return response.success("操作成功");
@@ -675,8 +676,8 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
             inspectDriverId = info.getInspectDriverId();
             if (Integer.valueOf(effective) > 0) {
                 TauvInspectFile inspectFile = new TauvInspectFile();
-                inspectFile.setIsReview(Byte.valueOf("1"));
-                inspectFile.setIsEffective(Byte.valueOf(effective));
+                inspectFile.setIsReview(Integer.valueOf("1"));
+                inspectFile.setIsEffective(Integer.valueOf(effective));
                 inspectFile.setId(id);
                 inspectFileMapper.updateById(inspectFile);
             }
@@ -688,7 +689,7 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
         //巡检任务状态变更为"复核中"
         TauvInspectDriver driver = inspectDriverMapper.selectById(inspectDriverId);
         driver.setId(inspectDriverId);
-        driver.setStatus(Byte.valueOf("5"));
+        driver.setStatus(Integer.valueOf("5"));
         driver.setReviewUser(ShiroUtils.getAdminId());
         driver.setReviewTime(FunctionUtils.getCurrentTime());
         inspectDriverMapper.updateById(driver);
@@ -709,7 +710,7 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
         if (StringUtils.isEmpty(info)) {
             return response.failure("数据不存在");
         }
-        info.setStatus(Byte.valueOf("6"));
+        info.setStatus(Integer.valueOf("6"));
         info.setReviewTime(FunctionUtils.getCurrentTime());
         info.setReviewUser(ShiroUtils.getAdminId());
         inspectDriverMapper.updateById(info);
@@ -737,7 +738,7 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
         report.setInspectEndTime(inspectDriver.getExecutionEndTime());
         report.setFlightGroup(inspectDriver.getFlightGroup());
         report.setDriverExam(inspectDriver.getDriverExam());
-        report.setCreateTime(FunctionUtils.getCurrentTime());
+        report.setCreateTime(com.taauav.common.util.DateUtil.now());
         report.setCreateUser(ShiroUtils.getAdminId());
         reportMapper.insert(report);
         return response.success("操作成功");
@@ -909,7 +910,7 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
     @Override
     public List<Map<String,Object>> getNumByFileDocument(String driverArea, Integer inspectDriverId, String driverExam, Integer inspectStartTime, Integer inspectEndTime) {
         Byte bDriverExam = Byte.valueOf(driverExam);
-        String[] driverAreaList = driverArea.split(",");
+        String[] driverAreaList = StringUtils.isEmpty(driverArea) ? null : driverArea.split(",");
         if (inspectStartTime == 0 || inspectEndTime == 0 && inspectEndTime < inspectStartTime) {
             inspectStartTime = 0;
             inspectEndTime = 0;
@@ -978,8 +979,7 @@ public class TauvInspectFileServiceImpl extends ServiceImpl<TauvInspectFileMappe
         if (StringUtils.isEmpty(inspectFile)) {
             return "";
         }
-        Integer lastUploadTime = inspectFile.getCreateTime();
-        return FunctionUtils.formatTime(lastUploadTime, "yyyy-MM-dd HH:mm:ss");
+        return com.taauav.common.util.DateUtil.format(inspectFile.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
     }
 
     /**

src/main/java/com/taauav/admin/service/impl/TauvInspectServiceImpl.java

@@ -5,7 +5,8 @@ import com.taauav.admin.entity.TauvInspect;
 import com.taauav.admin.mapper.TauvInspectMapper;
 import com.taauav.admin.service.ITauvInspectDriverService;
 import com.taauav.admin.service.ITauvInspectService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +22,7 @@ import org.springframework.util.StringUtils;
  * @since 2019-11-14
  */
 @Service
-public class TauvInspectServiceImpl extends ServiceImpl<TauvInspectMapper, TauvInspect> implements ITauvInspectService {
+public class TauvInspectServiceImpl extends BaseServiceImpl<TauvInspectMapper, TauvInspect> implements ITauvInspectService {
     @Autowired
     private Response response;
     @Autowired
@@ -40,7 +41,7 @@ public class TauvInspectServiceImpl extends ServiceImpl<TauvInspectMapper, TauvI
         if (type.equals(2) && StringUtils.isEmpty(inspect.getExecutionCycle())) {
             return response.failure("巡检周期不能为空");
         }
-        inspect.setCreateTime(FunctionUtils.getCurrentTime());
+        inspect.setCreateTime(DateUtil.now());
         inspect.setCreateUser(ShiroUtils.getAdminId());
         inspectMapper.insert(inspect);
         //生成巡检任务单号

src/main/java/com/taauav/admin/service/impl/TauvQuestionOptionsServiceImpl.java

@@ -10,6 +10,8 @@ import com.taauav.admin.mapper.TauvQuestionOptionsMapper;
 import com.taauav.admin.service.ISysAdminService;
 import com.taauav.admin.service.ITauvQuestionOptionsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +32,7 @@ import java.util.Map;
  * @since 2019-11-13
  */
 @Service
-public class TauvQuestionOptionsServiceImpl extends ServiceImpl<TauvQuestionOptionsMapper, TauvQuestionOptions> implements ITauvQuestionOptionsService {
+public class TauvQuestionOptionsServiceImpl extends BaseServiceImpl<TauvQuestionOptionsMapper, TauvQuestionOptions> implements ITauvQuestionOptionsService {
     @Value("${spring.pageSize}")
     private Integer pageSize;
     @Autowired
@@ -100,7 +102,7 @@ public class TauvQuestionOptionsServiceImpl extends ServiceImpl<TauvQuestionOpti
      */
     @Override
     public Response edit(TauvQuestionOptions questionOptions) {
-        questionOptions.setUpdateTime(FunctionUtils.getCurrentTime());
+        questionOptions.setUpdateTime(DateUtil.now());
         questionOptions.setUpdateUser(ShiroUtils.getAdminId());
         questionOptionsMapper.updateById(questionOptions);
         return response.success("添加成功");
@@ -113,7 +115,7 @@ public class TauvQuestionOptionsServiceImpl extends ServiceImpl<TauvQuestionOpti
      */
     @Override
     public Response add(TauvQuestionOptions questionOptions) {
-        questionOptions.setCreateTime(FunctionUtils.getCurrentTime());
+        questionOptions.setCreateTime(DateUtil.now());
         questionOptions.setCreateUser(ShiroUtils.getAdminId());
         questionOptionsMapper.insert(questionOptions);
         return response.success("添加成功");

src/main/java/com/taauav/admin/service/impl/TauvReportCheckServiceImpl.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.taauav.admin.entity.TauvReportCheck;
 import com.taauav.admin.mapper.TauvReportCheckMapper;
 import com.taauav.admin.service.ITauvReportCheckService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.taauav.common.util.FunctionUtils;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,7 +21,7 @@ import java.util.List;
  * @since 2019-11-29
  */
 @Service
-public class TauvReportCheckServiceImpl extends ServiceImpl<TauvReportCheckMapper, TauvReportCheck> implements ITauvReportCheckService {
+public class TauvReportCheckServiceImpl extends BaseServiceImpl<TauvReportCheckMapper, TauvReportCheck> implements ITauvReportCheckService {
     @Autowired
     private TauvReportCheckMapper reportCheckMapper;
     /**
@@ -41,7 +41,7 @@ public class TauvReportCheckServiceImpl extends ServiceImpl<TauvReportCheckMappe
     @Override
     public void addData(TauvReportCheck reportCheck) {
         reportCheck.setCheckUser(ShiroUtils.getAdminId());
-        reportCheck.setCreateTime(FunctionUtils.getCurrentTime());
+        reportCheck.setCreateTime(DateUtil.now());
         saveOrUpdate(reportCheck);
     }
 }

src/main/java/com/taauav/admin/service/impl/TauvReportEvaluationServiceImpl.java

@@ -9,9 +9,8 @@ import com.taauav.admin.entity.TauvReportEvaluation;
 import com.taauav.admin.mapper.TauvReportEvaluationMapper;
 import com.taauav.admin.service.ISysAdminService;
 import com.taauav.admin.service.ITauvReportEvaluationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
 import com.taauav.common.util.FunctionUtils;
-import com.taauav.common.util.ShiroUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -29,7 +28,7 @@ import java.util.Map;
  * @since 2019-11-14
  */
 @Service
-public class TauvReportEvaluationServiceImpl extends ServiceImpl<TauvReportEvaluationMapper, TauvReportEvaluation> implements ITauvReportEvaluationService {
+public class TauvReportEvaluationServiceImpl extends BaseServiceImpl<TauvReportEvaluationMapper, TauvReportEvaluation> implements ITauvReportEvaluationService {
     @Value("${spring.pageSize}")
     private Integer pageSize;
     @Autowired
@@ -96,9 +95,7 @@ public class TauvReportEvaluationServiceImpl extends ServiceImpl<TauvReportEvalu
      */
     @Override
     public Response add(TauvReportEvaluation reportEvaluation) {
-        reportEvaluation.setUpdateTime(FunctionUtils.getCurrentTime());
-        reportEvaluation.setUpdateUser(ShiroUtils.getAdminId());
-        reportEvaluationMapper.insert(reportEvaluation);
+        addData(reportEvaluation);
         return response.success("添加成功");
     }
 
@@ -109,9 +106,7 @@ public class TauvReportEvaluationServiceImpl extends ServiceImpl<TauvReportEvalu
      */
     @Override
     public Response edit(TauvReportEvaluation reportEvaluation) {
-        reportEvaluation.setCreateTime(FunctionUtils.getCurrentTime());
-        reportEvaluation.setCreateUser(ShiroUtils.getAdminId());
-        reportEvaluationMapper.updateById(reportEvaluation);
+        editData(reportEvaluation);
         return response.success("编辑成功");
     }
 
@@ -143,7 +138,7 @@ public class TauvReportEvaluationServiceImpl extends ServiceImpl<TauvReportEvalu
         TauvReportEvaluation reportEvaluation = new TauvReportEvaluation();
         reportEvaluation.setId(Integer.valueOf(idStr));
         reportEvaluation.setStatus(Integer.valueOf(statusStr));
-        reportEvaluationMapper.updateById(reportEvaluation);
+        editData(reportEvaluation);
         return response.success("操作成功");
     }
 

src/main/java/com/taauav/admin/service/impl/TauvReportRemarkServiceImpl.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.taauav.admin.entity.TauvReportRemark;
 import com.taauav.admin.mapper.TauvReportRemarkMapper;
 import com.taauav.admin.service.ITauvReportRemarkService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.taauav.common.util.FunctionUtils;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
  * @since 2019-11-29
  */
 @Service
-public class TauvReportRemarkServiceImpl extends ServiceImpl<TauvReportRemarkMapper, TauvReportRemark> implements ITauvReportRemarkService {
+public class TauvReportRemarkServiceImpl extends BaseServiceImpl<TauvReportRemarkMapper, TauvReportRemark> implements ITauvReportRemarkService {
     @Autowired
     private TauvReportRemarkMapper tauvReportRemarkMapper;
 
@@ -52,7 +52,7 @@ public class TauvReportRemarkServiceImpl extends ServiceImpl<TauvReportRemarkMap
 
     @Override
     public void addData(TauvReportRemark reportRemark) {
-        reportRemark.setCreateTime(FunctionUtils.getCurrentTime());
+        reportRemark.setCreateTime(DateUtil.now());
         tauvReportRemarkMapper.insert(reportRemark);
     }
 }

src/main/java/com/taauav/admin/service/impl/TauvReportServiceImpl.java

@@ -11,6 +11,8 @@ import com.taauav.admin.mapper.TauvInspectDriverMapper;
 import com.taauav.admin.mapper.TauvReportMapper;
 import com.taauav.admin.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.taauav.common.service.impl.BaseServiceImpl;
+import com.taauav.common.util.DateUtil;
 import com.taauav.common.util.FunctionUtils;
 import com.taauav.common.util.ShiroUtils;
 import org.apache.commons.beanutils.ConvertUtils;
@@ -30,7 +32,7 @@ import java.util.*;
  * @since 2019-11-22
  */
 @Service
-public class TauvReportServiceImpl extends ServiceImpl<TauvReportMapper, TauvReport> implements ITauvReportService {
+public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, TauvReport> implements ITauvReportService {
     @Autowired
     private TauvReportMapper reportMapper;
     @Autowired
@@ -375,8 +377,8 @@ public class TauvReportServiceImpl extends ServiceImpl<TauvReportMapper, TauvRep
             /*获取复核有效的图片数量*/
             Integer questionNum = iTauvInspectFileService.getReviewNumByInspectDriverId(questionOptions.getId(), reportInfo.getInspectDriverId());
             TauvReportRemark remarkInfo = iTauvReportRemarkService.getInfoByReportIdAndQuestionId(reportInfo.getId(), questionOptions.getId());
-            Byte category = questionOptions.getCategory();
-            Byte type = questionOptions.getType();
+            Integer category = questionOptions.getCategory();
+            Integer type = questionOptions.getType();
             questionMap.put("category", category);
             questionMap.put("categoryText", categoryList.get(category.intValue()));
             questionMap.put("type", type);
@@ -448,8 +450,8 @@ public class TauvReportServiceImpl extends ServiceImpl<TauvReportMapper, TauvRep
             if (null != reportChecksList) {
                 for (TauvReportCheck reportCheck : reportChecksList) {
                     Integer checkUser = reportCheck.getCheckUser();
-                    Integer createTime = reportCheck.getCreateTime();
-                    reportCheck.setFormatCreateTime(FunctionUtils.formatTime(createTime,"yyyy-MM-dd HH:mm:ss"));
+                    Date createTime = DateUtil.now();
+                    reportCheck.setFormatCreateTime(DateUtil.format(createTime,"yyyy-MM-dd HH:mm:ss"));
                     SysAdmin adminInfo = iSysAdminService.getAdminInfo(checkUser);
                     reportCheck.setFormatCheckUser(adminInfo.getRealname());
                 }
@@ -523,20 +525,20 @@ public class TauvReportServiceImpl extends ServiceImpl<TauvReportMapper, TauvRep
         tauvReport.setTotalExamineScore(StringUtils.isEmpty(totalExamineScore) ? 0 : Integer.valueOf(totalExamineScore));
         tauvReport.setTotalCheckScore(StringUtils.isEmpty(totalCheckScore) ? 0 : Integer.valueOf(totalCheckScore));
         tauvReport.setId(id);
-        Byte status = 0;
+        Integer status = 0;
         /*审核操作*/
         if (map.containsKey("status")) {
             String statusStr = map.getOrDefault("status", "").toString();
             if (!statusStr.equals("3") && !statusStr.equals("4")) {
                 return response.failure("状态不合法");
             }
-            status = Byte.valueOf(statusStr);
+            status = Integer.valueOf(statusStr);
             tauvReport.setStatus(status);
 
         }
         //生成报告-修改状态为“审核中”
         if ("generate".equals(act)) {
-            tauvReport.setStatus(Byte.valueOf("2"));
+            tauvReport.setStatus(Integer.valueOf("2"));
             tauvReport.setInputTime(FunctionUtils.getCurrentTime());
             tauvReport.setInputUser(ShiroUtils.getAdminId());
         }
@@ -636,7 +638,7 @@ public class TauvReportServiceImpl extends ServiceImpl<TauvReportMapper, TauvRep
         tauvReport.setVideoUrl(videoUrl);
         tauvReport.setImageUrl(imgUrl);
         tauvReport.setReportUrl(reportUrl);
-        tauvReport.setUpdateTime(FunctionUtils.getCurrentTime());
+        tauvReport.setUpdateTime(DateUtil.now());
         tauvReport.setUpdateUser(ShiroUtils.getAdminId());
         tauvReport.setId(id);
         reportMapper.updateById(tauvReport);
@@ -650,10 +652,10 @@ public class TauvReportServiceImpl extends ServiceImpl<TauvReportMapper, TauvRep
      * @param remark
      * @return
      */
-    private void checkSub(Integer reportId, Integer inspectDriverId, String remark,Byte status) {
+    private void checkSub(Integer reportId, Integer inspectDriverId, String remark,Integer status) {
         TauvInspectDriver inspectDriver = new TauvInspectDriver();
         inspectDriver.setId(inspectDriverId);
-        inspectDriver.setStatus(Byte.valueOf("4"));
+        inspectDriver.setStatus(Integer.valueOf("4"));
         inspectDriverMapper.updateById(inspectDriver);
         QueryWrapper wrapper = new QueryWrapper();
         wrapper.eq("mark", 1);
@@ -883,9 +885,9 @@ public class TauvReportServiceImpl extends ServiceImpl<TauvReportMapper, TauvRep
                 return response.failure("报告数据不存在");
             }
             if ("drop".equals(act)) {
-                reportInfo.setMark(Byte.valueOf("0"));
+                reportInfo.setMark(Integer.valueOf("0"));
             } else {
-                reportInfo.setStatus(Byte.valueOf("2"));
+                reportInfo.setStatus(Integer.valueOf("2"));
             }
             reportMapper.updateById(reportInfo);
             return response.success("操作成功");

src/main/java/com/taauav/common/job/GpsController.java

@@ -89,7 +89,7 @@ public class GpsController {
                     TauvInspectFile inspectFile = new TauvInspectFile();
                     inspectFile.setId(info.getId());
                     if (StringUtils.isEmpty(latitude) || StringUtils.isEmpty(longitude)) {
-                        inspectFile.setCheckStatus(Byte.valueOf("3"));
+                        inspectFile.setCheckStatus(Integer.valueOf("3"));
                     } else {
                         inspectFile.setLatitude(latitude);
                         inspectFile.setLongitude(longitude);
@@ -102,7 +102,7 @@ public class GpsController {
                         inspectFile.setGaodeLongitude(gaodeLon);
                         inspectFile.setGaodeAddress(gaodeAddress);
 
-                        inspectFile.setCheckStatus(Byte.valueOf("1"));
+                        inspectFile.setCheckStatus(Integer.valueOf("1"));
 
                     }
 
@@ -111,7 +111,7 @@ public class GpsController {
                 }else {
                     TauvInspectFile inspectFile = new TauvInspectFile();
                     inspectFile.setId(info.getId());
-                    inspectFile.setCheckStatus(Byte.valueOf("3"));
+                    inspectFile.setCheckStatus(Integer.valueOf("3"));
                     iTauvInspectFileService.updateById(inspectFile);
                 }
                 String key = "HK_InspectFile_info_"+info.getId();

src/main/java/com/taauav/common/util/FunctionUtils.java

@@ -405,9 +405,9 @@ public class FunctionUtils {
         if (!StringUtils.isEmpty(map.get("driverArea"))) {
             areaIds = map.get("driverArea").toString().split(",");
         } else {
-            areaIds = admin.getCityIds().split(",");
+            areaIds = com.taauav.common.util.StringUtils.isEmpty(admin.getCityIds()) ? null :  admin.getCityIds().split(",");
         }
-        if (areaIds.length > 0) {
+        if (null != areaIds && areaIds.length > 0) {
             map.put("driverArea", areaIds);
         } else {
             map.remove("driverArea");

src/main/java/com/taauav/front/controller/FrontTestController.java

@@ -62,7 +62,7 @@ public class FrontTestController {
     }
     @GetMapping("init")
     public void initDriver(@RequestParam("f") String f) {
-       /* try {
+        /*try {
             readFileByBytes(f);
         } catch (IOException e) {
             e.printStackTrace();