行程相关

16362a34 · giaogiao · 2484b0a0 · 16362a34 · 16362a34 · 16362a34
Commit 16362a34 authored Oct 10, 2020 by giaogiao
7 changed files
--- a/api-app/src/main/java/com/jumeirah/api/app/controller/StrokeController.java
+++ b/api-app/src/main/java/com/jumeirah/api/app/controller/StrokeController.java
@@ -12,6 +12,7 @@ import com.jumeirah.common.vo.StrokeQueryVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
+import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
 import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
@@ -37,8 +38,8 @@ import org.springframework.web.bind.annotation.RestController;
 */
 @Slf4j
 @RestController
-@RequestMapping("/stroke")
+@RequestMapping("/app/stroke")
-@Api(value = "行程表API", tags = {"行程表"})
+@Api(value = "行程API", tags = {"行程"})
 public class StrokeController extends BaseController {
    @Autowired
@@ -54,8 +55,7 @@ public class StrokeController extends BaseController {
        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
        Stroke stroke = new Stroke();
        BeanUtils.copyProperties(strokeAddOneWayVo, stroke);
-        stroke.setType(0)
+        stroke.setType(0);
-                .setCreateTime(System.currentTimeMillis());
        boolean flag = strokeService.saveStroke(stroke);
        return ApiResult.result(flag);
    }
@@ -70,8 +70,7 @@ public class StrokeController extends BaseController {
        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
        Stroke stroke = new Stroke();
        BeanUtils.copyProperties(strokeAddBackAndForthVo, stroke);
-        stroke.setType(1)
+        stroke.setType(1);
-                .setCreateTime(System.currentTimeMillis());
        boolean flag = strokeService.saveStroke(stroke);
        return ApiResult.result(flag);
    }
@@ -86,8 +85,7 @@ public class StrokeController extends BaseController {
        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
        Stroke stroke = new Stroke();
        BeanUtils.copyProperties(strokeAddFreightVo, stroke);
-        stroke.setType(2)
+        stroke.setType(2);
-                .setCreateTime(System.currentTimeMillis());
        boolean flag = strokeService.saveStroke(stroke);
        return ApiResult.result(flag);
    }
@@ -103,23 +101,22 @@ public class StrokeController extends BaseController {
        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
        Stroke stroke = new Stroke();
        BeanUtils.copyProperties(strokeAddMedicalTreatmentVo, stroke);
-        stroke.setType(3)
+        stroke.setType(3);
-                .setCreateTime(System.currentTimeMillis());
        boolean flag = strokeService.saveStroke(stroke);
        return ApiResult.result(flag);
    }
-//    /**
+    /**
-//     * 修改行程表
+     * 修改行程表
-//     */
+     */
-//    @PostMapping("/update")
+    @PostMapping("/update")
-//    @OperationLog(name = "修改行程表", type = OperationLogType.UPDATE)
+    @OperationLog(name = "修改行程表", type = OperationLogType.UPDATE)
-//    @ApiOperation(value = "修改行程表", response = ApiResult.class)
+    @ApiOperation(value = "修改行程表", response = ApiResult.class)
-//    public ApiResult<Boolean> updateStroke(@Validated(Update.class) @RequestBody Stroke stroke) throws Exception {
+    public ApiResult<Boolean> updateStroke(@Validated(Update.class) @RequestBody Stroke stroke) throws Exception {
-//        boolean flag = strokeService.updateStroke(stroke);
+        boolean flag = strokeService.updateStroke(stroke);
-//        return ApiResult.result(flag);
+        return ApiResult.result(flag);
-//    }
+    }
    /**
     * 删除行程表
@@ -159,7 +156,7 @@ public class StrokeController extends BaseController {
     */
    @PostMapping("/getMyStrokePageList")
    @OperationLog(name = "行程分页列表", type = OperationLogType.PAGE)
-    @ApiOperation(value = "行程分页列表", response = StrokeQueryVo.class)
+    @ApiOperation(value = "行程分页列表")
    public ApiResult<Paging<StrokeQueryVo>> getMyStrokePageList(@Validated @RequestBody StrokePageParam strokePageParam) throws Exception {
        Paging<StrokeQueryVo> paging = strokeService.getStrokePageList(strokePageParam);
        return ApiResult.ok(paging);

--- a/common/src/main/java/com/jumeirah/common/entity/Stroke.java
+++ b/common/src/main/java/com/jumeirah/common/entity/Stroke.java
@@ -13,6 +13,7 @@ import lombok.experimental.Accessors;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.sql.Timestamp;
 /**
 * 行程表
@@ -62,10 +63,10 @@ public class Stroke extends BaseEntity {
    @NotNull(message = "出发时间不能为空")
    @ApiModelProperty("出发时间")
-    private Long outsetTime;
+    private Timestamp outsetTime;
    @ApiModelProperty("返程时间")
-    private Long returnTime;
+    private Timestamp returnTime;
    @NotNull(message = "行程类型，0-单程，1-往返行程，2-货运，3-医疗不能为空")
    @ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
@@ -77,10 +78,10 @@ public class Stroke extends BaseEntity {
    @NotNull(message = "创建时间不能为空")
    @ApiModelProperty("创建时间")
-    private Long createTime;
+    private Timestamp createTime;
    @ApiModelProperty("更新时间")
-    private Long updateTime;
+    private Timestamp updateTime;
    @ApiModelProperty("货物名称")
    private String goodsName;
@@ -113,6 +114,26 @@ public class Stroke extends BaseEntity {
    @ApiModelProperty("用户ID")
    private Long userId;
+    @NotBlank(message = "出发机场名称不能为空")
+    @ApiModelProperty("出发机场名称")
+    private String outsetAirportName;
+    @NotBlank(message = "到达机场名称不能为空")
+    @ApiModelProperty("到达机场名称")
+    private String arriveAirportName;
+    @NotNull(message = "返程飞机型号ID为空")
+    @ApiModelProperty("返程飞机型号ID")
+    private Long arrivePlainTypeId;
+    @NotBlank(message = "返程出发机场名称不能为空")
+    @ApiModelProperty("返程出发机场名称")
+    private String backOutsetAirportName;
+    @NotBlank(message = "返程到达机场名称不能为空")
+    @ApiModelProperty("返程到达机场名称")
+    private String backArriveAirportName;
    @NotNull(message = "商家id不能为空")
    @ApiModelProperty("商家id")
    private Long mcId;

--- a/common/src/main/java/com/jumeirah/common/vo/StrokeDetailVo.java
+++ b/common/src/main/java/com/jumeirah/common/vo/StrokeDetailVo.java
@@ -12,6 +12,8 @@ import lombok.experimental.Accessors;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 /**
 * <pre>
@@ -62,11 +64,10 @@ public class StrokeDetailVo implements Serializable {
    @NotNull(message = "出发时间不能为空")
    @ApiModelProperty("出发时间")
-    private Long outsetTime;
+    private Timestamp outsetTime;
    @ApiModelProperty("返程时间")
-    private Long returnTime;
+    private Timestamp returnTime;
    @NotNull(message = "行程类型，0-单程，1-往返行程，2-货运，3-医疗不能为空")
    @ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
@@ -78,10 +79,10 @@ public class StrokeDetailVo implements Serializable {
    @NotNull(message = "创建时间不能为空")
    @ApiModelProperty("创建时间")
-    private Long createTime;
+    private Timestamp createTime;
    @ApiModelProperty("更新时间")
-    private Long updateTime;
+    private Timestamp updateTime;
    @ApiModelProperty("货物名称")
    private String goodsName;
@@ -107,8 +108,8 @@ public class StrokeDetailVo implements Serializable {
    @ApiModelProperty("备注")
    private String remarks;
-    @ApiModelProperty("价格，单位：分")
+    @ApiModelProperty("价格")
-    private Long money;
+    private BigDecimal money;
    @NotNull(message = "用户ID不能为空")
    @ApiModelProperty("用户ID")
@@ -122,4 +123,28 @@ public class StrokeDetailVo implements Serializable {
    @ApiModelProperty("用户选择机型")
    private Long choosePlainType;
+    @NotBlank(message = "出发机场名称不能为空")
+    @ApiModelProperty("出发机场名称")
+    private String outsetAirportName;
+    @NotBlank(message = "到达机场名称不能为空")
+    @ApiModelProperty("到达机场名称")
+    private String arriveAirportName;
+    @NotNull(message = "返程飞机型号ID为空")
+    @ApiModelProperty("返程飞机型号ID")
+    private Long arrivePlainTypeId;
+    @NotBlank(message = "返程出发机场名称不能为空")
+    @ApiModelProperty("返程出发机场名称")
+    private String backOutsetAirportName;
+    @NotBlank(message = "返程到达机场名称不能为空")
+    @ApiModelProperty("返程到达机场名称")
+    private String backArriveAirportName;
+    @ApiModelProperty("商家名称")
+    private String merchantName;
 }
\ No newline at end of file
--- a/common/src/main/java/com/jumeirah/common/vo/StrokeQueryVo.java
+++ b/common/src/main/java/com/jumeirah/common/vo/StrokeQueryVo.java
@@ -5,7 +5,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
 /**
 * <pre>
@@ -31,10 +35,10 @@ public class StrokeQueryVo implements Serializable {
        private String cityArriveName;
        @ApiModelProperty("出发时间")
-        private Long outsetTime;
+        private Timestamp outsetTime;
        @ApiModelProperty("返程时间")
-        private Long returnTime;
+        private Timestamp returnTime;
        @ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
        private Integer type;
@@ -42,12 +46,32 @@ public class StrokeQueryVo implements Serializable {
        @ApiModelProperty("状态，0-审核中，1-进行中，2-已完成，99-取消")
        private Integer status;
-        @ApiModelProperty("备注")
+        @ApiModelProperty("价格")
-        private String remarks;
+        private BigDecimal money;
-        @ApiModelProperty("价格，单位：分")
-        private Long money;
        @ApiModelProperty("用户ID")
        private Long userId;
+        @ApiModelProperty("商家名称")
+        private String merchantName;
+        @NotBlank(message = "出发机场名称不能为空")
+        @ApiModelProperty("出发机场名称")
+        private String outsetAirportName;
+        @NotBlank(message = "到达机场名称不能为空")
+        @ApiModelProperty("到达机场名称")
+        private String arriveAirportName;
+        @NotNull(message = "返程飞机型号ID为空")
+        @ApiModelProperty("返程飞机型号ID")
+        private Long arrivePlainTypeId;
+        @NotBlank(message = "返程出发机场名称不能为空")
+        @ApiModelProperty("返程出发机场名称")
+        private String backOutsetAirportName;
+        @NotBlank(message = "返程到达机场名称不能为空")
+        @ApiModelProperty("返程到达机场名称")
+        private String backArriveAirportName;
 }
\ No newline at end of file
--- a/common/src/main/resources/mapper/StrokeMapper.xml
+++ b/common/src/main/resources/mapper/StrokeMapper.xml
@@ -2,14 +2,30 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jumeirah.common.mapper.StrokeMapper">
-    <!-- 通用查询结果列 -->
+    <!-- 分页列表查询结果列 -->
    <sql id="Page_Column_List">
-        id, city_outset_id, city_outset_name, city_arrive_id, city_arrive_name, people_mun, plain_type_id, outset_time, return_time, type, status, money, user_id
+        s.id,
-    </sql>
+        city_outset_id,
+        city_outset_name,
+        city_arrive_id,
+        city_arrive_name,
+        people_mun,
+        plain_type_id,
+        outset_time,
+        return_time,
+        type,
+        STATUS,
+        money,
+        user_id,
+        mu.username AS merchantName
+        ,outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name
+   </sql>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, city_outset_id, deleted, city_outset_name, city_arrive_id, city_arrive_name, people_mun, plain_type_id, outset_time, return_time, type, status, create_time, update_time, goods_name, goods_size, goods_weight, disease_name, instruments, medical_persons, remarks, money, user_id
+        ,outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name
    </sql>
    <select id="getStrokeById" resultType="com.jumeirah.common.vo.StrokeDetailVo">
@@ -22,14 +38,15 @@
            resultType="com.jumeirah.common.vo.StrokeQueryVo">
        select
        <include refid="Page_Column_List"/>
-        from stroke
+        from stroke s
+        INNER JOIN merchant_user mu ON mu.id = s.mc_id
        <where>
-            and user_id = #{userId}
+            and s.user_id = #{userId}
-            and deleted = 0
+            and s.deleted = 0
            <if test="param.status != -1">
-                -- -1: 查询全部
+                -- 查询全部 = -1
-                and `status` = #{param.status}
+                and s.`status` = #{param.status}
            </if>
        </where>
    </select>

--- a/framework/src/main/java/io/geekidea/springbootplus/framework/util/Jackson.java
+++ b/framework/src/main/java/io/geekidea/springbootplus/framework/util/Jackson.java
@@ -34,7 +34,7 @@ public class Jackson {
    /**
     * 时区
     */
-    private static final TimeZone timeZone = TimeZone.getTimeZone("GMT+8");
+    private static final TimeZone timeZone = TimeZone.getTimeZone("GMT");
    /**
     * 键按自然顺序输出
@@ -76,7 +76,6 @@ public class Jackson {
     * 键按自然顺序格式化输出
     *
     * @param object
-     * @param prettyFormat
     * @return
     */
    public static String toJsonStringNonNull(Object object) {

--- a/generator/src/main/resources/templates/controller.java.vm
+++ b/generator/src/main/resources/templates/controller.java.vm
@@ -81,7 +81,7 @@ private ${table.serviceName} ${cfg.serviceObjectName};
        #if(${cfg.operationLog})
        @OperationLog(name = "添加$!{table.comment}", type = OperationLogType.ADD)
        #end
-    @ApiOperation(value = "添加$!{table.comment}", response = ApiResult.class)
+    @ApiOperation(value = "添加$!{table.comment}")
    public ApiResult<Boolean> add${entity}(#if(${cfg.paramValidation})@Validated(Add.class) #end@RequestBody ${entity} ${cfg.entityObjectName})throws Exception{
            boolean flag= ${cfg.serviceObjectName}.save${entity}(${cfg.entityObjectName});
            return ApiResult.result(flag);
@@ -97,7 +97,7 @@ private ${table.serviceName} ${cfg.serviceObjectName};
        #if(${cfg.operationLog})
        @OperationLog(name = "修改$!{table.comment}", type = OperationLogType.UPDATE)
        #end
-    @ApiOperation(value = "修改$!{table.comment}", response = ApiResult.class)
+    @ApiOperation(value = "修改$!{table.comment}")
    public ApiResult<Boolean> update${entity}(#if(${cfg.paramValidation})@Validated(Update.class) #end@RequestBody ${entity} ${cfg.entityObjectName})throws Exception{
            boolean flag= ${cfg.serviceObjectName}.update${entity}(${cfg.entityObjectName});
            return ApiResult.result(flag);
@@ -113,7 +113,7 @@ private ${table.serviceName} ${cfg.serviceObjectName};
        #if(${cfg.operationLog})
        @OperationLog(name = "删除$!{table.comment}", type = OperationLogType.DELETE)
        #end
-    @ApiOperation(value = "删除$!{table.comment}", response = ApiResult.class)
+    @ApiOperation(value = "删除$!{table.comment}")
    public ApiResult<Boolean> delete${entity}(@PathVariable("id") Long id)throws Exception{
            boolean flag= ${cfg.serviceObjectName}.delete${entity}(id);
            return ApiResult.result(flag);
@@ -129,7 +129,7 @@ private ${table.serviceName} ${cfg.serviceObjectName};
        #if(${cfg.operationLog})
        @OperationLog(name = "$!{table.comment}详情", type = OperationLogType.INFO)
        #end
-    @ApiOperation(value = "$!{table.comment}详情", response = ${entity}${cfg.queryVo}.class)
+    @ApiOperation(value = "$!{table.comment}详情")
    public ApiResult<${entity}${cfg.queryVo}> get${entity}(@PathVariable("id") Long id)throws Exception{
        #if(${cfg.generatorStrategy} == 'SINGLE')
            ${entity}${cfg.queryVo} ${cfg.entityObjectName}${cfg.queryVo} = ${cfg.serviceObjectName}.getById(id);
@@ -149,7 +149,7 @@ private ${table.serviceName} ${cfg.serviceObjectName};
        #if(${cfg.operationLog})
        @OperationLog(name = "$!{table.comment}分页列表", type = OperationLogType.PAGE)
        #end
-    @ApiOperation(value = "$!{table.comment}分页列表", response = ${entity}${cfg.queryVo}.class)
+    @ApiOperation(value = "$!{table.comment}分页列表")
    public ApiResult<Paging<${entity}${cfg.queryVo}>>get${entity}PageList(#if(${cfg.paramValidation})@Validated #end@RequestBody ${entity}${cfg.pageParam} ${cfg.entityObjectName}${cfg.pageParam})throws Exception{
            Paging<${entity}${cfg.queryVo}> paging = ${cfg.entityObjectName}Service.get${entity}PageList(${cfg.entityObjectName}${cfg.pageParam});
            return ApiResult.ok(paging);