文件夹重命名

src/main/java/com/jkcredit/invoice/hub/mapper/CarFreeCarrierBillEndMapper.java

@@ -1,7 +1,7 @@
 package com.jkcredit.invoice.hub.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jkcredit.invoice.hub.model.po.carFreeCarrierBillEnd.CarFreeCarrierBillEndPo;
+import com.jkcredit.invoice.hub.model.po.apiCarFreeCarrierBillEnd.CarFreeCarrierBillEndPo;
 
 /**
  * @description:

src/main/java/com/jkcredit/invoice/hub/mapper/CarFreeCarrierBillStartMapper.java

@@ -1,7 +1,7 @@
 package com.jkcredit.invoice.hub.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart.CarFreeCarrierBillStartPo;
+import com.jkcredit.invoice.hub.model.po.apiCarFreeCarrierBillStart.CarFreeCarrierBillStartPo;
 
 /**
  * @description:

src/main/java/com/jkcredit/invoice/hub/model/dto/carFreeCarrierBillEnd/CarFreeCarrierBillEndDto.java

@@ -1,11 +1,10 @@
-package com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillEnd;
+package com.jkcredit.invoice.hub.model.dto.apiCarFreeCarrierBillEnd;
 
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * @description:

src/main/java/com/jkcredit/invoice/hub/model/dto/carFreeCarrierBillStart/CarFreeCarrierBillStartDto.java

@@ -1,10 +1,9 @@
-package com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart;
+package com.jkcredit.invoice.hub.model.dto.apiCarFreeCarrierBillStart;
 
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 
 /**

src/main/java/com/jkcredit/invoice/hub/model/dto/company/CompanyAddDto.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.hub.model.dto.company;
+package com.jkcredit.invoice.hub.model.dto.apiCompany;
 
 import lombok.Data;
 

src/main/java/com/jkcredit/invoice/hub/model/dto/company/CompanyQueryDto.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.hub.model.dto.company;
+package com.jkcredit.invoice.hub.model.dto.apiCompany;
 
 import lombok.Data;
 

src/main/java/com/jkcredit/invoice/hub/model/dto/vehicleRegister/VehicleRegisterDto.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.hub.model.dto.vehicleRegister;
+package com.jkcredit.invoice.hub.model.dto.apiVehicleRegister;
 
 import lombok.Data;
 

src/main/java/com/jkcredit/invoice/hub/model/dto/wayBillCountQuery/WayBillCountQueryDto.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.hub.model.dto.wayBillCountQuery;
+package com.jkcredit.invoice.hub.model.dto.apiWayBillCountQuery;
 
 import lombok.Data;
 

src/main/java/com/jkcredit/invoice/hub/model/po/carFreeCarrierBillEnd/CarFreeCarrierBillEndPo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.hub.model.po.carFreeCarrierBillEnd;
+package com.jkcredit.invoice.hub.model.po.apiCarFreeCarrierBillEnd;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/jkcredit/invoice/hub/model/po/carFreeCarrierBillStart/CarFreeCarrierBillStartPo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart;
+package com.jkcredit.invoice.hub.model.po.apiCarFreeCarrierBillStart;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -9,7 +9,6 @@ import lombok.ToString;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

src/main/java/com/jkcredit/invoice/hub/model/po/searchInvoiceResult/SearchInvoiceResultPo.java

@@ -1,4 +1,4 @@
-package com.jkcredit.invoice.hub.model.po.searchInvoiceResult;
+package com.jkcredit.invoice.hub.model.po.apiSearchInvoiceResult;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

src/main/java/com/jkcredit/invoice/hub/service/apiCarFree/ApiCarFreeServiceImpl.java

@@ -11,12 +11,12 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.jkcredit.invoice.hub.constant.CommonConstant;
 import com.jkcredit.invoice.hub.enums.ApiResponseCodeEnum;
-import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillEnd.CarFreeCarrierBillEndDto;
-import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart.CarFreeCarrierBillStartDto;
-import com.jkcredit.invoice.hub.model.dto.vehicleRegister.VehicleRegisterDto;
+import com.jkcredit.invoice.hub.model.dto.apiCarFreeCarrierBillEnd.CarFreeCarrierBillEndDto;
+import com.jkcredit.invoice.hub.model.dto.apiCarFreeCarrierBillStart.CarFreeCarrierBillStartDto;
+import com.jkcredit.invoice.hub.model.dto.apiVehicleRegister.VehicleRegisterDto;
 import com.jkcredit.invoice.hub.service.base.BaseService;
-import com.jkcredit.invoice.hub.service.carFreeCarrierBillEnd.CarFreeCarrierBillEndService;
-import com.jkcredit.invoice.hub.service.carFreeCarrierBillStart.CarFreeCarrierBillStartService;
+import com.jkcredit.invoice.hub.service.apiCarFreeCarrierBillEnd.CarFreeCarrierBillEndService;
+import com.jkcredit.invoice.hub.service.apiCarFreeCarrierBillStart.CarFreeCarrierBillStartService;
 import com.jkcredit.invoice.hub.spi.lang.exception.ServiceException;
 import com.jkcredit.invoice.hub.spi.rest.data.ApiResponseData;
 import io.netty.util.internal.StringUtil;
@@ -98,17 +98,17 @@ public class ApiCarFreeServiceImpl extends BaseService implements ApiCarFreeServ
 
             result = response.toJson();
             long costTimeEnd = System.currentTimeMillis();
-            log.info("[-vehicleRegister-] result is " + result.replaceAll("\r|\n", "") + " , request is "
+            log.info("[-apiVehicleRegister-] result is " + result.replaceAll("\r|\n", "") + " , request is "
                     + param + ",costtime=" + (costTimeEnd - costTimeStart) + ",startTime=" + costTimeStart
                     + ",endTime=" + costTimeEnd);
         } catch (IOException e) {
-            log.error("[-vehicleRegister-] 网络异常 " + e);
+            log.error("[-apiVehicleRegister-] 网络异常 " + e);
             throw new ServiceException(CommonConstant.QUERY_FAILED);
         } catch (ApiRequestException apie) {
-            log.error("[-vehicleRegister-] 错误信息：" + apie.getMessage());
+            log.error("[-apiVehicleRegister-] 错误信息：" + apie.getMessage());
             throw new ApiRequestException(apie.getMessage(), ApiResponseCodeEnum.CODE_200.getValue());
         } catch (ServiceException se) {
-            log.error("[-vehicleRegister-] 错误信息：" + se.getMessage());
+            log.error("[-apiVehicleRegister-] 错误信息：" + se.getMessage());
             throw new ServiceException(se.getMessage());
         }
         return analyzeApiResultItems(result);

src/main/java/com/jkcredit/invoice/hub/service/carFreeCarrierBillEnd/CarFreeCarrierBillEndService.java

@@ -1,6 +1,6 @@
-package com.jkcredit.invoice.hub.service.carFreeCarrierBillEnd;
+package com.jkcredit.invoice.hub.service.apiCarFreeCarrierBillEnd;
 
-import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillEnd.CarFreeCarrierBillEndDto;
+import com.jkcredit.invoice.hub.model.dto.apiCarFreeCarrierBillEnd.CarFreeCarrierBillEndDto;
 
 /**
  * @description:

src/main/java/com/jkcredit/invoice/hub/service/carFreeCarrierBillEnd/CarFreeCarrierBillEndServiceImpl.java

@@ -1,8 +1,8 @@
-package com.jkcredit.invoice.hub.service.carFreeCarrierBillEnd;
+package com.jkcredit.invoice.hub.service.apiCarFreeCarrierBillEnd;
 
 import com.jkcredit.invoice.hub.mapper.CarFreeCarrierBillEndMapper;
-import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillEnd.CarFreeCarrierBillEndDto;
-import com.jkcredit.invoice.hub.model.po.carFreeCarrierBillEnd.CarFreeCarrierBillEndPo;
+import com.jkcredit.invoice.hub.model.dto.apiCarFreeCarrierBillEnd.CarFreeCarrierBillEndDto;
+import com.jkcredit.invoice.hub.model.po.apiCarFreeCarrierBillEnd.CarFreeCarrierBillEndPo;
 import com.jkcredit.invoice.hub.service.base.BaseService;
 import com.jkcredit.invoice.hub.spi.lang.exception.ServiceException;
 import com.jkcredit.invoice.hub.util.BeanUtil;

src/main/java/com/jkcredit/invoice/hub/service/apiCarFreeCarrierBillStart/CarFreeCarrierBillStartService.java

@@ -0,0 +1,15 @@
+package com.jkcredit.invoice.hub.service.apiCarFreeCarrierBillStart;
+
+import com.jkcredit.invoice.hub.model.dto.apiCarFreeCarrierBillStart.CarFreeCarrierBillStartDto;
+
+/**
+ * @description:
+ * @author: xusonglin
+ * @create: 2020/1/16 23:24
+ * @version: V1.0
+ **/
+public interface CarFreeCarrierBillStartService {
+    void saveBillStart(CarFreeCarrierBillStartDto dto);
+
+    void updateBillStartStatus(String num, Integer status);
+}

src/main/java/com/jkcredit/invoice/hub/service/carFreeCarrierBillStart/CarFreeCarrierBillStartServiceImpl.java

@@ -1,9 +1,8 @@
-package com.jkcredit.invoice.hub.service.carFreeCarrierBillStart;
+package com.jkcredit.invoice.hub.service.apiCarFreeCarrierBillStart;
 
 import com.jkcredit.invoice.hub.mapper.CarFreeCarrierBillStartMapper;
-import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillEnd.CarFreeCarrierBillEndDto;
-import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart.CarFreeCarrierBillStartDto;
-import com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart.CarFreeCarrierBillStartPo;
+import com.jkcredit.invoice.hub.model.dto.apiCarFreeCarrierBillStart.CarFreeCarrierBillStartDto;
+import com.jkcredit.invoice.hub.model.po.apiCarFreeCarrierBillStart.CarFreeCarrierBillStartPo;
 import com.jkcredit.invoice.hub.service.base.BaseService;
 import com.jkcredit.invoice.hub.spi.lang.exception.ServiceException;
 import com.jkcredit.invoice.hub.util.BeanUtil;

src/main/java/com/jkcredit/invoice/hub/service/apiCompany/ApiCompanyServiceImpl.java

@@ -10,8 +10,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.jkcredit.invoice.hub.constant.CommonConstant;
 import com.jkcredit.invoice.hub.enums.ApiResponseCodeEnum;
-import com.jkcredit.invoice.hub.model.dto.company.CompanyAddDto;
-import com.jkcredit.invoice.hub.model.dto.company.CompanyQueryDto;
+import com.jkcredit.invoice.hub.model.dto.apiCompany.CompanyAddDto;
+import com.jkcredit.invoice.hub.model.dto.apiCompany.CompanyQueryDto;
 import com.jkcredit.invoice.hub.service.base.BaseService;
 import com.jkcredit.invoice.hub.spi.lang.exception.ServiceException;
 import com.jkcredit.invoice.hub.spi.rest.data.ApiResponseData;

src/main/java/com/jkcredit/invoice/hub/service/apiWayBillCountQuery/WayBillCountQueryServiceImpl.java

@@ -8,7 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.jkcredit.invoice.hub.constant.CommonConstant;
 import com.jkcredit.invoice.hub.enums.ApiResponseCodeEnum;
-import com.jkcredit.invoice.hub.model.dto.wayBillCountQuery.WayBillCountQueryDto;
+import com.jkcredit.invoice.hub.model.dto.apiWayBillCountQuery.WayBillCountQueryDto;
 import com.jkcredit.invoice.hub.service.base.BaseService;
 import com.jkcredit.invoice.hub.spi.lang.exception.ServiceException;
 import com.jkcredit.invoice.hub.spi.rest.data.ApiResponseData;

src/main/java/com/jkcredit/invoice/hub/service/carFreeCarrierBillStart/CarFreeCarrierBillStartService.java

@@ -1,17 +0,0 @@
-package com.jkcredit.invoice.hub.service.carFreeCarrierBillStart;
-
-import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillEnd.CarFreeCarrierBillEndDto;
-import com.jkcredit.invoice.hub.model.dto.carFreeCarrierBillStart.CarFreeCarrierBillStartDto;
-import com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart.CarFreeCarrierBillStartPo;
-
-/**
- * @description:
- * @author: xusonglin
- * @create: 2020/1/16 23:24
- * @version: V1.0
- **/
-public interface CarFreeCarrierBillStartService {
-    void saveBillStart(CarFreeCarrierBillStartDto dto);
-
-    void updateBillStartStatus(String num, Integer status);
-}

src/main/resources/mapper/CarFreeCarrierBillStartMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jkcredit.invoice.hub.mapper.CarFreeCarrierBillStartMapper">
     <resultMap id="baseResultMap"
-               type="com.jkcredit.invoice.hub.model.po.carFreeCarrierBillStart.CarFreeCarrierBillStartPo">
+               type="com.jkcredit.invoice.hub.model.po.apiCarFreeCarrierBillStart.CarFreeCarrierBillStartPo">
         <id column="id" property="id"/>
         <result column="plate_color" property="plateColor"/>
         <result column="plate_number" property="plateNumber"/>