Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/controller/TmsLineCostController.java

@@ -78,7 +78,7 @@ public class TmsLineCostController {
                       @RequestBody TmsLineCostAddParam param) {
         log.info("添加线路费用,调用/tms/tms_line_cost/add,参数:{}", JSON.toJSONString(param));
         if (param == null || param.getLineStart() == null || param.getLineEnd() == null || param.getKilometre() == null
-                || param.getCycleId() == null || param.getTruckId() == null) {
+                || param.getCycleId() == null || param.getTruckId() == null || param.getKilometreUrl() == null) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
         if (param.getList() != null && param.getList().size() > 0) {

src/main/java/com/aoyang/tms/controller/TruckEscortController.java

@@ -92,7 +92,7 @@ public class TruckEscortController {
         return new Result<>(truckEscortService.add(param));
     }
 
-    @ApiOperation(value = "修改车辆押运员", notes = "必传参数:userId")
+    @ApiOperation(value = "修改车辆押运员", notes = "必传参数:EscortId")
     @PostMapping("/update")
     public Result update(@RequestHeader(value = "userId") Long userId,
                          @RequestHeader(value = "userName") String userName,
@@ -113,7 +113,7 @@ public class TruckEscortController {
         return new Result<>(truckEscortService.edit(param));
     }
 
-    @ApiOperation(value = "删除车辆押运员", notes = "必传参数：userId")
+    @ApiOperation(value = "删除车辆押运员", notes = "必传参数：EscortId")
     @PostMapping("/delete")
     public Result delete(@RequestBody TruckEscort param) {
         log.info("删除车辆押运员,调用/tms/truck_escort/delete,参数:{}", JSON.toJSONString(param));
@@ -124,7 +124,7 @@ public class TruckEscortController {
         return new Result<>(truckEscortService.removeById(param));
     }
 
-    @ApiOperation(value = "获取单个车辆押运员详情", notes = "必传参数：userId")
+    @ApiOperation(value = "获取单个车辆押运员详情", notes = "必传参数：EscortId")
     @PostMapping("/get_one")
     public Result getOne(@RequestBody TruckEscort param) {
         log.info("删除车辆押运员,调用/tms/truck_escort/get_one,参数:{}", JSON.toJSONString(param));

src/main/java/com/aoyang/tms/controller/WorkOrderController.java

@@ -13,6 +13,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.time.LocalDateTime;
 import java.util.*;
 import javax.annotation.Resource;
 
@@ -80,11 +83,27 @@ public class WorkOrderController {
 
     @ApiOperation(value = "根据id中止运单(运单分页列表PC端)", notes = "必传参数:id,orderStatus=60")
     @PostMapping("/stop")
-    public Result stop(@RequestBody WorkOrder param) {
-        log.info("根据id中止运单(运单分页列表PC端),调用/tms/work_order/stop,参数:{}", JSON.toJSONString(param));
+    public Result stop(@RequestHeader(value = "userId") Long userId,
+                       @RequestHeader(value = "userName") String userName,
+                       @RequestBody WorkOrder param) {
         if (param == null || param.getId() == null || param.getOrderStatus() != 60) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
+
+        if (param == null || param.getSpotId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        String utf8Name = userName;
+        try {
+            utf8Name = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        param.setUpdater(userId);
+        param.setUpdaterName(utf8Name);
+        param.setUpdateDate(LocalDateTime.now());
+
+        log.info("根据id中止运单(运单分页列表PC端),调用/tms/work_order/stop,参数:{}", JSON.toJSONString(param));
+
         WorkOrder workOrder = workOrderService.getById(param);
         if (workOrder.getOrderStatus() != 0 && workOrder.getOrderStatus() != 10 && workOrder.getOrderStatus() != 20) {
             return new Result<>(ErrCodeEnum.NO_STOP.getCode(), ErrCodeEnum.NO_STOP.getMessage());
@@ -94,11 +113,27 @@ public class WorkOrderController {
 
     @ApiOperation(value = "根据id关闭运单(运单分页列表PC端)", notes = "必传参数:id,orderStatus=50")
     @PostMapping("/close")
-    public Result close(@RequestBody WorkOrder param) {
-        log.info("根据id中止运单(运单分页列表PC端),调用/tms/work_order/close,参数:{}", JSON.toJSONString(param));
+    public Result close(@RequestHeader(value = "userId") Long userId,
+                        @RequestHeader(value = "userName") String userName,
+                        @RequestBody WorkOrder param) {
         if (param == null || param.getId() == null || param.getOrderStatus() != 50) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
+
+        if (param == null || param.getSpotId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        String utf8Name = userName;
+        try {
+            utf8Name = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        param.setUpdater(userId);
+        param.setUpdaterName(utf8Name);
+        param.setUpdateDate(LocalDateTime.now());
+
+        log.info("根据id中止运单(运单分页列表PC端),调用/tms/work_order/close,参数:{}", JSON.toJSONString(param));
+
         WorkOrder workOrder = workOrderService.getById(param);
         if (workOrder.getOrderStatus() != 40) {
             return new Result<>(ErrCodeEnum.NO_CLOSE.getCode(), ErrCodeEnum.NO_CLOSE.getMessage());
@@ -106,15 +141,30 @@ public class WorkOrderController {
         return new Result<>(workOrderService.saveOrUpdate(param));
     }
 
-    @ApiOperation(value = "根据id修改运单(运单分页列表PC端，已完成40已关闭50运单可改)", notes = "必传参数:id,orderStatus=60")
+    @ApiOperation(value = "根据id修改运单(运单分页列表PC端，待执行0已完成40已关闭50运单可改)", notes = "必传参数:id,orderStatus=60")
     @PostMapping("/pc_update")
-    public Result pcUpdate(@RequestBody WorkOrder param) {
-        log.info("根据id修改运单(运单分页列表PC端，已完成已关闭运单可改),调用/tms/work_order/pc_update,参数:{}", JSON.toJSONString(param));
+    public Result pcUpdate(@RequestHeader(value = "userId") Long userId,
+                           @RequestHeader(value = "userName") String userName,
+                           @RequestBody WorkOrder param) {
         if (param == null || param.getId() == null || param.getOrderStatus() != 50) {
             return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
         }
+
+        if (param == null || param.getSpotId() == null) {
+            return new Result<>(ErrCodeEnum.BAD_PARAM.getCode(), ErrCodeEnum.BAD_PARAM.getMessage());
+        }
+        String utf8Name = userName;
+        try {
+            utf8Name = URLDecoder.decode(userName, "UTF-8");
+        } catch (UnsupportedEncodingException ignored) {
+        }
+        param.setUpdater(userId);
+        param.setUpdaterName(utf8Name);
+        param.setUpdateDate(LocalDateTime.now());
+        log.info("根据id修改运单(运单分页列表PC端，已完成已关闭运单可改),调用/tms/work_order/pc_update,参数:{}", JSON.toJSONString(param));
+
         WorkOrder workOrder = workOrderService.getById(param);
-        if (workOrder.getOrderStatus() != 40 && workOrder.getOrderStatus() != 50) {
+        if (workOrder.getOrderStatus() != 0 || workOrder.getOrderStatus() != 40 && workOrder.getOrderStatus() != 50) {
             return new Result<>(ErrCodeEnum.NO_UPDATE.getCode(), ErrCodeEnum.NO_UPDATE.getMessage());
         }
         return new Result<>(workOrderService.saveOrUpdate(param));

src/main/java/com/aoyang/tms/controller/param/TruckEscortAddParam.java

@@ -20,6 +20,13 @@ public class TruckEscortAddParam {
     @ApiModelProperty(value = "用户姓名")
     private String escortName;
 
+    @ApiModelProperty(value = "卡车id")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    private Long truckId;
+
+    @ApiModelProperty(value = "车牌号")
+    private String carNumber;
+
     @ApiModelProperty(value = "创建人id")
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long creater;

src/main/java/com/aoyang/tms/entity/TmsGasFee.java

@@ -78,6 +78,10 @@ public class TmsGasFee implements Serializable {
     @TableField("kilometre")
     private Integer kilometre;
 
+    @ApiModelProperty(value = "公里数url")
+    @TableField("kilometre_url")
+    private String kilometreUrl;
+
     @ApiModelProperty(value = "创建人id")
     @TableField("creater")
     @JsonFormat(shape = JsonFormat.Shape.STRING)

src/main/java/com/aoyang/tms/entity/TmsLineCost.java

@@ -66,6 +66,10 @@ public class TmsLineCost implements Serializable {
     @TableField("kilometre")
     private Integer kilometre;
 
+    @ApiModelProperty(value = "公里数url")
+    @TableField("kilometre_url")
+    private String kilometreUrl;
+
     @ApiModelProperty(value = "ETC路费")
     @TableField("etc_fee")
     private BigDecimal etcFee;

src/main/java/com/aoyang/tms/entity/WorkSpot.java

@@ -53,8 +53,8 @@ public class WorkSpot implements Serializable {
     private String orgShortName;
 
     @ApiModelProperty(value = "具体地址")
-    @TableField("adress")
-    private String adress;
+    @TableField("address")
+    private String address;
 
     @ApiModelProperty(value = "1装车点、2卸车点、3收车点，不能为空")
     @TableField("type")

src/main/java/com/aoyang/tms/service/impl/TruckEscortServiceImpl.java

@@ -107,6 +107,12 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
             truckEscort.setUpdater(param.getCreater());
             truckEscort.setUpdaterName(param.getCreaterName());
             truckEscort.setUpdateDate(param.getCreateDate());
+            if (param.getCarNumber() != null) {
+                truckEscort.setCarNumber(param.getCarNumber());
+            }
+            if (param.getTruckId() != null) {
+                truckEscort.setTruckId(param.getTruckId());
+            }
             flag = saveOrUpdate(truckEscort);
         }
         return flag;

src/main/resources/mapper/TmsGasFeeMapper.xml

@@ -15,6 +15,7 @@
         <result column="gas_qty_fee" property="gasQtyFee" />
         <result column="type" property="type" />
         <result column="kilometre" property="kilometre" />
+        <result column="kilometre_url" property="kilometreUrl" />
         <result column="creater" property="creater" />
         <result column="creater_name" property="createrName" />
         <result column="create_date" property="createDate" />
@@ -25,7 +26,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, cycle_id, truck_id, car_number, trailer_number, gas_qty_date, gas_qty, unit_price, gas_qty_fee, type, kilometre, creater, creater_name, create_date, updater, updater_name, update_date
+        id, cycle_id, truck_id, car_number, trailer_number, gas_qty_date, gas_qty, unit_price, gas_qty_fee, type, kilometre, kilometre_url, creater, creater_name, create_date, updater, updater_name, update_date
     </sql>
 
 </mapper>

src/main/resources/mapper/TmsLineCostMapper.xml

@@ -12,6 +12,7 @@
         <result column="line_start" property="lineStart" />
         <result column="line_end" property="lineEnd" />
         <result column="kilometre" property="kilometre" />
+        <result column="kilometre_url" property="kilometreUrl" />
         <result column="etc_fee" property="etcFee" />
         <result column="cash" property="cash" />
         <result column="parking_fee" property="parkingFee" />
@@ -25,7 +26,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, cycle_id, truck_id, car_number, trailer_number, line_start, line_end, kilometre, etc_fee, cash, parking_fee, creater, creater_name, create_date, updater, updater_name, update_date
+        id, cycle_id, truck_id, car_number, trailer_number, line_start, line_end, kilometre, kilometre_url, etc_fee, cash, parking_fee, creater, creater_name, create_date, updater, updater_name, update_date
     </sql>
 
 </mapper>

src/main/resources/mapper/WorkSpotMapper.xml

@@ -9,7 +9,7 @@
         <result column="org_id" property="orgId"/>
         <result column="org_name" property="orgName"/>
         <result column="org_short_name" property="orgShortName"/>
-        <result column="adress" property="adress"/>
+        <result column="address" property="address"/>
         <result column="type" property="type"/>
         <result column="location" property="location"/>
         <result column="region_data" property="regionData"/>
@@ -35,7 +35,7 @@
         org_id,
         org_name,
         org_short_name,
-        adress,
+        address,
         type,
         region_data,
         location,