Skip to content

S
SiEn
Commit 21900191 by lpx
Options

Merge branch 'master' of http://119.28.51.83/hewei/Jumeirah into dev/lanpingxiong

parents a323a974 e20ae98d
Showing with 56 additions and 103 deletions
api-app/src/main/java/com/jumeirah/api/app/controller/AirIntroducedController.java
...@@ -38,7 +38,7 @@ public class AirIntroducedController extends BaseController { ...@@ -38,7 +38,7 @@ public class AirIntroducedController extends BaseController {
*/ */
@PostMapping("/getPageList") @PostMapping("/getPageList")
@OperationLog(name = "航空公司介绍分页列表", type = OperationLogType.PAGE) @OperationLog(name = "航空公司介绍分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "航空公司介绍分页列表", response = MerchantQueryVo.class) @ApiOperation(value = "航空公司介绍分页列表")
public ApiResult<Paging<MerchantQueryVo>> getMerchantPageList(@Validated @RequestBody MerchantPageParam merchantPageParam) throws Exception { public ApiResult<Paging<MerchantQueryVo>> getMerchantPageList(@Validated @RequestBody MerchantPageParam merchantPageParam) throws Exception {
Paging<MerchantQueryVo> paging = merchantService.getMerchantPageList(merchantPageParam); Paging<MerchantQueryVo> paging = merchantService.getMerchantPageList(merchantPageParam);
return ApiResult.ok(paging); return ApiResult.ok(paging);
......
common/src/main/java/com/jumeirah/common/entity/CharterIntroduction.java
...@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; ...@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.sql.Timestamp;
/** /**
* 包机介绍 * 包机介绍
...@@ -34,44 +34,28 @@ public class CharterIntroduction extends BaseEntity { ...@@ -34,44 +34,28 @@ public class CharterIntroduction extends BaseEntity {
@ApiModelProperty("商家ID") @ApiModelProperty("商家ID")
private Long mcId; private Long mcId;
@ApiModelProperty("私人包机图片url")
private String imgUrlPrivate;
@ApiModelProperty("私人包机文字")
private String textPrivate;
@ApiModelProperty("团体包机图片url")
private String imgUrlTeam;
@ApiModelProperty("团体包机文字")
private String textTeam;
@ApiModelProperty("货运包机图片url")
private String imgUrlGoods;
@ApiModelProperty("货运包机文字")
private String textGoods;
@ApiModelProperty("医疗包机图片url")
private String imgUrlMedical;
@ApiModelProperty("医疗包机文字")
private String textMedical;
@ApiModelProperty("标题")
private String title;
@ApiModelProperty("内容")
private String contents;
@NotNull(message = "状态，0-正常，1-取消，99-删除不能为空") @NotNull(message = "状态，0-正常，1-取消，99-删除不能为空")
@ApiModelProperty("状态，0-正常，1-取消，99-删除") @ApiModelProperty("状态，0-正常，1-取消，99-删除")
private Integer status; private Integer status;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private Date createTime; private Timestamp createTime;
@ApiModelProperty("更新时间") @ApiModelProperty("更新时间")
private Date updateTime; private Timestamp updateTime;
@ApiModelProperty("包机图片url")
private String imgUrl;
@ApiModelProperty("包机文字")
private String text;
@ApiModelProperty("类型 1私人;2团体;3货运;4医疗")
private Integer type;
@ApiModelProperty("图片高")
private Integer imageListHeight;
@ApiModelProperty("图片宽")
private Integer imageListWidth;
} }
common/src/main/java/com/jumeirah/common/param/CharterIntroductionPageParam.java
...@@ -2,6 +2,7 @@ package com.jumeirah.common.param; ...@@ -2,6 +2,7 @@ package com.jumeirah.common.param;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam; import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
...@@ -20,4 +21,7 @@ import lombok.experimental.Accessors; ...@@ -20,4 +21,7 @@ import lombok.experimental.Accessors;
@ApiModel(value = "包机介绍分页参数") @ApiModel(value = "包机介绍分页参数")
public class CharterIntroductionPageParam extends BasePageOrderParam { public class CharterIntroductionPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("类型 1私人;2团体;3货运;4医疗")
private Integer type = 1;
} }
common/src/main/java/com/jumeirah/common/service/impl/CharterIntroductionServiceImpl.java
...@@ -62,9 +62,9 @@ public class CharterIntroductionServiceImpl extends BaseServiceImpl<CharterIntro ...@@ -62,9 +62,9 @@ public class CharterIntroductionServiceImpl extends BaseServiceImpl<CharterIntro
@Override @Override
public Paging<CharterIntroductionQueryForAppVo> getCharterIntroductionForAppPageList(CharterIntroductionPageParam charterIntroductionPageParam) throws Exception { public Paging<CharterIntroductionQueryForAppVo> getCharterIntroductionForAppPageList(CharterIntroductionPageParam charterIntroductionPageParam) throws Exception {
Page<CharterIntroductionQueryForAppVo> page = new PageInfo<>(charterIntroductionPageParam, OrderItem.desc(getLambdaColumn(CharterIntroduction::getCreateTime))); Page<CharterIntroductionQueryForAppVo> page = new PageInfo<>(charterIntroductionPageParam, OrderItem.desc("ci.create_time"));
IPage<CharterIntroductionQueryForAppVo> iPage = charterIntroductionMapper.getCharterIntroductionForAppPageList(page, charterIntroductionPageParam); IPage<CharterIntroductionQueryForAppVo> iPage = charterIntroductionMapper.getCharterIntroductionForAppPageList(page, charterIntroductionPageParam);
return new Paging<CharterIntroductionQueryForAppVo>(iPage); return new Paging<>(iPage);
} }
} }
common/src/main/java/com/jumeirah/common/vo/CharterIntroductionQueryForAppVo.java
...@@ -21,37 +21,19 @@ import java.io.Serializable; ...@@ -21,37 +21,19 @@ import java.io.Serializable;
public class CharterIntroductionQueryForAppVo implements Serializable { public class CharterIntroductionQueryForAppVo implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("商家ID") @ApiModelProperty("商家name")
private Long mcName; private String mcName;
@ApiModelProperty("商家头像")
@ApiModelProperty("私人包机图片url") private String mcHead;
private String imgUrlPrivate; @ApiModelProperty("包机图片url")
private String imgUrl;
@ApiModelProperty("私人包机文字")
private String textPrivate; @ApiModelProperty("包机文字")
private String text;
@ApiModelProperty("团体包机图片url")
private String imgUrlTeam; @ApiModelProperty("图片高")
private Integer imageListHeight;
@ApiModelProperty("团体包机文字") @ApiModelProperty("图片宽")
private String textTeam; private Integer imageListWidth;
@ApiModelProperty("货运包机图片url")
private String imgUrlGoods;
@ApiModelProperty("货运包机文字")
private String textGoods;
@ApiModelProperty("医疗包机图片url")
private String imgUrlMedical;
@ApiModelProperty("医疗包机文字")
private String textMedical;
// @ApiModelProperty("标题")
// private String title;
//
// @ApiModelProperty("内容")
// private String contents;
} }
\ No newline at end of file
common/src/main/java/com/jumeirah/common/vo/CharterIntroductionQueryVo.java
...@@ -28,35 +28,10 @@ public class CharterIntroductionQueryVo implements Serializable { ...@@ -28,35 +28,10 @@ public class CharterIntroductionQueryVo implements Serializable {
@ApiModelProperty("商家ID") @ApiModelProperty("商家ID")
private Long mcId; private Long mcId;
@ApiModelProperty("私人包机图片url") @ApiModelProperty("图片高")
private String imgUrlPrivate; private Integer imageListHeight;
@ApiModelProperty("图片宽")
@ApiModelProperty("私人包机文字") private Integer imageListWidth;
private String textPrivate;
@ApiModelProperty("团体包机图片url")
private String imgUrlTeam;
@ApiModelProperty("团体包机文字")
private String textTeam;
@ApiModelProperty("货运包机图片url")
private String imgUrlGoods;
@ApiModelProperty("货运包机文字")
private String textGoods;
@ApiModelProperty("医疗包机图片url")
private String imgUrlMedical;
@ApiModelProperty("医疗包机文字")
private String textMedical;
@ApiModelProperty("标题")
private String title;
@ApiModelProperty("内容")
private String contents;
@ApiModelProperty("状态，0-正常，1-取消，99-删除") @ApiModelProperty("状态，0-正常，1-取消，99-删除")
private Integer status; private Integer status;
......
common/src/main/resources/mapper/CharterIntroductionMapper.xml
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, mc_id, img_url_private, text_private, img_url_team, text_team, img_url_goods, text_goods, img_url_medical, text_medical, title, contents, status, create_time, update_time id, mc_id, status, create_time, update_time,type,text,img_url,image_list_height,image_list_width
</sql> </sql>
<sql id="Base_Column_ListForApp"> <sql id="Base_Column_ListForApp">
mc_id, img_url_private, text_private, img_url_team, text_team, img_url_goods, text_goods, img_url_medical, text_medical, title, contents, status, create_time, update_time text,img_url,ci.image_list_height,ci.image_list_width,m.head AS mcHead,m.name AS mcName
</sql> </sql>
<select id="getCharterIntroductionById" resultType="com.jumeirah.common.vo.CharterIntroductionQueryVo"> <select id="getCharterIntroductionById" resultType="com.jumeirah.common.vo.CharterIntroductionQueryVo">
...@@ -23,13 +23,14 @@ ...@@ -23,13 +23,14 @@
from charter_introduction from charter_introduction
</select> </select>
<select id="getCharterIntroductionForAppPageList" <select id="getCharterIntroductionForAppPageList"
parameterType="com.jumeirah.common.param.CharterIntroductionPageParam" parameterType="com.jumeirah.common.param.CharterIntroductionPageParam"
resultType="com.jumeirah.common.vo.CharterIntroductionQueryForAppVo"> resultType="com.jumeirah.common.vo.CharterIntroductionQueryForAppVo">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_ListForApp"/>
from charter_introduction from charter_introduction ci
INNER JOIN merchant m ON ci.mc_id=m.id
where ci.type = #{param.type}
</select> </select>
......
config/src/main/resources/config/application.yml
...@@ -192,10 +192,16 @@ spring-boot-plus: ...@@ -192,10 +192,16 @@ spring-boot-plus:
# 排除Swagger # 排除Swagger
- ${spring-boot-plus.swagger-paths} - ${spring-boot-plus.swagger-paths}
# 排除actuator # 排除actuator
# - /actuator/** # - /actuator/**
- # 排除首页 - # 排除首页
- /,/index.html - /,/index.html
- /app/noRole - /app/noRole
# 航空公司介绍分页列表
- /app/airline/getPageList
# 公务机出售托管表分页列表
- /app/businessPlain/getPageList
# 包机介绍分页列表
- /app/charterIntroduction/getPageList
# 多行字符串权限配置 # 多行字符串权限配置
filter-chain-definitions: | filter-chain-definitions: |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment