优化包机列表;

common/src/main/java/com/jumeirah/common/entity/CharterIntroduction.java

@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
-import java.util.Date;
+import java.sql.Timestamp;
 
 /**
  * 包机介绍
@@ -34,44 +34,28 @@ public class CharterIntroduction extends BaseEntity {
     @ApiModelProperty("商家ID")
     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-删除不能为空")
     @ApiModelProperty("状态，0-正常，1-取消，99-删除")
     private Integer status;
 
     @ApiModelProperty("创建时间")
-    private Date createTime;
+    private Timestamp createTime;
 
     @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;
 
 import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,4 +21,7 @@ import lombok.experimental.Accessors;
 @ApiModel(value = "包机介绍分页参数")
 public class CharterIntroductionPageParam extends BasePageOrderParam {
     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
 
     @Override
     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);
-        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;
 public class CharterIntroductionQueryForAppVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("商家ID")
-    private Long mcName;
-
-    @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;
+    @ApiModelProperty("商家name")
+    private String mcName;
+    @ApiModelProperty("商家头像")
+    private String mcHead;
+    @ApiModelProperty("包机图片url")
+    private String imgUrl;
+
+    @ApiModelProperty("包机文字")
+    private String text;
+
+    @ApiModelProperty("图片高")
+    private Integer imageListHeight;
+    @ApiModelProperty("图片宽")
+    private Integer imageListWidth;
 
 }
\ 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 {
     @ApiModelProperty("商家ID")
     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;
+    @ApiModelProperty("图片高")
+    private Integer imageListHeight;
+    @ApiModelProperty("图片宽")
+    private Integer imageListWidth;
 
     @ApiModelProperty("状态，0-正常，1-取消，99-删除")
     private Integer status;

common/src/main/resources/mapper/CharterIntroductionMapper.xml

@@ -4,10 +4,10 @@
 
     <!-- 通用查询结果列 -->
     <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 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>
 
     <select id="getCharterIntroductionById" resultType="com.jumeirah.common.vo.CharterIntroductionQueryVo">
@@ -23,13 +23,14 @@
         from charter_introduction
     </select>
 
-
     <select id="getCharterIntroductionForAppPageList"
             parameterType="com.jumeirah.common.param.CharterIntroductionPageParam"
             resultType="com.jumeirah.common.vo.CharterIntroductionQueryForAppVo">
         select
-        <include refid="Base_Column_List"/>
-        from charter_introduction
+        <include refid="Base_Column_ListForApp"/>
+        from charter_introduction ci
+        INNER JOIN merchant m ON ci.mc_id=m.id
+        where ci.type = #{param.type}
     </select>
 
 

config/src/main/resources/config/application.yml

@@ -196,6 +196,12 @@ spring-boot-plus:
       - # 排除首页
       - /,/index.html
       - /app/noRole
+      # 航空公司介绍分页列表
+      - /app/airline/getPageList
+      # 公务机出售托管表分页列表
+      - /app/businessPlain/getPageList
+      # 包机介绍分页列表
+      - /app/charterIntroduction/getPageList
 
     # 多行字符串权限配置
     filter-chain-definitions: |