所有代码，进行格式化

@@ -15,9 +15,6 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
 public class SecurityConfig extends WebSecurityConfigurerAdapter {
     @Override
     @Override
     protected void configure(HttpSecurity http) throws Exception {
     protected void configure(HttpSecurity http) throws Exception {
-        //首页所有人可以访问，功能页只有对应的权限才能访问，本地测试使用
-//        http.authorizeRequests()
-//                .antMatchers("/").permitAll();
         http.csrf().disable();
         http.csrf().disable();
     }
     }
 }
 }

@@ -55,6 +55,7 @@ public class SwaggerConfig {
 
 
     /**
     /**
      * 配置swagger信息==apiInfo
      * 配置swagger信息==apiInfo
+     *
      * @return
      * @return
      */
      */
     private ApiInfo apiInfo() {
     private ApiInfo apiInfo() {

@@ -37,10 +37,10 @@ public class CompanyInfoController {
             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResultJson<PageInfo> result = new ResultJson<>();
         ResultJson<PageInfo> result = new ResultJson<>();
         CompanyInfo companyInfo = new CompanyInfo();
         CompanyInfo companyInfo = new CompanyInfo();
-        if("".equals(companyName)){
+        if ("".equals(companyName)) {
             companyInfo.setCompanyName(companyName);
             companyInfo.setCompanyName(companyName);
         }
         }
-        if("".equals(companyMobile)){
+        if ("".equals(companyMobile)) {
             companyInfo.setCompanyMobile(companyMobile);
             companyInfo.setCompanyMobile(companyMobile);
         }
         }
         PageInfo pageInfo = companyInfoService.selectCompanyInfoList(companyInfo, pageNum, pageSize);
         PageInfo pageInfo = companyInfoService.selectCompanyInfoList(companyInfo, pageNum, pageSize);

@@ -151,6 +151,7 @@ public class DispatchNoteController {
         }
         }
         return result;
         return result;
     }
     }
+
     @InitBinder
     @InitBinder
     public void initBinder(WebDataBinder binder) {
     public void initBinder(WebDataBinder binder) {
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");

@@ -24,9 +24,9 @@ public class GetUserController {
     private GetUserFegin getUserFegin;
     private GetUserFegin getUserFegin;
 
 
     @GetMapping("/user/getUser")
     @GetMapping("/user/getUser")
-    public ResultJson<PageInfo> getUser(@RequestParam(value = "userName", required = false) String userName, HttpServletRequest request){
+    public ResultJson<PageInfo> getUser(@RequestParam(value = "userName", required = false) String userName, HttpServletRequest request) {
         String token = request.getHeader("Authorization");
         String token = request.getHeader("Authorization");
-        System.out.println(userName+"的token是"+token);
-        return getUserFegin.list(userName,token);
+        System.out.println(userName + "的token是" + token);
+        return getUserFegin.list(userName, token);
     }
     }
 }
 }

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * Description：
  * Description：
  * 时间：2020/5/8 16:06
  * 时间：2020/5/8 16:06
  */
  */
-@FeignClient(value = "cloud-user-center",fallback = GetUserFeginHystrix.class)
+@FeignClient(value = "cloud-user-center", fallback = GetUserFeginHystrix.class)
 @Service
 @Service
 public interface GetUserFegin {
 public interface GetUserFegin {
     /**
     /**

@@ -13,10 +13,10 @@ import org.springframework.web.client.RestTemplate;
  * 时间：2020/5/8 19:06
  * 时间：2020/5/8 19:06
  */
  */
 @Service
 @Service
-public class GetUserFeginHystrix implements GetUserFegin{
+public class GetUserFeginHystrix implements GetUserFegin {
 
 
     @Override
     @Override
-    public ResultJson<PageInfo> list(String userName,String token) {
+    public ResultJson<PageInfo> list(String userName, String token) {
         System.out.println("与 CLOUD-USER-CENTER 服务断开连接");
         System.out.println("与 CLOUD-USER-CENTER 服务断开连接");
 //        throw new RuntimeException();
 //        throw new RuntimeException();
         return null;
         return null;

@@ -18,6 +18,7 @@ public interface VehicleInfoMapper {
 
 
     /**
     /**
      * 调度车辆方法
      * 调度车辆方法
+     *
      * @param record
      * @param record
      * @return
      * @return
      */
      */

@@ -34,6 +34,7 @@ public class ResultJson<T> implements Serializable {
      * JWT令牌
      * JWT令牌
      */
      */
     private String jwtToken;
     private String jwtToken;
+
     /**
     /**
      * 无参，构造方法
      * 无参，构造方法
      */
      */
@@ -47,6 +48,7 @@ public class ResultJson<T> implements Serializable {
     public ResultJson(String code) {
     public ResultJson(String code) {
         this.code = code;
         this.code = code;
     }
     }
+
     public ResultJson(T data) {
     public ResultJson(T data) {
         this.data = data;
         this.data = data;
     }
     }

@@ -36,11 +36,11 @@ public class CompanyInfoServiceImpl implements CompanyInfoService {
      */
      */
     @Override
     @Override
     public PageInfo selectCompanyInfoList(CompanyInfo companyInfo, Integer pageNum, Integer pageSize) {
     public PageInfo selectCompanyInfoList(CompanyInfo companyInfo, Integer pageNum, Integer pageSize) {
-        /* 获取，公司信息列表 */
-        List<CompanyInfo> companyInfoList = companyInfoMapper.selectCompanyInfoList(companyInfo);
         /* 使用 PageHelper 分页插件 */
         /* 使用 PageHelper 分页插件 */
         PageHelper.startPage(pageNum, pageSize);
         PageHelper.startPage(pageNum, pageSize);
-        PageInfo<VehicleInfo> pageInfo = new PageInfo(companyInfoList);
+        /* 获取，公司信息列表 */
+        List<CompanyInfo> companyInfoList = companyInfoMapper.selectCompanyInfoList(companyInfo);
+        PageInfo<CompanyInfo> pageInfo = new PageInfo(companyInfoList);
         return pageInfo;
         return pageInfo;
     }
     }
 
 

@@ -26,11 +26,10 @@ public class DispatchNoteServiceImpl implements DispatchNoteService {
     private DispatchNoteMapper dispatchNoteMapper;
     private DispatchNoteMapper dispatchNoteMapper;
 
 
     @Override
     @Override
-    public PageInfo selectDispatchNoteList(DispatchNote dispatchNote, Integer pageNum, Integer pageSize) {
-        List<DispatchNote> dispatchNoteList = dispatchNoteMapper.selectVehicleInfoList(dispatchNote);
-        //使用pagehelper
+    public PageInfo<DispatchNote> selectDispatchNoteList(DispatchNote dispatchNote, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         PageHelper.startPage(pageNum, pageSize);
-        PageInfo<VehicleInfo> pageInfo = new PageInfo(dispatchNoteList);
+        List<DispatchNote> dispatchNoteList = dispatchNoteMapper.selectVehicleInfoList(dispatchNote);
+        PageInfo<DispatchNote> pageInfo = new PageInfo<>(dispatchNoteList);
         return pageInfo;
         return pageInfo;
     }
     }
 
 

@@ -29,10 +29,10 @@ public class DriverInfoServiceImpl implements DriverInfoService {
      * 分页查询，驾驶员信息列表
      * 分页查询，驾驶员信息列表
      */
      */
     @Override
     @Override
-    public PageInfo selectDriverInfoList(DriverInfo driverInfo, Integer pageNum, Integer pageSize) {
-        List<DriverInfo> driverInfoList = driverInfoMapper.selectDriverInfoList(driverInfo);
+    public PageInfo<DriverInfo> selectDriverInfoList(DriverInfo driverInfo, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
         PageHelper.startPage(pageNum, pageSize);
-        PageInfo<VehicleInfo> pageInfo = new PageInfo(driverInfoList);
+        List<DriverInfo> driverInfoList = driverInfoMapper.selectDriverInfoList(driverInfo);
+        PageInfo<DriverInfo> pageInfo = new PageInfo<>(driverInfoList);
         return pageInfo;
         return pageInfo;
     }
     }
 
 

@@ -53,9 +53,9 @@ public class VehicleInfoServiceImpl implements VehicleInfoService {
      */
      */
     @Override
     @Override
     public PageInfo selectVehicleInfoList(VehicleInfo vehicleInfo, Integer pageNum, Integer pageSize) {
     public PageInfo selectVehicleInfoList(VehicleInfo vehicleInfo, Integer pageNum, Integer pageSize) {
-        List<VehicleInfo> vehicleInfoList = vehicleInfoMapper.selectVehicleInfoList(vehicleInfo);
         // 使用 PageHelper 分页插件
         // 使用 PageHelper 分页插件
         PageHelper.startPage(pageNum, pageSize);
         PageHelper.startPage(pageNum, pageSize);
+        List<VehicleInfo> vehicleInfoList = vehicleInfoMapper.selectVehicleInfoList(vehicleInfo);
         PageInfo<VehicleInfo> pageInfo = new PageInfo(vehicleInfoList);
         PageInfo<VehicleInfo> pageInfo = new PageInfo(vehicleInfoList);
         return pageInfo;
         return pageInfo;
     }
     }

@@ -18,19 +18,20 @@ public class DateTimeUtils {
 
 
     /**
     /**
      * 获取年月日，date类型
      * 获取年月日，date类型
+     *
      * @param s
      * @param s
      * @return
      * @return
      */
      */
-    public static Date getDate(String s){
+    public static Date getDate(String s) {
         Date time = null;
         Date time = null;
-        if(s == null){
+        if (s == null) {
             return time;
             return time;
         }
         }
         try {
         try {
-            if (s.length()>0){
+            if (s.length() > 0) {
                 time = simpleDateFormat.parse(s);
                 time = simpleDateFormat.parse(s);
             }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
         return time;
         return time;
@@ -38,28 +39,30 @@ public class DateTimeUtils {
 
 
     /**
     /**
      * 获取年月日，String类型
      * 获取年月日，String类型
+     *
      * @param date
      * @param date
      * @return
      * @return
      */
      */
-    public static String getDateString(Date date){
+    public static String getDateString(Date date) {
         return simpleDateFormat.format(date);
         return simpleDateFormat.format(date);
     }
     }
 
 
     /**
     /**
      * 获取当前年月日时分秒，String类型
      * 获取当前年月日时分秒，String类型
+     *
      * @param date
      * @param date
      * @return
      * @return
      */
      */
-    public static String getDateTimeString(Date date){
+    public static String getDateTimeString(Date date) {
         return simpleDateTimeFormat.format(date);
         return simpleDateTimeFormat.format(date);
     }
     }
 
 
-    public static List getSeverDay(){
+    public static List getSeverDay() {
         List<Date> dates = new ArrayList<>();
         List<Date> dates = new ArrayList<>();
         Date date = new Date();
         Date date = new Date();
         dates.add(date);
         dates.add(date);
-        for (int i=1;i<7;i++) {
-            long time = date.getTime() - i*24 * 3600 * 1000L;
+        for (int i = 1; i < 7; i++) {
+            long time = date.getTime() - i * 24 * 3600 * 1000L;
             Date preTime = new Date(time);
             Date preTime = new Date(time);
             dates.add(preTime);
             dates.add(preTime);
         }
         }

@@ -8,7 +8,7 @@ import java.util.UUID;
  * 时间：2020/4/24 17:44
  * 时间：2020/4/24 17:44
  */
  */
 public class GetUUID {
 public class GetUUID {
-    public static String getuuid(){
+    public static String getuuid() {
         return UUID.randomUUID().toString().replaceAll("-", "");
         return UUID.randomUUID().toString().replaceAll("-", "");
     }
     }
 }
 }

@@ -4,8 +4,8 @@
     <resultMap id="BaseResultMap" type="com.sunyo.wlpt.dispatch.domain.DispatchBusiness">
     <resultMap id="BaseResultMap" type="com.sunyo.wlpt.dispatch.domain.DispatchBusiness">
         <!--@mbg.generated-->
         <!--@mbg.generated-->
         <!--@Table dispatch_business-->
         <!--@Table dispatch_business-->
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="dispatch_type" jdbcType="VARCHAR" property="dispatchType" />
+        <id column="id" jdbcType="VARCHAR" property="id"/>
+        <result column="dispatch_type" jdbcType="VARCHAR" property="dispatchType"/>
     </resultMap>
     </resultMap>
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
         <!--@mbg.generated-->
@@ -14,7 +14,7 @@
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
     <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
         <!--@mbg.generated-->
         <!--@mbg.generated-->
         select
         select
-    <include refid="Base_Column_List" />
+        <include refid="Base_Column_List"/>
         from dispatch_business
         from dispatch_business
         where id = #{id,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
     </select>
     </select>