Skip to content

W
wecloud_im_server
Commit 61296735 by lpx
Options

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

parents 5b839909 cf7e82e7
Showing with 1065 additions and 8 deletions
api-app/src/main/java/com/jumeirah/api/app/controller/AirIntroducedController.java
......@@ -2,7 +2,6 @@ package com.jumeirah.api.app.controller;
import com.jumeirah.common.param.MerchantPageParam;
import com.jumeirah.common.service.MerchantService;
import com.jumeirah.common.service.MerchantUserService;
import com.jumeirah.common.vo.MerchantQueryVo;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.common.controller.BaseController;
......@@ -32,9 +31,6 @@ import org.springframework.web.bind.annotation.RestController;
public class AirIntroducedController extends BaseController {
@Autowired
private MerchantUserService merchantUserService;
@Autowired
private MerchantService merchantService;
/**
......
api-app/src/main/java/com/jumeirah/api/app/controller/BusinessPlainForAppController.java 0 → 100644
package com.jumeirah.api.app.controller;
import com.jumeirah.common.param.BusinessPlainPageParam;
import com.jumeirah.common.service.BusinessPlainService;
import com.jumeirah.common.vo.BusinessPlainQueryForAppVo;
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.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 公务机出售托管表 控制器
*
* @author giao
* @since 2020-10-14
*/
@Slf4j
@RestController
@RequestMapping("/app/businessPlain")
@Api(value = "公务机出售托管表API", tags = {"公务机出售托管表"})
public class BusinessPlainForAppController extends BaseController {
@Autowired
private BusinessPlainService businessPlainService;
// /**
// * 添加公务机出售托管表
// */
// @PostMapping("/add")
// @OperationLog(name = "添加公务机出售托管表", type = OperationLogType.ADD)
// @ApiOperation(value = "添加公务机出售托管表")
// public ApiResult<Boolean> addBusinessPlain(@Validated(Add.class) @RequestBody BusinessPlain businessPlain) throws Exception {
// boolean flag = businessPlainService.saveBusinessPlain(businessPlain);
// return ApiResult.result(flag);
// }
//
// /**
// * 修改公务机出售托管表
// */
// @PostMapping("/update")
// @OperationLog(name = "修改公务机出售托管表", type = OperationLogType.UPDATE)
// @ApiOperation(value = "修改公务机出售托管表")
// public ApiResult<Boolean> updateBusinessPlain(@Validated(Update.class) @RequestBody BusinessPlain businessPlain) throws Exception {
// boolean flag = businessPlainService.updateBusinessPlain(businessPlain);
// return ApiResult.result(flag);
// }
//
// /**
// * 删除公务机出售托管表
// */
// @PostMapping("/delete/{id}")
// @OperationLog(name = "删除公务机出售托管表", type = OperationLogType.DELETE)
// @ApiOperation(value = "删除公务机出售托管表")
// public ApiResult<Boolean> deleteBusinessPlain(@PathVariable("id") Long id) throws Exception {
// boolean flag = businessPlainService.deleteBusinessPlain(id);
// return ApiResult.result(flag);
// }
//
// /**
// * 获取公务机出售托管表详情
// */
// @GetMapping("/info/{id}")
// @OperationLog(name = "公务机出售托管表详情", type = OperationLogType.INFO)
// @ApiOperation(value = "公务机出售托管表详情")
// public ApiResult<BusinessPlainQueryVo> getBusinessPlain(@PathVariable("id") Long id) throws Exception {
// BusinessPlainQueryVo businessPlainQueryVo = businessPlainService.getBusinessPlainById(id);
// return ApiResult.ok(businessPlainQueryVo);
// }
/**
* 公务机出售托管表分页列表
*/
@PostMapping("/getPageList")
@OperationLog(name = "公务机出售托管表分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "公务机出售托管表分页列表")
public ApiResult<Paging<BusinessPlainQueryForAppVo>> getBusinessPlainPageList(@Validated @RequestBody BusinessPlainPageParam businessPlainPageParam) throws Exception {
Paging<BusinessPlainQueryForAppVo> paging = businessPlainService.getBusinessPlainPageListForApp(businessPlainPageParam);
return ApiResult.ok(paging);
}
}
api-app/src/main/java/com/jumeirah/api/app/controller/CharterIntroductionForAppController.java 0 → 100644
package com.jumeirah.api.app.controller;
import com.jumeirah.common.param.CharterIntroductionPageParam;
import com.jumeirah.common.service.CharterIntroductionService;
import com.jumeirah.common.vo.CharterIntroductionQueryForAppVo;
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.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 包机介绍 控制器
*
* @author giao
* @since 2020-10-14
*/
@Slf4j
@RestController
@RequestMapping("/app/charterIntroduction")
@Api(value = "包机介绍API", tags = {"包机介绍"})
public class CharterIntroductionForAppController extends BaseController {
@Autowired
private CharterIntroductionService charterIntroductionService;
// /**
// * 添加包机介绍
// */
// @PostMapping("/add")
// @OperationLog(name = "添加包机介绍", type = OperationLogType.ADD)
// @ApiOperation(value = "添加包机介绍")
// public ApiResult<Boolean> addCharterIntroduction(@Validated(Add.class) @RequestBody CharterIntroduction charterIntroduction) throws Exception {
// boolean flag = charterIntroductionService.saveCharterIntroduction(charterIntroduction);
// return ApiResult.result(flag);
// }
//
// /**
// * 修改包机介绍
// */
// @PostMapping("/update")
// @OperationLog(name = "修改包机介绍", type = OperationLogType.UPDATE)
// @ApiOperation(value = "修改包机介绍")
// public ApiResult<Boolean> updateCharterIntroduction(@Validated(Update.class) @RequestBody CharterIntroduction charterIntroduction) throws Exception {
// boolean flag = charterIntroductionService.updateCharterIntroduction(charterIntroduction);
// return ApiResult.result(flag);
// }
//
// /**
// * 删除包机介绍
// */
// @PostMapping("/delete/{id}")
// @OperationLog(name = "删除包机介绍", type = OperationLogType.DELETE)
// @ApiOperation(value = "删除包机介绍")
// public ApiResult<Boolean> deleteCharterIntroduction(@PathVariable("id") Long id) throws Exception {
// boolean flag = charterIntroductionService.deleteCharterIntroduction(id);
// return ApiResult.result(flag);
// }
//
// /**
// * 获取包机介绍详情
// */
// @GetMapping("/info/{id}")
// @OperationLog(name = "包机介绍详情", type = OperationLogType.INFO)
// @ApiOperation(value = "包机介绍详情")
// public ApiResult<CharterIntroductionQueryVo> getCharterIntroduction(@PathVariable("id") Long id) throws Exception {
// CharterIntroductionQueryVo charterIntroductionQueryVo = charterIntroductionService.getCharterIntroductionById(id);
// return ApiResult.ok(charterIntroductionQueryVo);
// }
// /**
// * 包机介绍分页列表
// */
// @PostMapping("/getPageList")
// @OperationLog(name = "包机介绍分页列表", type = OperationLogType.PAGE)
// @ApiOperation(value = "包机介绍分页列表")
// public ApiResult<Paging<CharterIntroductionQueryVo>> getCharterIntroductionPageList(@Validated @RequestBody CharterIntroductionPageParam charterIntroductionPageParam) throws Exception {
// Paging<CharterIntroductionQueryVo> paging = charterIntroductionService.getCharterIntroductionPageList(charterIntroductionPageParam);
// return ApiResult.ok(paging);
// }
/**
* 包机介绍分页列表
*/
@PostMapping("/getPageList")
@OperationLog(name = "包机介绍分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "包机介绍分页列表")
public ApiResult<Paging<CharterIntroductionQueryForAppVo>> getCharterIntroductionPageList(@Validated @RequestBody CharterIntroductionPageParam charterIntroductionPageParam) throws Exception {
Paging<CharterIntroductionQueryForAppVo> paging = charterIntroductionService.getCharterIntroductionForAppPageList(charterIntroductionPageParam);
return ApiResult.ok(paging);
}
}
api-app/src/main/java/com/jumeirah/api/app/controller/MerchantController.java → api-system/src/main/java/com/jumeirah/api/system/controller/MerchantController.java
package com.jumeirah.api.app.controller;
package com.jumeirah.api.system.controller;
import com.jumeirah.common.entity.Merchant;
import com.jumeirah.common.param.MerchantPageParam;
......@@ -31,8 +31,8 @@ import org.springframework.web.bind.annotation.RestController;
*/
@Slf4j
@RestController
@RequestMapping("/app/merchant")
@Api(value = "航空公司商家表API", tags = {"航空公司航空公司商家表"})
@RequestMapping("/sys/merchant")
@Api(value = "航空公司商家表API", tags = {"航空公司商家表"})
public class MerchantController extends BaseController {
@Autowired
......
common/src/main/java/com/jumeirah/common/entity/BusinessPlain.java 0 → 100644
package com.jumeirah.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* 公务机出售/托管表
*
* @author giao
* @since 2020-10-14
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "BusinessPlain对象")
public class BusinessPlain extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "主键ID不能为空")
@ApiModelProperty("主键ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@NotNull(message = "商家ID不能为空")
@ApiModelProperty("商家ID")
private Long mcId;
@NotNull(message = "业务类型，0-出售，1-托管不能为空")
@ApiModelProperty("业务类型，0-出售，1-托管")
private Integer businessType;
@ApiModelProperty("图片url")
private String imgUrl;
@ApiModelProperty("机型介绍")
private String introduction;
@ApiModelProperty("销售员姓名")
private String name;
@ApiModelProperty("销售联系电话")
private String phone;
@ApiModelProperty("微信号")
private String wechat;
@NotNull(message = "状态，0-正常，1-禁用，99-删除不能为空")
@ApiModelProperty("状态，0-正常，1-禁用，99-删除")
private Integer status;
@ApiModelProperty("创建时间（时间戳）")
private Date createTime;
@ApiModelProperty("更新时间（时间戳）")
private Date updateTime;
}
common/src/main/java/com/jumeirah/common/entity/CharterIntroduction.java 0 → 100644
package com.jumeirah.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* 包机介绍
*
* @author giao
* @since 2020-10-14
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "CharterIntroduction对象")
public class CharterIntroduction extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "主键ID不能为空")
@ApiModelProperty("主键ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@NotNull(message = "商家ID不能为空")
@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;
@ApiModelProperty("更新时间")
private Date updateTime;
}
common/src/main/java/com/jumeirah/common/entity/Merchant.java
......@@ -93,4 +93,9 @@ public class Merchant extends BaseEntity {
@ApiModelProperty("航空公司名称")
private String airlineName;
@ApiModelProperty("列表图片高")
private Long imageListHeight;
@ApiModelProperty("列表图片宽")
private Long imageListWidth;
}
common/src/main/java/com/jumeirah/common/mapper/BusinessPlainMapper.java 0 → 100644
package com.jumeirah.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jumeirah.common.entity.BusinessPlain;
import com.jumeirah.common.param.BusinessPlainPageParam;
import com.jumeirah.common.vo.BusinessPlainQueryForAppVo;
import com.jumeirah.common.vo.BusinessPlainQueryVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.io.Serializable;
/**
* 公务机出售/托管表 Mapper 接口
*
* @author giao
* @since 2020-10-14
*/
@Repository
public interface BusinessPlainMapper extends BaseMapper<BusinessPlain> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
BusinessPlainQueryVo getBusinessPlainById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param businessPlainPageParam
* @return
*/
IPage<BusinessPlainQueryVo> getBusinessPlainPageList(@Param("page") Page page, @Param("param") BusinessPlainPageParam businessPlainPageParam);
IPage<BusinessPlainQueryForAppVo> getBusinessPlainPageListForApp(@Param("page") Page page, @Param("param") BusinessPlainPageParam businessPlainPageParam);
}
common/src/main/java/com/jumeirah/common/mapper/CharterIntroductionMapper.java 0 → 100644
package com.jumeirah.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jumeirah.common.entity.CharterIntroduction;
import com.jumeirah.common.param.CharterIntroductionPageParam;
import com.jumeirah.common.vo.CharterIntroductionQueryForAppVo;
import com.jumeirah.common.vo.CharterIntroductionQueryVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.io.Serializable;
/**
* 包机介绍 Mapper 接口
*
* @author giao
* @since 2020-10-14
*/
@Repository
public interface CharterIntroductionMapper extends BaseMapper<CharterIntroduction> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
CharterIntroductionQueryVo getCharterIntroductionById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param charterIntroductionPageParam
* @return
*/
IPage<CharterIntroductionQueryVo> getCharterIntroductionPageList(@Param("page") Page page, @Param("param") CharterIntroductionPageParam charterIntroductionPageParam);
IPage<CharterIntroductionQueryForAppVo> getCharterIntroductionForAppPageList(@Param("page") Page page, @Param("param") CharterIntroductionPageParam charterIntroductionPageParam);
}
common/src/main/java/com/jumeirah/common/param/BusinessPlainPageParam.java 0 → 100644
package com.jumeirah.common.param;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <pre>
* 公务机出售/托管表 分页参数对象
* </pre>
*
* @author giao
* @date 2020-10-14
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "公务机出售/托管表分页参数")
public class BusinessPlainPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/jumeirah/common/param/CharterIntroductionPageParam.java 0 → 100644
package com.jumeirah.common.param;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* <pre>
* 包机介绍 分页参数对象
* </pre>
*
* @author giao
* @date 2020-10-14
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "包机介绍分页参数")
public class CharterIntroductionPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/jumeirah/common/service/BusinessPlainService.java 0 → 100644
package com.jumeirah.common.service;
import com.jumeirah.common.entity.BusinessPlain;
import com.jumeirah.common.param.BusinessPlainPageParam;
import com.jumeirah.common.vo.BusinessPlainQueryForAppVo;
import com.jumeirah.common.vo.BusinessPlainQueryVo;
import io.geekidea.springbootplus.framework.common.service.BaseService;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
/**
* 公务机出售/托管表 服务类
*
* @author giao
* @since 2020-10-14
*/
public interface BusinessPlainService extends BaseService<BusinessPlain> {
/**
* 保存
*
* @param businessPlain
* @return
* @throws Exception
*/
boolean saveBusinessPlain(BusinessPlain businessPlain) throws Exception;
/**
* 修改
*
* @param businessPlain
* @return
* @throws Exception
*/
boolean updateBusinessPlain(BusinessPlain businessPlain) throws Exception;
/**
* 删除
*
* @param id
* @return
* @throws Exception
*/
boolean deleteBusinessPlain(Long id) throws Exception;
/**
* 根据ID获取查询对象
*
* @param id
* @return
* @throws Exception
*/
BusinessPlainQueryVo getBusinessPlainById(Long id) throws Exception;
/**
* 获取分页对象
*
* @param businessPlainPageParam
* @return
* @throws Exception
*/
Paging<BusinessPlainQueryVo> getBusinessPlainPageList(BusinessPlainPageParam businessPlainPageParam) throws Exception;
Paging<BusinessPlainQueryForAppVo> getBusinessPlainPageListForApp(BusinessPlainPageParam businessPlainPageParam) throws Exception;
}
common/src/main/java/com/jumeirah/common/service/CharterIntroductionService.java 0 → 100644
package com.jumeirah.common.service;
import com.jumeirah.common.entity.CharterIntroduction;
import com.jumeirah.common.param.CharterIntroductionPageParam;
import com.jumeirah.common.vo.CharterIntroductionQueryForAppVo;
import com.jumeirah.common.vo.CharterIntroductionQueryVo;
import io.geekidea.springbootplus.framework.common.service.BaseService;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
/**
* 包机介绍 服务类
*
* @author giao
* @since 2020-10-14
*/
public interface CharterIntroductionService extends BaseService<CharterIntroduction> {
/**
* 保存
*
* @param charterIntroduction
* @return
* @throws Exception
*/
boolean saveCharterIntroduction(CharterIntroduction charterIntroduction) throws Exception;
/**
* 修改
*
* @param charterIntroduction
* @return
* @throws Exception
*/
boolean updateCharterIntroduction(CharterIntroduction charterIntroduction) throws Exception;
/**
* 删除
*
* @param id
* @return
* @throws Exception
*/
boolean deleteCharterIntroduction(Long id) throws Exception;
/**
* 根据ID获取查询对象
*
* @param id
* @return
* @throws Exception
*/
CharterIntroductionQueryVo getCharterIntroductionById(Long id) throws Exception;
/**
* 获取分页对象
*
* @param charterIntroductionPageParam
* @return
* @throws Exception
*/
Paging<CharterIntroductionQueryVo> getCharterIntroductionPageList(CharterIntroductionPageParam charterIntroductionPageParam) throws Exception;
Paging<CharterIntroductionQueryForAppVo> getCharterIntroductionForAppPageList(CharterIntroductionPageParam charterIntroductionPageParam) throws Exception;
}
common/src/main/java/com/jumeirah/common/service/impl/BusinessPlainServiceImpl.java 0 → 100644
package com.jumeirah.common.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jumeirah.common.entity.BusinessPlain;
import com.jumeirah.common.mapper.BusinessPlainMapper;
import com.jumeirah.common.param.BusinessPlainPageParam;
import com.jumeirah.common.service.BusinessPlainService;
import com.jumeirah.common.vo.BusinessPlainQueryForAppVo;
import com.jumeirah.common.vo.BusinessPlainQueryVo;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* 公务机出售/托管表 服务实现类
*
* @author giao
* @since 2020-10-14
*/
@Slf4j
@Service
public class BusinessPlainServiceImpl extends BaseServiceImpl<BusinessPlainMapper, BusinessPlain> implements BusinessPlainService {
@Autowired
private BusinessPlainMapper businessPlainMapper;
@Transactional(rollbackFor = Exception.class)
@Override
public boolean saveBusinessPlain(BusinessPlain businessPlain) throws Exception {
return super.save(businessPlain);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean updateBusinessPlain(BusinessPlain businessPlain) throws Exception {
return super.updateById(businessPlain);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean deleteBusinessPlain(Long id) throws Exception {
return super.removeById(id);
}
@Override
public BusinessPlainQueryVo getBusinessPlainById(Long id) throws Exception {
return businessPlainMapper.getBusinessPlainById(id);
}
@Override
public Paging<BusinessPlainQueryVo> getBusinessPlainPageList(BusinessPlainPageParam businessPlainPageParam) throws Exception {
Page<BusinessPlainQueryVo> page = new PageInfo<>(businessPlainPageParam, OrderItem.desc(getLambdaColumn(BusinessPlain::getCreateTime)));
IPage<BusinessPlainQueryVo> iPage = businessPlainMapper.getBusinessPlainPageList(page, businessPlainPageParam);
return new Paging<>(iPage);
}
@Override
public Paging<BusinessPlainQueryForAppVo> getBusinessPlainPageListForApp(BusinessPlainPageParam businessPlainPageParam) throws Exception {
Page<BusinessPlainQueryForAppVo> page = new PageInfo<>(businessPlainPageParam, OrderItem.desc(getLambdaColumn(BusinessPlain::getCreateTime)));
IPage<BusinessPlainQueryForAppVo> iPage = businessPlainMapper.getBusinessPlainPageListForApp(page, businessPlainPageParam);
return new Paging<>(iPage);
}
}
common/src/main/java/com/jumeirah/common/service/impl/CharterIntroductionServiceImpl.java 0 → 100644
package com.jumeirah.common.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jumeirah.common.entity.CharterIntroduction;
import com.jumeirah.common.mapper.CharterIntroductionMapper;
import com.jumeirah.common.param.CharterIntroductionPageParam;
import com.jumeirah.common.service.CharterIntroductionService;
import com.jumeirah.common.vo.CharterIntroductionQueryForAppVo;
import com.jumeirah.common.vo.CharterIntroductionQueryVo;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
/**
* 包机介绍 服务实现类
*
* @author giao
* @since 2020-10-14
*/
@Slf4j
@Service
public class CharterIntroductionServiceImpl extends BaseServiceImpl<CharterIntroductionMapper, CharterIntroduction> implements CharterIntroductionService {
@Autowired
private CharterIntroductionMapper charterIntroductionMapper;
@Transactional(rollbackFor = Exception.class)
@Override
public boolean saveCharterIntroduction(CharterIntroduction charterIntroduction) throws Exception {
return super.save(charterIntroduction);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean updateCharterIntroduction(CharterIntroduction charterIntroduction) throws Exception {
return super.updateById(charterIntroduction);
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean deleteCharterIntroduction(Long id) throws Exception {
return super.removeById(id);
}
@Override
public CharterIntroductionQueryVo getCharterIntroductionById(Long id) throws Exception {
return charterIntroductionMapper.getCharterIntroductionById(id);
}
@Override
public Paging<CharterIntroductionQueryVo> getCharterIntroductionPageList(CharterIntroductionPageParam charterIntroductionPageParam) throws Exception {
Page<CharterIntroductionQueryVo> page = new PageInfo<>(charterIntroductionPageParam, OrderItem.desc(getLambdaColumn(CharterIntroduction::getCreateTime)));
IPage<CharterIntroductionQueryVo> iPage = charterIntroductionMapper.getCharterIntroductionPageList(page, charterIntroductionPageParam);
return new Paging<CharterIntroductionQueryVo>(iPage);
}
@Override
public Paging<CharterIntroductionQueryForAppVo> getCharterIntroductionForAppPageList(CharterIntroductionPageParam charterIntroductionPageParam) throws Exception {
Page<CharterIntroductionQueryForAppVo> page = new PageInfo<>(charterIntroductionPageParam, OrderItem.desc(getLambdaColumn(CharterIntroduction::getCreateTime)));
IPage<CharterIntroductionQueryForAppVo> iPage = charterIntroductionMapper.getCharterIntroductionForAppPageList(page, charterIntroductionPageParam);
return new Paging<CharterIntroductionQueryForAppVo>(iPage);
}
}
common/src/main/java/com/jumeirah/common/vo/BusinessPlainQueryForAppVo.java 0 → 100644
package com.jumeirah.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* <pre>
* 公务机出售/托管表 查询结果对象
* </pre>
*
* @author giao
* @date 2020-10-14
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "BusinessPlainQueryForAppVo对象")
public class BusinessPlainQueryForAppVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("商家name")
private Long mcName;
@ApiModelProperty("业务类型，0-出售，1-托管")
private Integer businessType;
@ApiModelProperty("图片url")
private String imgUrl;
@ApiModelProperty("机型介绍")
private String introduction;
@ApiModelProperty("销售员姓名")
private String name;
@ApiModelProperty("销售联系电话")
private String phone;
@ApiModelProperty("微信号")
private String wechat;
}
\ No newline at end of file
common/src/main/java/com/jumeirah/common/vo/BusinessPlainQueryVo.java 0 → 100644
package com.jumeirah.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* <pre>
* 公务机出售/托管表 查询结果对象
* </pre>
*
* @author giao
* @date 2020-10-14
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "BusinessPlainQueryVo对象")
public class BusinessPlainQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键ID")
private Long id;
@ApiModelProperty("商家ID")
private Long mcId;
@ApiModelProperty("业务类型，0-出售，1-托管")
private Integer businessType;
@ApiModelProperty("图片url")
private String imgUrl;
@ApiModelProperty("机型介绍")
private String introduction;
@ApiModelProperty("销售员姓名")
private String name;
@ApiModelProperty("销售联系电话")
private String phone;
@ApiModelProperty("微信号")
private String wechat;
@ApiModelProperty("状态，0-正常，1-禁用，99-删除")
private Integer status;
@ApiModelProperty("创建时间（时间戳）")
private Date createTime;
@ApiModelProperty("更新时间（时间戳）")
private Date updateTime;
}
\ No newline at end of file
common/src/main/java/com/jumeirah/common/vo/CharterIntroductionQueryForAppVo.java 0 → 100644
package com.jumeirah.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* <pre>
* 包机介绍 查询结果对象
* </pre>
*
* @author giao
* @date 2020-10-14
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "CharterIntroductionQueryForAppVo对象")
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;
}
\ No newline at end of file
common/src/main/java/com/jumeirah/common/vo/CharterIntroductionQueryVo.java 0 → 100644
package com.jumeirah.common.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* <pre>
* 包机介绍 查询结果对象
* </pre>
*
* @author giao
* @date 2020-10-14
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "CharterIntroductionQueryVo对象")
public class CharterIntroductionQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键ID")
private Long id;
@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("状态，0-正常，1-取消，99-删除")
private Integer status;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date updateTime;
}
\ No newline at end of file
common/src/main/java/com/jumeirah/common/vo/MerchantQueryVo.java
......@@ -84,4 +84,10 @@ public class MerchantQueryVo implements Serializable {
@ApiModelProperty("航空公司名称")
private String airlineName;
@ApiModelProperty("列表图片高")
private Long imageListHeight;
@ApiModelProperty("列表图片宽")
private Long imageListWidth;
}
\ No newline at end of file
common/src/main/resources/mapper/BusinessPlainMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jumeirah.common.mapper.BusinessPlainMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, mc_id, business_type, img_url, introduction, name, phone, wechat, status, create_time, update_time
</sql>
<sql id="Base_Column_ListForApp">
bp.business_type, bp.img_url, bp.introduction, bp.name, bp.phone, bp.wechat,m.`name` AS mcName
</sql>
<select id="getBusinessPlainById" resultType="com.jumeirah.common.vo.BusinessPlainQueryVo">
select
<include refid="Base_Column_List"/>
from business_plain where id = #{id}
</select>
<select id="getBusinessPlainPageList" parameterType="com.jumeirah.common.param.BusinessPlainPageParam"
resultType="com.jumeirah.common.vo.BusinessPlainQueryVo">
select
<include refid="Base_Column_List"/>
from business_plain as bp
</select>
<select id="getBusinessPlainPageListForApp" parameterType="com.jumeirah.common.param.BusinessPlainPageParam"
resultType="com.jumeirah.common.vo.BusinessPlainQueryForAppVo">
select
<include refid="Base_Column_ListForApp"/>
from business_plain bp
INNER JOIN merchant m ON bp.mc_id=m.id
</select>
</mapper>
common/src/main/resources/mapper/CharterIntroductionMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jumeirah.common.mapper.CharterIntroductionMapper">
<!-- 通用查询结果列 -->
<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
</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
</sql>
<select id="getCharterIntroductionById" resultType="com.jumeirah.common.vo.CharterIntroductionQueryVo">
select
<include refid="Base_Column_List"/>
from charter_introduction where id = #{id}
</select>
<select id="getCharterIntroductionPageList" parameterType="com.jumeirah.common.param.CharterIntroductionPageParam"
resultType="com.jumeirah.common.vo.CharterIntroductionQueryVo">
select
<include refid="Base_Column_List"/>
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
</select>
</mapper>
common/src/main/resources/mapper/MerchantMapper.xml
......@@ -4,7 +4,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, name, phone, phone_area, head, remark, state, deleted, create_time, update_time, recharge_bank, recharge_name, recharge_bank_number, image_list_url, image_company_introduction_url, image_team_introduction_url, image_advantage_url, text_company_introduction, text_team_introduction, text_advantage, airline_name
id, name, phone, phone_area, head, remark, state, deleted, create_time, update_time, recharge_bank, recharge_name, recharge_bank_number, image_list_url, image_company_introduction_url, image_team_introduction_url, image_advantage_url, text_company_introduction, text_team_introduction, text_advantage, airline_name,image_list_height,image_list_width
</sql>
<select id="getMerchantById" resultType="com.jumeirah.common.vo.MerchantQueryVo">
......
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