Skip to content

S
SiEn
Commit 69543e53 by giaogiao
Options

初始化四恩慈善会2

parent 6e7ceef4
Showing with 176 additions and 3570 deletions
api-app/src/main/java/com/sien/api/app/entity/bo/PlainTypeBo.java deleted 100644 → 0
package com.sien.api.app.entity.bo;
import com.sien.common.entity.PlainType;
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 java.util.List;
/**
* 飞机型号表
*
* @author wei
* @since 2020-10-09
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "分组获取飞机类型对象")
public class PlainTypeBo extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("系列类型，0-尊享系列 , 1-奢享系列 ,2-普通系列")
private Integer type;
@ApiModelProperty("系列名称")
private List<PlainType> plainTypeList;
}
api-app/src/main/java/com/sien/api/app/entity/param/FeedbackAddParam.java deleted 100644 → 0
package com.sien.api.app.entity.param;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
/**
* 意见反馈
*
* @author giao
* @since 2020-10-26
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "FeedbackAddParam")
public class FeedbackAddParam extends BaseEntity {
private static final long serialVersionUID = 1L;
private String content;
}
api-app/src/main/java/com/sien/api/app/entity/param/StrokeDiscountParam.java deleted 100644 → 0
package com.sien.api.app.entity.param;
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.sql.Timestamp;
/**
* 优惠行程表
*
* @author xxx
* @since 2020-10-14
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "StrokeDiscount对象")
public class StrokeDiscountParam extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "优惠行程id不能为空")
@ApiModelProperty("优惠行程ID")
private Long sdId;
@NotNull(message = "人数不能为空")
@ApiModelProperty("人数")
private Integer peopleNum;
@NotNull(message = "出发时间不能为空")
@ApiModelProperty("出发时间")
private Timestamp outsetTime;
}
bootstrap/src/main/java/io/geekidea/springbootplus/config/Swagger2Config.java
...@@ -155,7 +155,7 @@ public class Swagger2Config { ...@@ -155,7 +155,7 @@ public class Swagger2Config {
@Bean @Bean
public Docket restAppApi() { public Docket restAppApi() {
// 获取需要扫描的包 // 获取需要扫描的包
String[] basePackages = {"com.sien.api.app.controller"}; String[] basePackages = {"com.sien.common.controller"};
ApiSelectorBuilder apiSelectorBuilder = new Docket(DocumentationType.SWAGGER_2) ApiSelectorBuilder apiSelectorBuilder = new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo()) .apiInfo(apiInfo())
.groupName("app") .groupName("app")
......
api-app/src/main/java/com/sien/api/app/controller/AppSmsController.java → common/src/main/java/com/sien/common/controller/AppSmsController.java
package com.sien.api.app.controller; package com.sien.common.controller;
import com.sien.api.app.service.AppSmsService; import com.sien.common.service.AppSmsService;
import io.geekidea.springbootplus.framework.common.api.ApiResult; import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.common.controller.BaseController; import io.geekidea.springbootplus.framework.common.controller.BaseController;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog; import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
...@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
//@Module("api-app") //@Module("api-app")
@Api(value = "短信验证码", tags = {"APP短信验证码相关"}) @Api(value = "短信验证码", tags = {"APP短信验证码相关"})
@RequestMapping("/app/sms/") @RequestMapping("/sms")
public class AppSmsController extends BaseController { public class AppSmsController extends BaseController {
@Autowired @Autowired
...@@ -38,7 +38,6 @@ public class AppSmsController extends BaseController { ...@@ -38,7 +38,6 @@ public class AppSmsController extends BaseController {
@ApiOperation(value = "获取注册或登陆的验证码", response = Object.class, notes = "本地环境默认666666") @ApiOperation(value = "获取注册或登陆的验证码", response = Object.class, notes = "本地环境默认666666")
public ApiResult<Object> registerOrLoginCode(@RequestParam String phoneArea, @RequestParam String phone) throws Exception { public ApiResult<Object> registerOrLoginCode(@RequestParam String phoneArea, @RequestParam String phone) throws Exception {
// , @RequestParam(required = false) String openid
return appSmsService.registerOrLoginCode(phoneArea, phone); return appSmsService.registerOrLoginCode(phoneArea, phone);
} }
......
api-app/src/main/java/com/sien/api/app/controller/AppUserController.java → common/src/main/java/com/sien/common/controller/AppUserController.java
package com.sien.api.app.controller; package com.sien.common.controller;
import com.sien.api.app.service.AppUserApiService;
import com.sien.common.param.app.AppSmsRegisterParam; import com.sien.common.param.app.AppSmsRegisterParam;
import com.sien.common.param.app.AppUserInfoParam; import com.sien.common.param.app.AppUserInfoParam;
import com.sien.common.param.app.AppUserPhoneUpdateParam; import com.sien.common.param.app.AppUserPhoneUpdateParam;
import com.sien.common.service.AppUserApiService;
import com.sien.common.vo.app.LoginAppUserTokenVo; import com.sien.common.vo.app.LoginAppUserTokenVo;
import io.geekidea.springbootplus.framework.common.api.ApiResult; import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.common.controller.BaseController; import io.geekidea.springbootplus.framework.common.controller.BaseController;
...@@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@Module("api-app") @Module("api-app")
@Api(value = "用户API", tags = {"APP用户相关"}) @Api(value = "用户API", tags = {"APP用户相关"})
@RequestMapping("/app/user/") @RequestMapping("/user")
public class AppUserController extends BaseController { public class AppUserController extends BaseController {
// @Autowired // @Autowired
......
common/src/main/java/com/sien/common/controller/DonationAgentController.java
package com.sien.common.controller; package com.sien.common.controller;
import com.sien.common.entity.DonationAgent; import com.sien.common.entity.DonationAgent;
import com.sien.common.param.DonationAgentPageParam;
import com.sien.common.service.DonationAgentService; import com.sien.common.service.DonationAgentService;
import com.sien.common.vo.DonationAgentQueryVo;
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.Add;
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.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import com.sien.common.param.DonationAgentPageParam;
import io.geekidea.springbootplus.framework.common.controller.BaseController;
import com.sien.common.param.DonationAgentQueryVo;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.common.param.IdParam;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.geekidea.springbootplus.framework.core.validator.groups.Add;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
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;
/** /**
* 替他人捐款记录表 控制器 * 替他人捐款记录表 控制器
...@@ -30,20 +33,20 @@ import org.springframework.web.bind.annotation.*; ...@@ -30,20 +33,20 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/donationAgent") @RequestMapping("/donationAgent")
@Api(value = "替他人捐款记录表API", tags = {"替他人捐款记录表"}) @Api(value = "替他人捐款记录表API", tags = {"替他人捐款记录表"})
public class DonationAgentController extends BaseController { public class DonationAgentController extends BaseController {
@Autowired @Autowired
private DonationAgentService donationAgentService; private DonationAgentService donationAgentService;
/** /**
* 添加替他人捐款记录表 * 添加替他人捐款记录表
*/ */
@PostMapping("/add") @PostMapping("/add")
@OperationLog(name = "添加替他人捐款记录表", type = OperationLogType.ADD) @OperationLog(name = "添加替他人捐款记录表", type = OperationLogType.ADD)
@ApiOperation(value = "添加替他人捐款记录表") @ApiOperation(value = "添加替他人捐款记录表")
public ApiResult<Boolean> addDonationAgent(@Validated(Add.class) @RequestBody DonationAgent donationAgent)throws Exception{ public ApiResult<Boolean> addDonationAgent(@Validated(Add.class) @RequestBody DonationAgent donationAgent) throws Exception {
boolean flag= donationAgentService.saveDonationAgent(donationAgent); boolean flag = donationAgentService.saveDonationAgent(donationAgent);
return ApiResult.result(flag); return ApiResult.result(flag);
} }
/** /**
...@@ -90,5 +93,5 @@ private DonationAgentService donationAgentService; ...@@ -90,5 +93,5 @@ private DonationAgentService donationAgentService;
return ApiResult.ok(paging); return ApiResult.ok(paging);
} }
} }
common/src/main/java/com/sien/common/controller/DonationRecordController.java
package com.sien.common.controller; package com.sien.common.controller;
import com.sien.common.entity.DonationRecord; import com.sien.common.entity.DonationRecord;
import com.sien.common.param.DonationRecordPageParam;
import com.sien.common.service.DonationRecordService; import com.sien.common.service.DonationRecordService;
import com.sien.common.vo.DonationRecordQueryVo;
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.Add;
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.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import com.sien.common.param.DonationRecordPageParam;
import io.geekidea.springbootplus.framework.common.controller.BaseController;
import com.sien.common.param.DonationRecordQueryVo;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.common.param.IdParam;
import io.geekidea.springbootplus.framework.log.annotation.Module;
import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
import io.geekidea.springbootplus.framework.core.validator.groups.Add;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import org.springframework.validation.annotation.Validated;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
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;
/** /**
* 捐款记录 控制器 * 捐款记录 控制器
...@@ -30,10 +33,10 @@ import org.springframework.web.bind.annotation.*; ...@@ -30,10 +33,10 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("/donationRecord") @RequestMapping("/donationRecord")
@Api(value = "捐款记录API", tags = {"捐款记录"}) @Api(value = "捐款记录API", tags = {"捐款记录"})
public class DonationRecordController extends BaseController { public class DonationRecordController extends BaseController {
@Autowired @Autowired
private DonationRecordService donationRecordService; private DonationRecordService donationRecordService;
/** /**
* 添加捐款记录 * 添加捐款记录
......
common/src/main/java/com/sien/common/controller/VipRecordController.java
...@@ -2,7 +2,7 @@ package com.sien.common.controller; ...@@ -2,7 +2,7 @@ package com.sien.common.controller;
import com.sien.common.entity.VipRecord; import com.sien.common.entity.VipRecord;
import com.sien.common.param.VipRecordPageParam; import com.sien.common.param.VipRecordPageParam;
import com.sien.common.param.VipRecordQueryVo; import com.sien.common.vo.VipRecordQueryVo;
import com.sien.common.service.VipRecordService; import com.sien.common.service.VipRecordService;
import io.geekidea.springbootplus.framework.common.api.ApiResult; import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.common.controller.BaseController; import io.geekidea.springbootplus.framework.common.controller.BaseController;
...@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
/** /**
* 捐款记录 控制器 * Vip开通记录 控制器
* *
* @author hewei * @author hewei
* @since 2021-02-25 * @since 2021-02-25
...@@ -32,62 +32,62 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -32,62 +32,62 @@ import org.springframework.web.bind.annotation.RestController;
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/vipRecord") @RequestMapping("/vipRecord")
@Api(value = "捐款记录API", tags = {"捐款记录"}) @Api(value = "Vip开通记录API", tags = {"Vip开通记录"})
public class VipRecordController extends BaseController { public class VipRecordController extends BaseController {
@Autowired @Autowired
private VipRecordService vipRecordService; private VipRecordService vipRecordService;
/** /**
* 添加捐款记录 * 添加Vip开通记录
*/ */
@PostMapping("/add") @PostMapping("/add")
@OperationLog(name = "添加捐款记录", type = OperationLogType.ADD) @OperationLog(name = "添加Vip开通记录", type = OperationLogType.ADD)
@ApiOperation(value = "添加捐款记录") @ApiOperation(value = "添加Vip开通记录")
public ApiResult<Boolean> addVipRecord(@Validated(Add.class) @RequestBody VipRecord vipRecord)throws Exception{ public ApiResult<Boolean> addVipRecord(@Validated(Add.class) @RequestBody VipRecord vipRecord)throws Exception{
boolean flag= vipRecordService.saveVipRecord(vipRecord); boolean flag= vipRecordService.saveVipRecord(vipRecord);
return ApiResult.result(flag); return ApiResult.result(flag);
} }
/** /**
* 修改捐款记录 * 修改Vip开通记录
*/ */
@PostMapping("/update") @PostMapping("/update")
@OperationLog(name = "修改捐款记录", type = OperationLogType.UPDATE) @OperationLog(name = "修改Vip开通记录", type = OperationLogType.UPDATE)
@ApiOperation(value = "修改捐款记录") @ApiOperation(value = "修改Vip开通记录")
public ApiResult<Boolean> updateVipRecord(@Validated(Update.class) @RequestBody VipRecord vipRecord)throws Exception{ public ApiResult<Boolean> updateVipRecord(@Validated(Update.class) @RequestBody VipRecord vipRecord)throws Exception{
boolean flag= vipRecordService.updateVipRecord(vipRecord); boolean flag= vipRecordService.updateVipRecord(vipRecord);
return ApiResult.result(flag); return ApiResult.result(flag);
} }
/** /**
* 删除捐款记录 * 删除Vip开通记录
*/ */
@PostMapping("/delete/{id}") @PostMapping("/delete/{id}")
@OperationLog(name = "删除捐款记录", type = OperationLogType.DELETE) @OperationLog(name = "删除Vip开通记录", type = OperationLogType.DELETE)
@ApiOperation(value = "删除捐款记录") @ApiOperation(value = "删除Vip开通记录")
public ApiResult<Boolean> deleteVipRecord(@PathVariable("id") Long id)throws Exception{ public ApiResult<Boolean> deleteVipRecord(@PathVariable("id") Long id)throws Exception{
boolean flag= vipRecordService.deleteVipRecord(id); boolean flag= vipRecordService.deleteVipRecord(id);
return ApiResult.result(flag); return ApiResult.result(flag);
} }
/** /**
* 获取捐款记录详情 * 获取Vip开通记录详情
*/ */
@GetMapping("/info/{id}") @GetMapping("/info/{id}")
@OperationLog(name = "捐款记录详情", type = OperationLogType.INFO) @OperationLog(name = "Vip开通记录详情", type = OperationLogType.INFO)
@ApiOperation(value = "捐款记录详情") @ApiOperation(value = "Vip开通记录详情")
public ApiResult<VipRecordQueryVo> getVipRecord(@PathVariable("id") Long id)throws Exception{ public ApiResult<VipRecordQueryVo> getVipRecord(@PathVariable("id") Long id)throws Exception{
VipRecordQueryVo vipRecordQueryVo = vipRecordService.getVipRecordById(id); VipRecordQueryVo vipRecordQueryVo = vipRecordService.getVipRecordById(id);
return ApiResult.ok(vipRecordQueryVo); return ApiResult.ok(vipRecordQueryVo);
} }
/** /**
* 捐款记录分页列表 * Vip开通记录分页列表
*/ */
@PostMapping("/getPageList") @PostMapping("/getPageList")
@OperationLog(name = "捐款记录分页列表", type = OperationLogType.PAGE) @OperationLog(name = "Vip开通记录分页列表", type = OperationLogType.PAGE)
@ApiOperation(value = "捐款记录分页列表") @ApiOperation(value = "Vip开通记录分页列表")
public ApiResult<Paging<VipRecordQueryVo>>getVipRecordPageList(@Validated @RequestBody VipRecordPageParam vipRecordPageParam)throws Exception{ public ApiResult<Paging<VipRecordQueryVo>>getVipRecordPageList(@Validated @RequestBody VipRecordPageParam vipRecordPageParam)throws Exception{
Paging<VipRecordQueryVo> paging = vipRecordService.getVipRecordPageList(vipRecordPageParam); Paging<VipRecordQueryVo> paging = vipRecordService.getVipRecordPageList(vipRecordPageParam);
return ApiResult.ok(paging); return ApiResult.ok(paging);
......
common/src/main/java/com/sien/common/convert/UserConvert.java
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package com.sien.common.convert; package com.sien.common.convert;
import com.sien.common.entity.MerchantUser;
import com.sien.common.entity.SysUser; import com.sien.common.entity.SysUser;
import io.geekidea.springbootplus.framework.shiro.vo.LoginUserVo; import io.geekidea.springbootplus.framework.shiro.vo.LoginUserVo;
import org.mapstruct.Mapper; import org.mapstruct.Mapper;
...@@ -41,7 +40,6 @@ public interface UserConvert { ...@@ -41,7 +40,6 @@ public interface UserConvert {
*/ */
LoginUserVo sysUserToLoginSysUserVo(SysUser sysUser); LoginUserVo sysUserToLoginSysUserVo(SysUser sysUser);
LoginUserVo merchantUserToLoginSysUserVo(MerchantUser sysUser);
} }
common/src/main/java/com/sien/common/entity/BusinessPlain.java deleted 100644 → 0
package com.sien.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.sien.common.entity.base.ImgJson;
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.sql.Timestamp;
import java.util.List;
/**
* 公务机出售/托管表
*
* @author giao
* @since 2020-10-14
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "BusinessPlain对象")
@TableName(autoResultMap = true)
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("机型介绍")
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 Timestamp createTime;
@ApiModelProperty("更新时间（时间戳）")
private Timestamp updateTime;
@TableField(typeHandler = FastjsonTypeHandler.class)
@ApiModelProperty("图片相关数据json (包括：路径，宽和高)")
private List<ImgJson> imgUrl;
}
common/src/main/java/com/sien/common/entity/CharterIntroduction.java deleted 100644 → 0
package com.sien.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.sql.Timestamp;
/**
* 包机介绍
*
* @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;
@NotNull(message = "状态，0-正常，1-取消，99-删除不能为空")
@ApiModelProperty("状态，0-正常，1-取消，99-删除")
private Integer status;
@ApiModelProperty("创建时间")
private Timestamp createTime;
@ApiModelProperty("更新时间")
private Timestamp updateTime;
@ApiModelProperty("包机图片url")
private String imgUrl;
@ApiModelProperty("包机文字")
private String text;
@ApiModelProperty("包机标题")
private String title;
@ApiModelProperty("类型 1私人;2团体;3货运;4医疗")
private Integer type;
}
common/src/main/java/com/sien/common/entity/ContactStaff.java deleted 100644 → 0
package com.sien.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
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.sql.Timestamp;
/**
* @author xxx
* @since 2020-10-27
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "ContactStaff对象")
public class ContactStaff extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@ApiModelProperty("主键ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty("客服电话")
private String phone;
@ApiModelProperty("状态，0-正常，1-封禁，99-删除")
private Integer status;
@NotNull(message = "商家id不能为空")
@ApiModelProperty("商家id")
private Long mcId;
@ApiModelProperty("创建时间")
private Timestamp createTime;
@ApiModelProperty("更新时间")
private Timestamp updateTime;
}
common/src/main/java/com/sien/common/entity/Feedback.java deleted 100644 → 0
package com.sien.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-26
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Feedback对象")
public class Feedback extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "不能为空")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
private String content;
private Long userId;
@ApiModelProperty("Create Time")
private Date createTime;
@ApiModelProperty("Update Time")
private Date updateTime;
}
common/src/main/java/com/sien/common/entity/McPlain.java deleted 100644 → 0
package com.sien.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
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.sql.Timestamp;
/**
* 商家飞机表
*
* @author xxx
* @since 2020-10-19
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "McPlain对象")
public class McPlain extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@ApiModelProperty("主键ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@NotNull(message = "飞机类型ID不能为空")
@ApiModelProperty("飞机类型ID")
private Long ptId;
@NotNull(message = "状态，0-正常，1-禁用，99-删除不能为空")
@ApiModelProperty("状态，0-正常，1-禁用，99-删除")
private Integer status;
@NotNull(message = "创建时间（时间戳）不能为空")
@ApiModelProperty("创建时间（时间戳）")
private Timestamp createTime;
@ApiModelProperty("更新时间（时间戳）")
private Timestamp updateTime;
@NotNull(message = "商家ID不能为空")
@ApiModelProperty("商家ID")
private Long mcId;
@NotNull(message = "数量不能为空")
@ApiModelProperty("数量")
private Integer amount;
@NotNull(message = "所在地城市ID不能为空")
@ApiModelProperty("所在地城市ID")
private Long cityId;
@ApiModelProperty("空闲数量")
private Integer idleNum;
}
common/src/main/java/com/sien/common/entity/Merchant.java deleted 100644 → 0
package com.sien.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
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-16
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Merchant对象")
public class Merchant extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@ApiModelProperty("主键")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty("商家名称")
private String name;
@ApiModelProperty("联系人手机号码")
private String phone;
@ApiModelProperty("联系人手机区号")
private String phoneArea;
@ApiModelProperty("公司头像")
private String head;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("状态，0：禁用，1：启用，2：锁定")
private Integer state;
@ApiModelProperty("逻辑删除，0：未删除，1：已删除")
@TableLogic
private Integer deleted;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
@ApiModelProperty("商家开户银行")
private String rechargeBank;
@ApiModelProperty("商家开户名称")
private String rechargeName;
@ApiModelProperty("商家银行卡号")
private String rechargeBankNumber;
@ApiModelProperty("在列表展示的图片url")
private String imageListUrl;
@NotNull(message = "在列表展示的图片高度不能为空")
@ApiModelProperty("在列表展示的图片高度")
private Long imageListHeight;
@NotNull(message = "在列表展示的图片宽度不能为空")
@ApiModelProperty("在列表展示的图片宽度")
private Long imageListWidth;
@ApiModelProperty("公司介绍图片url")
private String imageCompanyIntroductionUrl;
@ApiModelProperty("团队介绍图片url")
private String imageTeamIntroductionUrl;
@ApiModelProperty("优势图片url")
private String imageAdvantageUrl;
@ApiModelProperty("公司介绍文字")
private String textCompanyIntroduction;
@ApiModelProperty("团队介绍文字")
private String textTeamIntroduction;
@ApiModelProperty("优势介绍文字")
private String textAdvantage;
@ApiModelProperty("航空公司名称")
private String airlineName;
@ApiModelProperty("公司所在地址")
private String location;
@ApiModelProperty("邮箱")
private String email;
@ApiModelProperty("营业执照图片url")
private String imageBusinessLicenseUrl;
@ApiModelProperty("审核注册状态 0未审核,1审核成功")
private Integer auditRegisterStatus;
}
common/src/main/java/com/sien/common/entity/MerchantPermission.java deleted 100644 → 0
package com.sien.common.entity;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
/**
* 商家权限
*
* @author wei
* @since 2020-09-28
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "MerchantPermission对象")
public class MerchantPermission extends BaseEntity {
private static final long serialVersionUID=1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@ApiModelProperty("主键")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty("权限名称")
private String name;
@ApiModelProperty("父id")
private Long parentId;
@ApiModelProperty("路径")
private String url;
@NotBlank(message = "唯一编码不能为空")
@ApiModelProperty("唯一编码")
private String code;
@ApiModelProperty("图标")
private String icon;
@NotNull(message = "类型，1：菜单，2：按钮不能为空")
@ApiModelProperty("类型，1：菜单，2：按钮")
private Integer type;
@NotNull(message = "层级，1：第一级，2：第二级，N：第N级不能为空")
@ApiModelProperty("层级，1：第一级，2：第二级，N：第N级")
private Integer level;
@ApiModelProperty("状态，0：禁用，1：启用")
private Integer state;
@ApiModelProperty("排序")
private Integer sort;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("版本")
@Version
private Integer version;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
}
common/src/main/java/com/sien/common/entity/MerchantRole.java deleted 100644 → 0
package com.sien.common.entity;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
/**
* 商家角色
*
* @author wei
* @since 2020-09-28
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "MerchantRole对象")
public class MerchantRole extends BaseEntity {
private static final long serialVersionUID=1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@ApiModelProperty("主键")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@NotBlank(message = "角色名称不能为空")
@ApiModelProperty("角色名称")
private String name;
@ApiModelProperty("角色唯一编码")
private String code;
@ApiModelProperty("角色类型")
private Integer type;
@ApiModelProperty("角色状态，0：禁用，1：启用")
private Integer state;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("版本")
@Version
private Integer version;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
}
common/src/main/java/com/sien/common/entity/MerchantRolePermission.java deleted 100644 → 0
package com.sien.common.entity;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.Version;
import com.baomidou.mybatisplus.annotation.TableId;
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 io.geekidea.springbootplus.framework.core.validator.groups.Update;
/**
* 商家角色权限关系
*
* @author wei
* @since 2020-09-28
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "MerchantRolePermission对象")
public class MerchantRolePermission extends BaseEntity {
private static final long serialVersionUID=1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@ApiModelProperty("主键")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@NotNull(message = "角色id不能为空")
@ApiModelProperty("角色id")
private Long roleId;
@NotNull(message = "权限id不能为空")
@ApiModelProperty("权限id")
private Long permissionId;
@ApiModelProperty("状态，0：禁用，1：启用")
private Integer state;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("版本")
@Version
private Integer version;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
}
common/src/main/java/com/sien/common/entity/MerchantUser.java deleted 100644 → 0
package com.sien.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.Version;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**
* 商家
*
* @author wei
* @since 2020-09-28
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "MerchantUser对象")
public class MerchantUser extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@ApiModelProperty("主键")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@NotNull(message = "商家id不能为空")
@ApiModelProperty("商家id")
private Long mcId;
@ApiModelProperty("是否为管理员，0：普通，1：超级管理员")
private Integer isAdmin;
@ApiModelProperty("用户名")
private String username;
@ApiModelProperty("昵称")
private String nickname;
@JsonIgnore
@NotBlank(message = "密码不能为空")
@ApiModelProperty("密码")
private String password;
@ApiModelProperty("盐值")
private String salt;
@ApiModelProperty("手机号码")
private String phone;
@ApiModelProperty("手机区号")
private String phoneArea;
@ApiModelProperty("性别，0：女，1：男，默认1")
private Integer gender;
@ApiModelProperty("头像")
private String head;
@ApiModelProperty("职位")
private String position;
@ApiModelProperty("状态，0：禁用，1：启用，2：锁定")
private Integer state;
@ApiModelProperty("部门id")
private Long departmentId;
@ApiModelProperty("角色id")
private Long roleId;
@ApiModelProperty("逻辑删除，0：未删除，1：已删除")
@TableLogic
private Integer deleted;
@ApiModelProperty("版本")
@Version
private Integer version;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
}
common/src/main/java/com/sien/common/entity/MerchantUserPermission.java deleted 100644 → 0
package com.sien.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.Version;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
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-19
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "MerchantUserPermission对象")
public class MerchantUserPermission extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@ApiModelProperty("主键")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@NotNull(message = "用户id不能为空")
@ApiModelProperty("用户id")
private Long userId;
@NotNull(message = "权限id不能为空")
@ApiModelProperty("权限id")
private Long permissionId;
@ApiModelProperty("状态，0：禁用，1：启用")
private Integer state;
@ApiModelProperty("备注")
private String remark;
// @ApiModelProperty("职位名称")
// private String positionName;
@ApiModelProperty("版本")
@Version
private Integer version;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
}
common/src/main/java/com/sien/common/entity/PlainType.java deleted 100644 → 0
package com.sien.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.sql.Timestamp;
/**
* 飞机型号表
*
* @author wei
* @since 2020-10-09
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "PlainType对象")
public class PlainType extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@ApiModelProperty("主键ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@NotNull(message = "系列类型不能为空")
@ApiModelProperty("系列类型，0-尊享系列 , 1-奢享系列 ,2-普通系列")
private Integer seriesType;
@NotBlank(message = "飞机名称不能为空")
@ApiModelProperty("飞机名称")
private String name;
@NotBlank(message = "飞机图片地址不能为空")
@ApiModelProperty("飞机图片地址")
private String imgUrl;
@NotNull(message = "状态，0-正常，1-禁用，99-删除不能为空")
@ApiModelProperty("状态，0-正常，1-禁用，99-删除")
private Integer status;
@NotNull(message = "创建时间（时间戳）不能为空")
@ApiModelProperty("创建时间（时间戳）")
private Timestamp createTime;
@ApiModelProperty("更新时间（时间戳）")
private Timestamp updateTime;
@ApiModelProperty("宽 单位：像素")
private Integer width;
@ApiModelProperty("高 单位：像素")
private Integer height;
}
common/src/main/java/com/sien/common/entity/Stroke.java deleted 100644 → 0
package com.sien.common.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import com.sien.common.entity.base.ImgJson;
import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
import io.geekidea.springbootplus.framework.core.validator.groups.Update;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.List;
/**
* 行程表
*
* @author wei
* @since 2020-09-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Stroke对象")
@TableName(autoResultMap = true)
public class Stroke extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空", groups = {Update.class})
@ApiModelProperty("主键ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@NotNull(message = "出发城市id不能为空")
@ApiModelProperty("出发城市id")
private Long cityOutsetId;
@ApiModelProperty("逻辑删除，0：未删除，1：已删除")
@TableLogic
private Integer deleted;
@ApiModelProperty("出发城市名称")
private String cityOutsetName;
@NotNull(message = "到达城市id不能为空")
@ApiModelProperty("到达城市id")
private Long cityArriveId;
@ApiModelProperty("到达城市名称")
private String cityArriveName;
@NotNull(message = "人数不能为空")
@ApiModelProperty("人数")
private Integer peopleNum;
@ApiModelProperty("飞机型号ID")
private Long plainTypeId;
@NotNull(message = "出发时间不能为空")
@ApiModelProperty("出发时间")
private Timestamp outsetTime;
@ApiModelProperty("返程时间")
private Timestamp returnTime;
@NotNull(message = "行程类型，0-单程，1-往返行程，2-货运，3-医疗不能为空")
@ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
private Integer type;
@NotNull(message = "状态，0-审核中，1-进行中，2-已完成，99-取消不能为空")
@ApiModelProperty("状态，0-审核中，1-进行中，2-已完成，99-取消")
private Integer status;
@NotNull(message = "创建时间不能为空")
@ApiModelProperty("创建时间")
private Timestamp createTime;
@ApiModelProperty("更新时间")
private Timestamp updateTime;
@ApiModelProperty("付款时间")
private Timestamp userRechargeTime;
@ApiModelProperty("货物名称")
private String goodsName;
@ApiModelProperty("货物体积（长*宽*高） 单位：CM，例如：100*102*120")
private String goodsSize;
@ApiModelProperty("货物重量，单位：吨")
private String goodsWeight;
@ApiModelProperty("病人疾病名称")
private String diseaseName;
@TableField(typeHandler = FastjsonTypeHandler.class)
@ApiModelProperty("病人病情诊断书")
private List<ImgJson> medicalCertificateUrl;
@ApiModelProperty("配备器械（格式：1,2,3）逗号分隔")
private String instruments;
@ApiModelProperty("医护人员，0-医生，1-护士，2-护工（格式：0,1,2）逗号分隔")
private String medicalPersons;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("价格")
private BigDecimal money;
@NotNull(message = "用户ID不能为空")
@ApiModelProperty("用户ID")
private Long userId;
@NotBlank(message = "出发机场名称不能为空")
@ApiModelProperty("出发机场名称")
private String outsetAirportName;
@NotBlank(message = "到达机场名称不能为空")
@ApiModelProperty("到达机场名称")
private String arriveAirportName;
@NotNull(message = "商家id不能为空")
@ApiModelProperty("商家id")
private Long mcId;
@NotBlank(message = "用户选择机型不能为空")
@ApiModelProperty("用户选择机型")
private String choosePlainType;
@NotNull(message = "付款状态不能为空")
@ApiModelProperty("付款状态，0-未付款，1-用户已付款,待审核，2-用户已付款,审核通过，3-退款中，99-已退款")
private Integer paymentStatus;
@NotNull(message = "审核状态不能为空")
@ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
private Integer auditStatus;
@NotNull(message = "用户充值金额不能为空")
@ApiModelProperty("用户充值金额")
private BigDecimal userRechargeMoney;
@NotBlank(message = "用户充值银行不能为空")
@ApiModelProperty("用户充值银行名称")
private String userRechargeBank;
@NotBlank(message = "用户充值账户名不能为空")
@ApiModelProperty("用户充值账户名")
private String userRechargeName;
@NotBlank(message = "用户充值卡号不能为空")
@ApiModelProperty("用户充值卡号")
private String userRechargeBankNumber;
@NotBlank(message = "用户充值截图证据, 传入数组不能为空")
@ApiModelProperty("用户充值截图证据, 传入数组")
private String userRechargeCredentialsUrl;
@NotBlank(message = "是否是优惠调机不能为空")
@ApiModelProperty("是否是优惠调机，0-否，1-是")
private Boolean isDiscount;
@NotNull(message = "付款渠道不能为空")
@ApiModelProperty("付款渠道，0-线下渠道，1-线上渠道")
private Integer paymentChannel;
@NotBlank(message = "商家驳回理由不能为空")
@ApiModelProperty("商家驳回理由")
private String refusalReason;
}
common/src/main/java/com/sien/common/mapper/SysNoticeMapper.java → common/src/main/java/com/sien/common/mapper/AppUserMapper.java
...@@ -3,22 +3,22 @@ package com.sien.common.mapper; ...@@ -3,22 +3,22 @@ package com.sien.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sien.common.entity.SysNotice; import com.sien.common.entity.AppUser;
import com.sien.common.param.SysNoticePageParam; import com.sien.common.param.AppUserPageParam;
import com.sien.common.param.SysNoticeQueryVo; import com.sien.common.vo.AppUserQueryVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.io.Serializable; import java.io.Serializable;
/** /**
* 系统通知表 Mapper 接口 * APP用户 Mapper 接口
* *
* @author xxx * @author wei
* @since 2020-11-06 * @since 2020-09-23
*/ */
@Repository @Repository
public interface SysNoticeMapper extends BaseMapper<SysNotice> { public interface AppUserMapper extends BaseMapper<AppUser> {
/** /**
* 根据ID获取查询对象 * 根据ID获取查询对象
...@@ -26,15 +26,15 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> { ...@@ -26,15 +26,15 @@ public interface SysNoticeMapper extends BaseMapper<SysNotice> {
* @param id * @param id
* @return * @return
*/ */
SysNoticeQueryVo getSysNoticeById(Serializable id); AppUserQueryVo getAppUserById(Serializable id);
/** /**
* 获取分页对象 * 获取分页对象
* *
* @param page * @param page
* @param sysNoticePageParam * @param appUserPageParam
* @return * @return
*/ */
IPage<SysNoticeQueryVo> getSysNoticePageList(@Param("page") Page page, @Param("param") SysNoticePageParam sysNoticePageParam); IPage<AppUserQueryVo> getAppUserPageList(@Param("page") Page page, @Param("param") AppUserPageParam appUserPageParam);
} }
common/src/main/java/com/sien/common/mapper/BusinessPlainMapper.java deleted 100644 → 0
package com.sien.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.sien.common.entity.AppUser;
import com.sien.common.entity.BusinessPlain;
import com.sien.common.param.AppUserPageParam;
import com.sien.common.param.BusinessPlainPageParam;
import com.sien.common.vo.AppUserQueryVo;
import com.sien.common.vo.BusinessPlainQueryForAppVo;
import com.sien.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
* @param mcId
* @return
*/
IPage<BusinessPlainQueryVo> getBusinessPlainPageList(
@Param("page") Page page, @Param("param") BusinessPlainPageParam businessPlainPageParam,@Param("mcId") Long mcId);
IPage<BusinessPlainQueryForAppVo> getBusinessPlainPageListForApp(@Param("page") Page page, @Param("param") BusinessPlainPageParam businessPlainPageParam);
/**
* APP用户 Mapper 接口
*
* @author wei
* @since 2020-09-23
*/
@Repository
interface AppUserMapper extends BaseMapper<AppUser> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
AppUserQueryVo getAppUserById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param appUserPageParam
* @return
*/
IPage<AppUserQueryVo> getAppUserPageList(@Param("page") Page page, @Param("param") AppUserPageParam appUserPageParam);
}
}
common/src/main/java/com/sien/common/mapper/CharterIntroductionMapper.java deleted 100644 → 0
package com.sien.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.sien.common.entity.CharterIntroduction;
import com.sien.common.param.CharterIntroductionPageParam;
import com.sien.common.vo.CharterIntroductionQueryForAppVo;
import com.sien.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/sien/common/mapper/ContactStaffMapper.java deleted 100644 → 0
package com.sien.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sien.common.entity.ContactStaff;
import com.sien.common.param.ContactStaffPageParam;
import com.sien.common.param.ContactStaffQueryVo;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
/**
* Mapper 接口
*
* @author xxx
* @since 2020-10-27
*/
@Repository
public interface ContactStaffMapper extends BaseMapper<ContactStaff> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
ContactStaffQueryVo getContactStaffById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param contactStaffPageParam
* @param mcId
* @return
*/
IPage<ContactStaffQueryVo> getContactStaffPageList(
@Param("page") Page page, @Param("param") ContactStaffPageParam contactStaffPageParam, @Param("mcId") Long mcId);
}
common/src/main/java/com/sien/common/mapper/DonationAgentMapper.java
...@@ -3,7 +3,7 @@ package com.sien.common.mapper; ...@@ -3,7 +3,7 @@ package com.sien.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sien.common.entity.DonationAgent; import com.sien.common.entity.DonationAgent;
import com.sien.common.param.DonationAgentPageParam; import com.sien.common.param.DonationAgentPageParam;
import com.sien.common.param.DonationAgentQueryVo; import com.sien.common.vo.DonationAgentQueryVo;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
......
common/src/main/java/com/sien/common/mapper/DonationRecordMapper.java
...@@ -3,7 +3,7 @@ package com.sien.common.mapper; ...@@ -3,7 +3,7 @@ package com.sien.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sien.common.entity.DonationRecord; import com.sien.common.entity.DonationRecord;
import com.sien.common.param.DonationRecordPageParam; import com.sien.common.param.DonationRecordPageParam;
import com.sien.common.param.DonationRecordQueryVo; import com.sien.common.vo.DonationRecordQueryVo;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
......
common/src/main/java/com/sien/common/mapper/SysDepartmentMapper.java deleted 100755 → 0
/*
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.sien.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.sien.common.entity.SysDepartment;
import com.sien.common.param.SysDepartmentPageParam;
import com.sien.common.vo.SysDepartmentQueryVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.io.Serializable;
/**
* <pre>
* 部门 Mapper 接口
* </pre>
*
* @author geekidea
* @since 2019-10-24
*/
@Repository
public interface SysDepartmentMapper extends BaseMapper<SysDepartment> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
SysDepartmentQueryVo getSysDepartmentById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param sysDepartmentPageParam
* @return
*/
IPage<SysDepartmentQueryVo> getSysDepartmentPageList(@Param("page") Page page, @Param("param") SysDepartmentPageParam sysDepartmentPageParam);
}
common/src/main/java/com/sien/common/mapper/SysNoticeReadMapper.java deleted 100644 → 0
package com.sien.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sien.common.entity.SysNoticeRead;
import com.sien.common.param.SysNoticeReadPageParam;
import com.sien.common.param.SysNoticeReadQueryVo;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
/**
* 系统通知已读 未读 Mapper 接口
*
* @author xxx
* @since 2020-11-06
*/
@Repository
public interface SysNoticeReadMapper extends BaseMapper<SysNoticeRead> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
SysNoticeReadQueryVo getSysNoticeReadById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param sysNoticeReadPageParam
* @return
*/
IPage<SysNoticeReadQueryVo> getSysNoticeReadPageList(@Param("page") Page page,@Param("param") SysNoticeReadPageParam sysNoticeReadPageParam);
}
common/src/main/java/com/sien/common/mapper/SysPermissionMapper.java deleted 100755 → 0
/*
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.sien.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.sien.common.entity.SysPermission;
import com.sien.common.param.SysPermissionPageParam;
import com.sien.common.vo.SysPermissionQueryVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.io.Serializable;
import java.util.List;
/**
* <pre>
* 系统权限 Mapper 接口
* </pre>
*
* @author geekidea
* @since 2019-10-24
*/
@Repository
public interface SysPermissionMapper extends BaseMapper<SysPermission> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
SysPermissionQueryVo getSysPermissionById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param sysPermissionPageParam
* @return
*/
IPage<SysPermissionQueryVo> getSysPermissionPageList(@Param("page") Page page, @Param("param") SysPermissionPageParam sysPermissionPageParam);
/**
* 根据用户id获取该用户所有权限编码
*
* @param userId
* @return
* @throws Exception
*/
List<String> getPermissionCodesByUserId(@Param("userId") Long userId);
/**
* 根据用户id获取菜单列表
*
* @param userId
* @return
*/
List<SysPermission> getMenuListByUserId(@Param("userId") Long userId);
}
common/src/main/java/com/sien/common/mapper/SysRoleMapper.java deleted 100755 → 0
/*
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.sien.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.sien.common.entity.SysRole;
import com.sien.common.param.sysrole.SysRolePageParam;
import com.sien.common.vo.SysRoleQueryVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.io.Serializable;
/**
* <pre>
* 系统角色 Mapper 接口
* </pre>
*
* @author geekidea
* @since 2019-10-24
*/
@Repository
public interface SysRoleMapper extends BaseMapper<SysRole> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
SysRoleQueryVo getSysRoleById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param sysRolePageParam
* @return
*/
IPage<SysRoleQueryVo> getSysRolePageList(@Param("page") Page page, @Param("param") SysRolePageParam sysRolePageParam);
}
common/src/main/java/com/sien/common/mapper/SysRolePermissionMapper.java deleted 100755 → 0
/*
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.sien.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.sien.common.entity.SysRolePermission;
import com.sien.common.param.sysrole.SysRolePermissionPageParam;
import com.sien.common.vo.SysRolePermissionQueryVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.io.Serializable;
import java.util.List;
import java.util.Set;
/**
* <pre>
* 角色权限关系 Mapper 接口
* </pre>
*
* @author geekidea
* @since 2019-10-24
*/
@Repository
public interface SysRolePermissionMapper extends BaseMapper<SysRolePermission> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
SysRolePermissionQueryVo getSysRolePermissionById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param sysRolePermissionPageParam
* @return
*/
IPage<SysRolePermissionQueryVo> getSysRolePermissionPageList(@Param("page") Page page, @Param("param") SysRolePermissionPageParam sysRolePermissionPageParam);
/**
* 根据角色id获取可用的权限编码
*
* @param roleId
* @return
*/
Set<String> getPermissionCodesByRoleId(@Param("roleId") Long roleId);
/**
* 根据角色id获取该对应的所有三级权限ID
*
* @param roleId
* @return
*/
List<Long> getThreeLevelPermissionIdsByRoleId(@Param("roleId") Long roleId);
}
common/src/main/java/com/sien/common/mapper/SysUserMapper.java deleted 100755 → 0
/*
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.sien.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.sien.common.entity.SysUser;
import com.sien.common.param.sysuser.SysUserPageParam;
import com.sien.common.vo.SysUserQueryVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.io.Serializable;
/**
* <pre>
* 系统用户 Mapper 接口
* </pre>
*
* @author geekidea
* @since 2019-10-24
*/
@Repository
public interface SysUserMapper extends BaseMapper<SysUser> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
SysUserQueryVo getSysUserById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param sysUserPageParam
* @return
*/
IPage<SysUserQueryVo> getSysUserPageList(@Param("page") Page page, @Param("param") SysUserPageParam sysUserPageParam);
}
common/src/main/java/com/sien/common/mapper/UserActiveRecordMapper.java deleted 100644 → 0
package com.sien.common.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.sien.common.entity.UserActiveRecord;
import com.sien.common.param.UserActiveRecordPageParam;
import com.sien.common.param.UserActiveRecordQueryVo;
import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.io.Serializable;
/**
* app用户活跃记录表 Mapper 接口
*
* @author giao
* @since 2020-10-21
*/
@Repository
public interface UserActiveRecordMapper extends BaseMapper<UserActiveRecord> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
UserActiveRecordQueryVo getUserActiveRecordById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param userActiveRecordPageParam
* @return
*/
IPage<UserActiveRecordQueryVo> getUserActiveRecordPageList(@Param("page") Page page,@Param("param") UserActiveRecordPageParam userActiveRecordPageParam);
}
common/src/main/java/com/sien/common/mapper/VersionControlMapper.java deleted 100644 → 0
package com.sien.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.sien.common.entity.VersionControl;
import com.sien.common.param.VersionControlPageParam;
import com.sien.common.param.VersionControlQueryVo;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.io.Serializable;
/**
* App版本控制 Mapper 接口
*
* @author giao
* @since 2020-10-26
*/
@Repository
public interface VersionControlMapper extends BaseMapper<VersionControl> {
/**
* 根据ID获取查询对象
*
* @param id
* @return
*/
VersionControlQueryVo getVersionControlById(Serializable id);
/**
* 获取分页对象
*
* @param page
* @param versionControlPageParam
* @return
*/
IPage<VersionControlQueryVo> getVersionControlPageList(@Param("page") Page page, @Param("param") VersionControlPageParam versionControlPageParam);
}
common/src/main/java/com/sien/common/mapper/VipRecordMapper.java
...@@ -5,14 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -5,14 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sien.common.entity.VipRecord; import com.sien.common.entity.VipRecord;
import com.sien.common.param.VipRecordPageParam; import com.sien.common.param.VipRecordPageParam;
import com.sien.common.param.VipRecordQueryVo; import com.sien.common.vo.VipRecordQueryVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.io.Serializable; import java.io.Serializable;
/** /**
* 捐款记录 Mapper 接口 * Vip开通记录 Mapper 接口
* *
* @author hewei * @author hewei
* @since 2021-02-25 * @since 2021-02-25
......
common/src/main/java/com/sien/common/param/AppUserQueryVo.java deleted 100644 → 0
package com.sien.common.param;
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 hewei
* @date 2021-02-25
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "AppUserQueryVo对象")
public class AppUserQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private Long id;
@ApiModelProperty("用户名")
private String username;
@ApiModelProperty("微信id")
private String wechatOpenId;
@ApiModelProperty("姓名")
private String nickname;
@ApiModelProperty("证件号码")
private String idcard;
@ApiModelProperty("民族")
private String nation;
@ApiModelProperty("密码")
private String password;
@ApiModelProperty("盐值")
private String salt;
@ApiModelProperty("手机号码")
private String phone;
@ApiModelProperty("手机区号")
private String phoneArea;
@ApiModelProperty("性别，0：女，1：男，默认1")
private Integer gender;
@ApiModelProperty("头像")
private String head;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("状态，0：禁用，1：启用，2：锁定")
private Integer state;
@ApiModelProperty("逻辑删除，0：未删除，1：已删除")
private Integer deleted;
@ApiModelProperty("版本")
private Integer version;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
@ApiModelProperty("出生日期")
private String dateOfBirth;
@ApiModelProperty("文化程度")
private String educationBackground;
@ApiModelProperty("邮件")
private String email;
@ApiModelProperty("省市区")
private String location;
@ApiModelProperty("详细地址")
private String locationDetail;
@ApiModelProperty("职业")
private String profession;
@ApiModelProperty("工作单位")
private String company;
@ApiModelProperty("紧急电话")
private String emergencyPhone;
}
\ No newline at end of file
common/src/main/java/com/sien/common/param/BusinessPlainPageParam.java deleted 100644 → 0
package com.sien.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;
/**
* <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;
@ApiModelProperty("类型，0-出售，1-托管")
private Integer type;
}
common/src/main/java/com/sien/common/param/CharterIntroductionAddParam.java deleted 100644 → 0
package com.sien.common.param;
import com.sien.common.vo.CharterIntroductionImgForAppVo;
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 java.util.List;
/**
* 包机介绍
*
* @author giao
* @since 2020-10-14
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "CharterIntroductionAddParam")
public class CharterIntroductionAddParam extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "包机图片url")
private List<CharterIntroductionImgForAppVo> imgList;
@ApiModelProperty(value = "包机文字")
private String text;
@ApiModelProperty("包机标题")
private String title;
@ApiModelProperty("类型 1私人;2团体;3货运;4医疗")
private Integer type;
}
common/src/main/java/com/sien/common/param/CharterIntroductionPageParam.java deleted 100644 → 0
package com.sien.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;
/**
* <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;
@ApiModelProperty("类型 1私人;2团体;3货运;4医疗")
private Integer type = 1;
}
common/src/main/java/com/sien/common/param/CharterIntroductionUpdateParam.java deleted 100644 → 0
package com.sien.common.param;
import com.sien.common.entity.base.ImgJson;
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 java.util.List;
/**
* 包机介绍
*
* @author giao
* @since 2020-10-14
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "CharterIntroductionUpdateParam")
public class CharterIntroductionUpdateParam extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("包机图片url")
private List<ImgJson> imgList;
@ApiModelProperty(value = "包机文字")
private String text;
@ApiModelProperty("包机标题")
private String title;
@ApiModelProperty("类型 1私人;2团体;3货运;4医疗")
private Integer type;
}
common/src/main/java/com/sien/common/param/ContactStaffPageParam.java deleted 100644 → 0
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* 分页参数对象
* </pre>
*
* @author xxx
* @date 2020-10-27
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "分页参数")
public class ContactStaffPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/sien/common/param/ContactStaffQueryVo.java deleted 100644 → 0
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.sql.Timestamp;
/**
* <pre>
* 查询结果对象
* </pre>
*
* @author xxx
* @date 2020-10-27
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "ContactStaffQueryVo对象")
public class ContactStaffQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键ID")
private Long id;
@ApiModelProperty("客服电话")
private String phone;
@ApiModelProperty("状态，0-正常，1-封禁，99-删除")
private Integer status;
@ApiModelProperty("商家id")
private Long mcId;
@ApiModelProperty("创建时间")
private Timestamp createTime;
@ApiModelProperty("更新时间")
private Timestamp updateTime;
}
common/src/main/java/com/sien/common/param/FeedbackPageParam.java deleted 100644 → 0
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* 意见反馈 分页参数对象
* </pre>
*
* @author giao
* @date 2020-10-26
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "意见反馈分页参数")
public class FeedbackPageParam extends BasePageOrderParam{
private static final long serialVersionUID=1L;
}
common/src/main/java/com/sien/common/param/FeedbackQueryVo.java deleted 100644 → 0
package com.sien.common.param;
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-26
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "FeedbackQueryVo对象")
public class FeedbackQueryVo implements Serializable{
private static final long serialVersionUID=1L;
private Long id;
private String content;
private Long userId;
@ApiModelProperty("Create Time")
private Date createTime;
@ApiModelProperty("Update Time")
private Date updateTime;
}
\ No newline at end of file
common/src/main/java/com/sien/common/param/McPlainPageParam.java deleted 100644 → 0
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* 商家飞机表 分页参数对象
* </pre>
*
* @author xxx
* @date 2020-10-19
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "商家飞机表分页参数")
public class McPlainPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/sien/common/param/McStrokePageParam.java deleted 100644 → 0
package com.sien.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;
/**
* <pre>
* 行程表 分页参数对象
* </pre>
*
* @author wei
* @date 2020-09-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "行程表分页参数")
public class McStrokePageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
@ApiModelProperty("行程类型，-1-全部，0-单程，1-往返行程，2-货运，3-医疗")
private Integer type;
@ApiModelProperty("主键id")
private Long id;
@ApiModelProperty("状态，-1全部，0-审核中，1-进行中，2-已完成，99-取消")
private Integer status;
@ApiModelProperty("开始时间")
private String startTime;
@ApiModelProperty("结束时间")
private String endTime;
@ApiModelProperty("申请人")
private String applicant;
@ApiModelProperty("是否是优惠调机，0-否，1-是")
private Boolean isDiscount = false;
}
common/src/main/java/com/sien/common/param/McStrokePaymentPageParam.java deleted 100644 → 0
package com.sien.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;
/**
* <pre>
* 行程表 分页参数对象
* </pre>
*
* @author wei
* @date 2020-09-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "行程表分页参数")
public class McStrokePaymentPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
@ApiModelProperty("付款状态，-1全部，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
private Integer paymentStatus;
@ApiModelProperty("主键id")
private Long id;
@ApiModelProperty("开始时间")
private String startTime;
@ApiModelProperty("结束时间")
private String endTime;
}
common/src/main/java/com/sien/common/param/MerchantPageParam.java deleted 100644 → 0
package com.sien.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-16
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "航空公司商家表分页参数")
public class MerchantPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/sien/common/param/MerchantPermissionPageParam.java deleted 100644 → 0
package com.sien.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 wei
* @date 2020-09-28
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "商家权限分页参数")
public class MerchantPermissionPageParam extends BasePageOrderParam{
private static final long serialVersionUID=1L;
}
common/src/main/java/com/sien/common/param/MerchantRegisterParam.java deleted 100755 → 0
/*
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 注册参数
*
* @author geekidea
* @date 2019-05-15
**/
@Data
@ApiModel("注册参数")
public class MerchantRegisterParam implements Serializable {
private static final long serialVersionUID = 2854217576695117357L;
@NotBlank(message = "请输入密码")
@ApiModelProperty(value = "密码", example = "123456")
private String password;
@NotBlank(message = "参数不能为空")
@ApiModelProperty("验证码")
private String smsCode;
@ApiModelProperty("商家名称")
@NotBlank(message = "参数不能为空")
private String name;
@ApiModelProperty("联系人手机号码")
@NotBlank(message = "请输入手机号")
private String phone;
@ApiModelProperty("联系人手机区号")
private String phoneArea;
@ApiModelProperty("公司所在地址")
private String location;
@ApiModelProperty("邮箱")
private String email;
@ApiModelProperty("营业执照图片url, 为多张可以传入数组")
private String imageBusinessLicenseUrl;
}
common/src/main/java/com/sien/common/param/MerchantRolePageParam.java deleted 100644 → 0
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* 商家角色 分页参数对象
* </pre>
*
* @author wei
* @date 2020-09-28
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "商家角色分页参数")
public class MerchantRolePageParam extends BasePageOrderParam{
private static final long serialVersionUID=1L;
}
common/src/main/java/com/sien/common/param/MerchantRolePermissionPageParam.java deleted 100644 → 0
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* 商家角色权限关系 分页参数对象
* </pre>
*
* @author wei
* @date 2020-09-28
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "商家角色权限关系分页参数")
public class MerchantRolePermissionPageParam extends BasePageOrderParam{
private static final long serialVersionUID=1L;
}
common/src/main/java/com/sien/common/param/MerchantUpdatePwdParam.java deleted 100755 → 0
/*
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 登录参数
*
* @author geekidea
* @date 2019-05-15
**/
@Data
@ApiModel("商家用户修改密码参数")
public class MerchantUpdatePwdParam implements Serializable {
private static final long serialVersionUID = 2854217576695117356L;
@NotBlank(message = "请输入密码")
@ApiModelProperty(value = "密码", example = "123456")
private String oldPassword;
@NotBlank(message = "请输入密码")
@ApiModelProperty(value = "密码", example = "123456")
private String newPassword;
}
common/src/main/java/com/sien/common/param/MerchantUserInfoParam.java deleted 100644 → 0
package com.sien.common.param;
import lombok.Data;
import java.io.Serializable;
import java.util.Set;
/**
* @author: JJww
* @Date:2020/10/30
*/
@Data
public class MerchantUserInfoParam implements Serializable {
private Long mcId;
private Set<Long> mcUserIds;
}
common/src/main/java/com/sien/common/param/MerchantUserPageParam.java deleted 100644 → 0
package com.sien.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 wei
* @date 2020-09-28
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "商家分页参数")
public class MerchantUserPageParam extends BasePageOrderParam{
private static final long serialVersionUID=1L;
}
common/src/main/java/com/sien/common/param/MerchantUserPermissionPageParam.java deleted 100644 → 0
package com.sien.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-19
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "商家用户权限关系分页参数")
public class MerchantUserPermissionPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/sien/common/param/MerchantUserPermissionQueryVo.java deleted 100644 → 0
package com.sien.common.param;
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-19
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "MerchantUserPermissionQueryVo对象")
public class MerchantUserPermissionQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("主键")
private Long id;
@ApiModelProperty("用户id")
private Long userId;
@ApiModelProperty("权限id")
private Long permissionId;
@ApiModelProperty("状态，0：禁用，1：启用")
private Integer state;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("版本")
private Integer version;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
}
\ No newline at end of file
common/src/main/java/com/sien/common/param/MerchantUserPermissionUpdateParam.java deleted 100644 → 0
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.List;
/**
* <pre>
* 商家用户权限关系 分页参数对象
* </pre>
*
* @author giao
* @date 2020-10-19
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "MerchantUserPermissionUpdateParam参数")
public class MerchantUserPermissionUpdateParam implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("权限id数组")
List<Long> permissionIds;
@ApiModelProperty("用户id")
private Long userId;
}
common/src/main/java/com/sien/common/param/StrokeCompleteParam.java deleted 100644 → 0
package com.sien.common.param;
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;
/**
* 行程表
*
* @author wei
* @since 2020-09-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "完成行程对象")
public class StrokeCompleteParam extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空")
@ApiModelProperty("主键ID")
private Long id;
}
common/src/main/java/com/sien/common/param/StrokeDiscountPageParam.java deleted 100644 → 0
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* 优惠行程表 分页参数对象
* </pre>
*
* @author xxx
* @date 2020-10-14
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "优惠行程表分页参数")
public class StrokeDiscountPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/sien/common/param/StrokePageParam.java deleted 100644 → 0
package com.sien.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;
/**
* <pre>
* 行程表 分页参数对象
* </pre>
*
* @author wei
* @date 2020-09-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "行程表分页参数")
public class StrokePageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "行程状态，-1=全部, 0-审核中，1-进行中，2-已完成", required = true)//99-取消
private Integer status;
}
common/src/main/java/com/sien/common/param/StrokeQuotedPriceParam.java deleted 100644 → 0
package com.sien.common.param;
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.math.BigDecimal;
/**
* 行程表
*
* @author wei
* @since 2020-09-29
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "Stroke报价对象")
public class StrokeQuotedPriceParam extends BaseEntity {
private static final long serialVersionUID = 1L;
@NotNull(message = "id不能为空")
@ApiModelProperty("主键ID")
private Long id;
@NotNull(message = "飞机型号ID不能为空")
@ApiModelProperty("飞机型号ID")
private Long plainTypeId;
@NotNull(message = "价格不能为空")
@ApiModelProperty("价格")
private BigDecimal money;
@ApiModelProperty("备注")
private String remarks;
}
common/src/main/java/com/sien/common/param/SysDepartmentPageParam.java deleted 100755 → 0
/*
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.sien.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 geekidea
* @date 2019-10-24
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "SysDepartmentPageParam对象", description = "部门查询参数")
public class SysDepartmentPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/sien/common/param/SysNoticePageParam.java deleted 100644 → 0
package com.sien.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 xxx
* @date 2020-11-06
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "系统通知表分页参数")
public class SysNoticePageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/sien/common/param/SysNoticeQueryVo.java deleted 100644 → 0
package com.sien.common.param;
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 xxx
* @date 2020-11-06
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "SysNoticeQueryVo对象")
public class SysNoticeQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("主题")
private String theme;
@ApiModelProperty("内容")
private String msgInfo;
@ApiModelProperty("创建时间（时间戳）")
private Date sendTime;
private Long sendReceive = 1L;//0:用户 1:客服
private Long msgType = 0L;//0、聊天信息，1、图片，2、视频，4、文件，5、订单
private Long merchantId = 0L;//商户ID 给个0
}
\ No newline at end of file
common/src/main/java/com/sien/common/param/SysNoticeReadPageParam.java deleted 100644 → 0
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* 系统通知已读 未读 分页参数对象
* </pre>
*
* @author xxx
* @date 2020-11-06
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "系统通知已读 未读分页参数")
public class SysNoticeReadPageParam extends BasePageOrderParam{
private static final long serialVersionUID=1L;
}
common/src/main/java/com/sien/common/param/SysNoticeReadQueryVo.java deleted 100644 → 0
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
/**
* <pre>
* 系统通知已读 未读 查询结果对象
* </pre>
*
* @author xxx
* @date 2020-11-06
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "SysNoticeReadQueryVo对象")
public class SysNoticeReadQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
// private Long id;
//
// @ApiModelProperty("用户ID")
// private Long userId;
@ApiModelProperty("0未读 1已读")
private Integer read;
}
\ No newline at end of file
common/src/main/java/com/sien/common/param/SysPermissionPageParam.java deleted 100755 → 0
/*
* Copyright 2019-2029 geekidea(https://github.com/geekidea)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.sien.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 geekidea
* @date 2019-10-24
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "SysPermissionPageParam对象", description = "系统权限查询参数")
public class SysPermissionPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/sien/common/param/UserActiveRecordPageParam.java deleted 100644 → 0
package com.sien.common.param;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/**
* <pre>
* app用户活跃记录表 分页参数对象
* </pre>
*
* @author giao
* @date 2020-10-21
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "app用户活跃记录表分页参数")
public class UserActiveRecordPageParam extends BasePageOrderParam{
private static final long serialVersionUID=1L;
}
common/src/main/java/com/sien/common/param/UserActiveRecordQueryVo.java deleted 100644 → 0
package com.sien.common.param;
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>
* app用户活跃记录表 查询结果对象
* </pre>
*
* @author giao
* @date 2020-10-21
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "UserActiveRecordQueryVo对象")
public class UserActiveRecordQueryVo implements Serializable{
private static final long serialVersionUID=1L;
@ApiModelProperty("主键id")
private Long id;
@ApiModelProperty("用户id")
private Long userId;
@ApiModelProperty("记录日期")
private Date recordDate;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("更新时间")
private Date modifyTime;
}
\ No newline at end of file
common/src/main/java/com/sien/common/param/VersionControlPageParam.java deleted 100644 → 0
package com.sien.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>
* App版本控制 分页参数对象
* </pre>
*
* @author giao
* @date 2020-10-26
*/
@Data
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
@ApiModel(value = "App版本控制分页参数")
public class VersionControlPageParam extends BasePageOrderParam {
private static final long serialVersionUID = 1L;
}
common/src/main/java/com/sien/common/param/VersionControlQueryVo.java deleted 100644 → 0
package com.sien.common.param;
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>
* App版本控制 查询结果对象
* </pre>
*
* @author giao
* @date 2020-10-26
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "VersionControlQueryVo对象")
public class VersionControlQueryVo implements Serializable {
private static final long serialVersionUID = 1L;
private Long id;
@ApiModelProperty("版本号")
private String versionName;
@ApiModelProperty("设备类型,1安卓,2 ios")
private Integer deviceType;
@ApiModelProperty("下载地址")
private String downloadUrl;
@ApiModelProperty("1:强更,0不强制")
private Integer force;
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("修改时间")
private Date updateTime;
}
\ No newline at end of file
common/src/main/java/com/sien/common/param/VipRecordPageParam.java
package com.sien.common.param; package com.sien.common.param;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
/** /**
* <pre> * <pre>
...@@ -20,4 +20,4 @@ import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam; ...@@ -20,4 +20,4 @@ import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
@ApiModel(value = "捐款记录分页参数") @ApiModel(value = "捐款记录分页参数")
public class VipRecordPageParam extends BasePageOrderParam{ public class VipRecordPageParam extends BasePageOrderParam{
private static final long serialVersionUID=1L; private static final long serialVersionUID=1L;
} }
api-app/src/main/java/com/sien/api/app/service/AppSmsService.java → common/src/main/java/com/sien/common/service/AppSmsService.java
package com.sien.api.app.service; package com.sien.common.service;
import io.geekidea.springbootplus.framework.common.api.ApiResult; import io.geekidea.springbootplus.framework.common.api.ApiResult;
......
api-app/src/main/java/com/sien/api/app/service/AppUserApiService.java → common/src/main/java/com/sien/common/service/AppUserApiService.java
package com.sien.api.app.service; package com.sien.common.service;
import com.sien.common.param.app.AppSmsRegisterParam; import com.sien.common.param.app.AppSmsRegisterParam;
import com.sien.common.param.app.AppUserInfoParam; import com.sien.common.param.app.AppUserInfoParam;
......
common/src/main/java/com/sien/common/service/AppUserService.java
package com.sien.common.service; package com.sien.common.service;
import com.sien.common.entity.AppUser;
import com.sien.common.param.AppUserPageParam; import com.sien.common.param.AppUserPageParam;
import com.sien.common.vo.AppUserQueryVo;
import com.sien.common.param.app.AppSmsRegisterParam; import com.sien.common.param.app.AppSmsRegisterParam;
import com.sien.common.param.app.DeviceTokenParam; import com.sien.common.param.app.DeviceTokenParam;
import com.sien.common.vo.AppUserQueryVo;
import com.sien.common.vo.app.LoginAppUserTokenVo; import com.sien.common.vo.app.LoginAppUserTokenVo;
import com.sien.common.entity.AppUser;
import io.geekidea.springbootplus.framework.common.api.ApiResult; import io.geekidea.springbootplus.framework.common.api.ApiResult;
import io.geekidea.springbootplus.framework.common.service.BaseService; import io.geekidea.springbootplus.framework.common.service.BaseService;
import io.geekidea.springbootplus.framework.core.pagination.Paging; import io.geekidea.springbootplus.framework.core.pagination.Paging;
......
common/src/main/java/com/sien/common/service/DonationAgentService.java
...@@ -3,7 +3,7 @@ package com.sien.common.service; ...@@ -3,7 +3,7 @@ package com.sien.common.service;
import com.sien.common.entity.DonationAgent; import com.sien.common.entity.DonationAgent;
import com.sien.common.param.DonationAgentPageParam; import com.sien.common.param.DonationAgentPageParam;
import io.geekidea.springbootplus.framework.common.service.BaseService; import io.geekidea.springbootplus.framework.common.service.BaseService;
import com.sien.common.param.DonationAgentQueryVo; import com.sien.common.vo.DonationAgentQueryVo;
import io.geekidea.springbootplus.framework.core.pagination.Paging; import io.geekidea.springbootplus.framework.core.pagination.Paging;
/** /**
......
common/src/main/java/com/sien/common/service/DonationRecordService.java
...@@ -3,7 +3,7 @@ package com.sien.common.service; ...@@ -3,7 +3,7 @@ package com.sien.common.service;
import com.sien.common.entity.DonationRecord; import com.sien.common.entity.DonationRecord;
import com.sien.common.param.DonationRecordPageParam; import com.sien.common.param.DonationRecordPageParam;
import io.geekidea.springbootplus.framework.common.service.BaseService; import io.geekidea.springbootplus.framework.common.service.BaseService;
import com.sien.common.param.DonationRecordQueryVo; import com.sien.common.vo.DonationRecordQueryVo;
import io.geekidea.springbootplus.framework.core.pagination.Paging; import io.geekidea.springbootplus.framework.core.pagination.Paging;
/** /**
......
common/src/main/java/com/sien/common/service/VipRecordService.java
...@@ -3,11 +3,11 @@ package com.sien.common.service; ...@@ -3,11 +3,11 @@ package com.sien.common.service;
import com.sien.common.entity.VipRecord; import com.sien.common.entity.VipRecord;
import com.sien.common.param.VipRecordPageParam; import com.sien.common.param.VipRecordPageParam;
import io.geekidea.springbootplus.framework.common.service.BaseService; import io.geekidea.springbootplus.framework.common.service.BaseService;
import com.sien.common.param.VipRecordQueryVo; import com.sien.common.vo.VipRecordQueryVo;
import io.geekidea.springbootplus.framework.core.pagination.Paging; import io.geekidea.springbootplus.framework.core.pagination.Paging;
/** /**
* 捐款记录 服务类 * Vip开通记录 服务类
* *
* @author hewei * @author hewei
* @since 2021-02-25 * @since 2021-02-25
......
api-app/src/main/java/com/sien/api/app/service/impl/AppSmsServiceImpl.java → common/src/main/java/com/sien/common/service/impl/AppSmsServiceImpl.java
package com.sien.api.app.service.impl; package com.sien.common.service.impl;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import com.sien.api.app.service.AppSmsService; import com.sien.common.service.AppSmsService;
import com.sien.api.app.vo.SmsCode;
import com.sien.common.service.AppUserService; import com.sien.common.service.AppUserService;
import com.sien.common.vo.SmsCode;
import io.geekidea.springbootplus.framework.common.api.ApiResult; import io.geekidea.springbootplus.framework.common.api.ApiResult;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
api-app/src/main/java/com/sien/api/app/service/impl/AppUserApiServiceImpl.java → common/src/main/java/com/sien/common/service/impl/AppUserApiServiceImpl.java
package com.sien.api.app.service.impl; package com.sien.common.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.sien.api.app.service.AppSmsService; import com.sien.common.service.AppSmsService;
import com.sien.api.app.service.AppUserApiService; import com.sien.common.service.AppUserApiService;
import com.sien.common.param.app.AppSmsRegisterParam; import com.sien.common.param.app.AppSmsRegisterParam;
import com.sien.common.param.app.AppUserInfoParam; import com.sien.common.param.app.AppUserInfoParam;
import com.sien.common.service.AppUserService; import com.sien.common.service.AppUserService;
......
common/src/main/java/com/sien/common/service/impl/AppUserServiceImpl.java
...@@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -4,15 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.metadata.OrderItem;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sien.common.entity.AppUser;
import com.sien.common.enums.StateEnum; import com.sien.common.enums.StateEnum;
import com.sien.common.mapper.BusinessPlainMapper; import com.sien.common.mapper.AppUserMapper;
import com.sien.common.param.AppUserPageParam; import com.sien.common.param.AppUserPageParam;
import com.sien.common.vo.AppUserQueryVo;
import com.sien.common.param.app.AppSmsRegisterParam; import com.sien.common.param.app.AppSmsRegisterParam;
import com.sien.common.param.app.DeviceTokenParam; import com.sien.common.param.app.DeviceTokenParam;
import com.sien.common.service.AppUserService; import com.sien.common.service.AppUserService;
import com.sien.common.vo.AppUserQueryVo;
import com.sien.common.vo.app.LoginAppUserTokenVo; import com.sien.common.vo.app.LoginAppUserTokenVo;
import com.sien.common.entity.AppUser;
import io.geekidea.springbootplus.config.properties.JwtProperties; import io.geekidea.springbootplus.config.properties.JwtProperties;
import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties; import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
import io.geekidea.springbootplus.framework.common.api.ApiCode; import io.geekidea.springbootplus.framework.common.api.ApiCode;
...@@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit; ...@@ -50,7 +50,7 @@ import java.util.concurrent.TimeUnit;
*/ */
@Slf4j @Slf4j
@Service @Service
public class AppUserServiceImpl extends BaseServiceImpl<BusinessPlainMapper.AppUserMapper, AppUser> implements AppUserService { public class AppUserServiceImpl extends BaseServiceImpl<AppUserMapper, AppUser> implements AppUserService {
@Autowired @Autowired
private RedisTemplate redisTemplate; private RedisTemplate redisTemplate;
...@@ -67,7 +67,7 @@ public class AppUserServiceImpl extends BaseServiceImpl<BusinessPlainMapper.AppU ...@@ -67,7 +67,7 @@ public class AppUserServiceImpl extends BaseServiceImpl<BusinessPlainMapper.AppU
private SpringBootPlusProperties springBootPlusProperties; private SpringBootPlusProperties springBootPlusProperties;
@Autowired @Autowired
private BusinessPlainMapper.AppUserMapper appUserMapper; private AppUserMapper appUserMapper;
@Override @Override
public boolean hasUserByPhoneNumer(String phoneArea, String phone) { public boolean hasUserByPhoneNumer(String phoneArea, String phone) {
......
common/src/main/java/com/sien/common/service/impl/DonationAgentServiceImpl.java
...@@ -4,7 +4,7 @@ import com.sien.common.entity.DonationAgent; ...@@ -4,7 +4,7 @@ import com.sien.common.entity.DonationAgent;
import com.sien.common.mapper.DonationAgentMapper; import com.sien.common.mapper.DonationAgentMapper;
import com.sien.common.service.DonationAgentService; import com.sien.common.service.DonationAgentService;
import com.sien.common.param.DonationAgentPageParam; import com.sien.common.param.DonationAgentPageParam;
import com.sien.common.param.DonationAgentQueryVo; import com.sien.common.vo.DonationAgentQueryVo;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.Paging; import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo; import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
......
common/src/main/java/com/sien/common/service/impl/DonationRecordServiceImpl.java
...@@ -4,7 +4,7 @@ import com.sien.common.entity.DonationRecord; ...@@ -4,7 +4,7 @@ import com.sien.common.entity.DonationRecord;
import com.sien.common.mapper.DonationRecordMapper; import com.sien.common.mapper.DonationRecordMapper;
import com.sien.common.service.DonationRecordService; import com.sien.common.service.DonationRecordService;
import com.sien.common.param.DonationRecordPageParam; import com.sien.common.param.DonationRecordPageParam;
import com.sien.common.param.DonationRecordQueryVo; import com.sien.common.vo.DonationRecordQueryVo;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.Paging; import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo; import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
......
common/src/main/java/com/sien/common/service/impl/MerchantSmsService.java deleted 100644 → 0
package com.sien.common.service.impl;
import io.geekidea.springbootplus.framework.common.api.ApiResult;
public interface MerchantSmsService {
void deleteRegisterCode(String area, String number);
/**
* 获取注册验证码
*/
ApiResult<Object> registerCode(String phoneArea, String phone);
/**
* 获取注册验证码
*/
ApiResult LoginType(String area, String number);
/**
* 校验注册验证码
*
* @param area
* @param number
* @param code
* @return
*/
boolean equalsRegisterCode(String area, String number, String code);
/**
* 校验验登陆证码
*
* @param area
* @param number
* @param code
* @return
*/
boolean equalsLoginCode(String area, String number, String code);
}
common/src/main/java/com/sien/common/service/impl/VipRecordServiceImpl.java
...@@ -4,7 +4,7 @@ import com.sien.common.entity.VipRecord; ...@@ -4,7 +4,7 @@ import com.sien.common.entity.VipRecord;
import com.sien.common.mapper.VipRecordMapper; import com.sien.common.mapper.VipRecordMapper;
import com.sien.common.service.VipRecordService; import com.sien.common.service.VipRecordService;
import com.sien.common.param.VipRecordPageParam; import com.sien.common.param.VipRecordPageParam;
import com.sien.common.param.VipRecordQueryVo; import com.sien.common.vo.VipRecordQueryVo;
import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl; import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
import io.geekidea.springbootplus.framework.core.pagination.Paging; import io.geekidea.springbootplus.framework.core.pagination.Paging;
import io.geekidea.springbootplus.framework.core.pagination.PageInfo; import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
...@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service; ...@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
/** /**
* 捐款记录 服务实现类 * Vip开通记录 服务实现类
* *
* @author hewei * @author hewei
* @since 2021-02-25 * @since 2021-02-25
......
common/src/main/java/com/sien/common/vo/AppUserQueryVo.java
...@@ -10,11 +10,11 @@ import java.util.Date; ...@@ -10,11 +10,11 @@ import java.util.Date;
/** /**
* <pre> * <pre>
* APP用户 查询结果对象 * 系统用户 查询结果对象
* </pre> * </pre>
* *
* @author wei * @author hewei
* @date 2020-09-23 * @date 2021-02-25
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
...@@ -28,9 +28,18 @@ public class AppUserQueryVo implements Serializable { ...@@ -28,9 +28,18 @@ public class AppUserQueryVo implements Serializable {
@ApiModelProperty("用户名") @ApiModelProperty("用户名")
private String username; private String username;
@ApiModelProperty("昵称") @ApiModelProperty("微信id")
private String wechatOpenId;
@ApiModelProperty("姓名")
private String nickname; private String nickname;
@ApiModelProperty("证件号码")
private String idcard;
@ApiModelProperty("民族")
private String nation;
@ApiModelProperty("密码") @ApiModelProperty("密码")
private String password; private String password;
...@@ -55,12 +64,6 @@ public class AppUserQueryVo implements Serializable { ...@@ -55,12 +64,6 @@ public class AppUserQueryVo implements Serializable {
@ApiModelProperty("状态，0：禁用，1：启用，2：锁定") @ApiModelProperty("状态，0：禁用，1：启用，2：锁定")
private Integer state; private Integer state;
@ApiModelProperty("部门id")
private Long departmentId;
@ApiModelProperty("角色id")
private Long roleId;
@ApiModelProperty("逻辑删除，0：未删除，1：已删除") @ApiModelProperty("逻辑删除，0：未删除，1：已删除")
private Integer deleted; private Integer deleted;
...@@ -72,4 +75,28 @@ public class AppUserQueryVo implements Serializable { ...@@ -72,4 +75,28 @@ public class AppUserQueryVo implements Serializable {
@ApiModelProperty("修改时间") @ApiModelProperty("修改时间")
private Date updateTime; private Date updateTime;
@ApiModelProperty("出生日期")
private String dateOfBirth;
@ApiModelProperty("文化程度")
private String educationBackground;
@ApiModelProperty("邮件")
private String email;
@ApiModelProperty("省市区")
private String location;
@ApiModelProperty("详细地址")
private String locationDetail;
@ApiModelProperty("职业")
private String profession;
@ApiModelProperty("工作单位")
private String company;
@ApiModelProperty("紧急电话")
private String emergencyPhone;
} }
\ No newline at end of file
common/src/main/java/com/sien/common/param/DonationAgentQueryVo.java → common/src/main/java/com/sien/common/vo/DonationAgentQueryVo.java
package com.sien.common.param; package com.sien.common.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
common/src/main/java/com/sien/common/param/DonationRecordQueryVo.java → common/src/main/java/com/sien/common/vo/DonationRecordQueryVo.java
package com.sien.common.param; package com.sien.common.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
common/src/main/java/com/sien/common/param/MerchantUserPermissionDetailVo.java → common/src/main/java/com/sien/common/vo/MerchantUserPermissionDetailVo.java
package com.sien.common.param; package com.sien.common.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
api-app/src/main/java/com/sien/api/app/vo/SmsCode.java → common/src/main/java/com/sien/common/vo/SmsCode.java
package com.sien.api.app.vo; package com.sien.common.vo;
import lombok.Data; import lombok.Data;
......
common/src/main/java/com/sien/common/param/VipRecordQueryVo.java → common/src/main/java/com/sien/common/vo/VipRecordQueryVo.java
package com.sien.common.param; package com.sien.common.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
common/src/main/resources/mapper/AppUserMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sien.common.mapper.BusinessPlainMapper.AppUserMapper"> <mapper namespace="com.sien.common.mapper.AppUserMapper">
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, username, surname, name, company_name, wechat, nickname, password, salt, phone, phone_area, gender, head, device_token, device_type, remark, state, department_id, role_id, deleted, version, create_time, update_time, date_of_birth, access_token id, username, wechat_open_id, nickname, idcard, nation, password, salt, phone, phone_area, gender, head, remark, state, deleted, version, create_time, update_time, date_of_birth, education_background, email, location, location_detail, profession, company, emergency_phone
</sql> </sql>
<select id="getAppUserById" resultType="com.sien.common.vo.AppUserQueryVo"> <select id="getAppUserById" resultType="com.sien.common.vo.AppUserQueryVo">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from app_user where id = #{id} from app_user where id = #{id}
</select> </select>
<select id="getAppUserPageList" parameterType="com.sien.common.param.AppUserPageParam" <select id="getAppUserPageList" parameterType="com.sien.common.param.AppUserPageParam" resultType="com.sien.common.vo.AppUserQueryVo">
resultType="com.sien.common.vo.AppUserQueryVo"> select
select <include refid="Base_Column_List"/>
<include refid="Base_Column_List"/> from app_user
from app_user </select>
</select>
</mapper> </mapper>
common/src/main/resources/mapper/BusinessPlainMapper.xml deleted 100644 → 0
<?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.sien.common.mapper.BusinessPlainMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id,
mc_id,
business_type,
img_url,
introduction,
name,
phone,
wechat,
status,
create_time,
update_time,
recommend
</sql>
<sql id="Base_Column_ListForApp">
bp.business_type,
bp.img_url,
bp.introduction,
bp.name,
bp.phone,
bp.wechat,
m.`name` AS mcName,
bp.recommend
</sql>
<select id="getBusinessPlainById" resultType="com.sien.common.vo.BusinessPlainQueryVo">
select
<include refid="Base_Column_List"/>
from business_plain where id = #{id}
</select>
<select id="getBusinessPlainPageList" parameterType="com.sien.common.param.BusinessPlainPageParam"
resultMap="pageListMap">
select
<include refid="Base_Column_List"/>
from business_plain
where mc_id = #{mcId}
</select>
<resultMap id="pageListMap" type="com.sien.common.vo.BusinessPlainQueryVo">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="img_url" property="imgList" typeHandler="com.sien.common.campusstore.ArrayJsonHandler"></result>
</resultMap>
<select id="getBusinessPlainPageListForApp" parameterType="com.sien.common.param.BusinessPlainPageParam"
resultMap="pageListMapForApp">
select
<include refid="Base_Column_ListForApp"/>,
m.`head` AS mcHead
from business_plain bp
INNER JOIN merchant m ON bp.mc_id=m.id
where bp.business_type = #{param.type}
AND m.state = 1
and m.audit_register_status = 1
ORDER BY bp.recommend DESC
</select>
<resultMap id="pageListMapForApp" type="com.sien.common.vo.BusinessPlainQueryForAppVo">
<result column="img_url" property="imgList" typeHandler="com.sien.common.campusstore.ArrayJsonHandler"></result>
</resultMap>
</mapper>
common/src/main/resources/mapper/CharterIntroductionMapper.xml deleted 100644 → 0
<?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.sien.common.mapper.CharterIntroductionMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, mc_id, status, create_time,update_time,type,text,img_url,recommend
</sql>
<sql id="Base_Column_ListForApp">
title,text,img_url,m.head AS mcHead,m.name AS mcName,ci.recommend
</sql>
<select id="getCharterIntroductionById" resultType="com.sien.common.vo.CharterIntroductionQueryVo">
select
<include refid="Base_Column_List"/>
from charter_introduction where id = #{id}
</select>
<select id="getCharterIntroductionPageList" parameterType="com.sien.common.param.CharterIntroductionPageParam"
resultType="com.sien.common.vo.CharterIntroductionQueryVo">
select
<include refid="Base_Column_List"/>
from charter_introduction
</select>
<select id="getCharterIntroductionForAppPageList"
parameterType="com.sien.common.param.CharterIntroductionPageParam"
resultType="com.sien.common.vo.CharterIntroductionQueryForAppVo">
select
<include refid="Base_Column_ListForApp"/>
from charter_introduction ci
INNER JOIN merchant m ON ci.mc_id=m.id
where ci.type = #{param.type}
AND m.state=1 and m.audit_register_status=1
ORDER BY ci.recommend DESC
</select>
</mapper>
common/src/main/resources/mapper/ContactStaffMapper.xml deleted 100644 → 0
<?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.sien.common.mapper.ContactStaffMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, phone, status, mc_id, create_time, update_time
</sql>
<select id="getContactStaffById" resultType="com.sien.common.param.ContactStaffQueryVo">
select
<include refid="Base_Column_List"/>
from contact_staff where id = #{id}
</select>
<select id="getContactStaffPageList" parameterType="com.sien.common.param.ContactStaffPageParam"
resultType="com.sien.common.param.ContactStaffQueryVo">
select
<include refid="Base_Column_List"/>
from contact_staff
where mc_id = #{mcId}
</select>
</mapper>
common/src/main/resources/mapper/DonationAgentMapper.xml
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
id, fk_user_id, fk_record_id, remark, create_time, update_time id, fk_user_id, fk_record_id, remark, create_time, update_time
</sql> </sql>
<select id="getDonationAgentById" resultType="com.sien.common.param.DonationAgentQueryVo"> <select id="getDonationAgentById" resultType="com.sien.common.vo.DonationAgentQueryVo">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from donation_agent where id = #{id} from donation_agent where id = #{id}
</select> </select>
<select id="getDonationAgentPageList" parameterType="com.sien.common.param.DonationAgentPageParam" resultType="com.sien.common.param.DonationAgentQueryVo"> <select id="getDonationAgentPageList" parameterType="com.sien.common.param.DonationAgentPageParam" resultType="com.sien.common.vo.DonationAgentQueryVo">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from donation_agent from donation_agent
......
common/src/main/resources/mapper/DonationRecordMapper.xml
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
id, fk_user_id, money, purpose, way, remark, create_time, update_time, is_replace id, fk_user_id, money, purpose, way, remark, create_time, update_time, is_replace
</sql> </sql>
<select id="getDonationRecordById" resultType="com.sien.common.param.DonationRecordQueryVo"> <select id="getDonationRecordById" resultType="com.sien.common.vo.DonationRecordQueryVo">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from donation_record where id = #{id} from donation_record where id = #{id}
</select> </select>
<select id="getDonationRecordPageList" parameterType="com.sien.common.param.DonationRecordPageParam" resultType="com.sien.common.param.DonationRecordQueryVo"> <select id="getDonationRecordPageList" parameterType="com.sien.common.param.DonationRecordPageParam" resultType="com.sien.common.vo.DonationRecordQueryVo">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from donation_record from donation_record
......
common/src/main/resources/mapper/VipRecordMapper.xml
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
id, fk_user_id, fk_recharge_user, money, expired_at, years, vip_level, remark, create_time, update_time id, fk_user_id, fk_recharge_user, money, expired_at, years, vip_level, remark, create_time, update_time
</sql> </sql>
<select id="getVipRecordById" resultType="com.sien.common.param.VipRecordQueryVo"> <select id="getVipRecordById" resultType="com.sien.common.vo.VipRecordQueryVo">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from vip_record where id = #{id} from vip_record where id = #{id}
</select> </select>
<select id="getVipRecordPageList" parameterType="com.sien.common.param.VipRecordPageParam" resultType="com.sien.common.param.VipRecordQueryVo"> <select id="getVipRecordPageList" parameterType="com.sien.common.param.VipRecordPageParam" resultType="com.sien.common.vo.VipRecordQueryVo">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>
from vip_record from vip_record
......
common/src/main/resources/mapper/system/SysDepartmentMapper.xml deleted 100755 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2019-2029 geekidea(https://github.com/geekidea)
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sien.common.mapper.SysDepartmentMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, name, parent_id, state, sort, remark, version, create_time, update_time
</sql>
<select id="getSysDepartmentById" resultType="com.sien.common.vo.SysDepartmentQueryVo">
select
<include refid="Base_Column_List"/>
from sys_department where id = #{id}
</select>
<select id="getSysDepartmentPageList" resultType="com.sien.common.vo.SysDepartmentQueryVo">
select
<include refid="Base_Column_List"/>
from sys_department
</select>
</mapper>
common/src/main/resources/mapper/system/SysPermissionMapper.xml deleted 100755 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2019-2029 geekidea(https://github.com/geekidea)
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sien.common.mapper.SysPermissionMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, name, parent_id, url, code, icon, type, level, state, sort, remark, version, create_time, update_time
</sql>
<select id="getSysPermissionById" resultType="com.sien.common.vo.SysPermissionQueryVo">
select
<include refid="Base_Column_List"/>
from sys_permission where id = #{id}
</select>
<select id="getSysPermissionPageList" resultType="com.sien.common.vo.SysPermissionQueryVo">
select
<include refid="Base_Column_List"/>
from sys_permission
</select>
<select id="getPermissionCodesByUserId" resultType="java.lang.String">
select p.code
from sys_user u
inner join sys_role r
on u.role_id = r.id
inner join sys_role_permission rp
on r.id = rp.role_id
inner join sys_permission p
on rp.permission_id = p.id
where u.state = 1
and r.state = 1
and rp.state = 1
and p.state = 1
and u.deleted = 0
and u.id = #{userId};
</select>
<select id="getMenuListByUserId" resultType="com.sien.common.entity.SysPermission">
select p.*
from sys_user u
inner join sys_role r
on u.role_id = r.id
inner join sys_role_permission rp
on r.id = rp.role_id
inner join sys_permission p
on rp.permission_id = p.id
where u.state = 1
and u.deleted = 0
and r.state = 1
and rp.state = 1
and p.state = 1
and u.id = #{userId}
</select>
</mapper>
common/src/main/resources/mapper/system/SysRoleMapper.xml deleted 100755 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2019-2029 geekidea(https://github.com/geekidea)
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sien.common.mapper.SysRoleMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, name, code, type, state, remark, version, create_time, update_time
</sql>
<select id="getSysRoleById" resultType="com.sien.common.vo.SysRoleQueryVo">
select
<include refid="Base_Column_List"/>
from sys_role where id = #{id}
</select>
</mapper>
common/src/main/resources/mapper/system/SysRolePermissionMapper.xml deleted 100755 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2019-2029 geekidea(https://github.com/geekidea)
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sien.common.mapper.SysRolePermissionMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, role_id, permission_id, state, remark, version, create_time, update_time
</sql>
<select id="getSysRolePermissionById" resultType="com.sien.common.vo.SysRolePermissionQueryVo">
select
<include refid="Base_Column_List"/>
from sys_role_permission where id = #{id}
</select>
<select id="getSysRolePermissionPageList"
resultType="com.sien.common.vo.SysRolePermissionQueryVo">
select
<include refid="Base_Column_List"/>
from sys_role_permission
</select>
<select id="getPermissionCodesByRoleId" resultType="java.lang.String">
select p.code
from sys_role r
inner join sys_role_permission rp
on r.id = rp.role_id
inner join sys_permission p
on rp.permission_id = p.id
where r.state = 1
and rp.state = 1
and p.state = 1
and r.id = #{roleId};
</select>
<select id="getThreeLevelPermissionIdsByRoleId" resultType="long">
select distinct rp.permission_id
from sys_role r
inner join sys_role_permission rp on r.id = rp.role_id
inner join sys_permission p on rp.permission_id = p.id
where r.id = #{roleId} and p.level = 3 and r.state = 1 and rp.state = 1 and p.state = 1
</select>
</mapper>
common/src/main/resources/mapper/system/SysUserMapper.xml deleted 100755 → 0
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2019-2029 geekidea(https://github.com/geekidea)
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.sien.common.mapper.SysUserMapper">
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, username, nickname, phone, gender, head, remark, state, department_id, role_id, deleted, version, create_time, update_time
</sql>
<sql id="BaseQuerySelect">
select
u.id, u.username, u.nickname, u.phone, u.gender, u.head, u.remark,
u.state, u.department_id, u.role_id, u.deleted, u.create_time, u.update_time,
d.name as departmentName,
r.name as roleName
from sys_user u
inner join sys_department d on u.department_id = d.id
inner join sys_role r on u.role_id = r.id
where u.deleted = 0
</sql>
<select id="getSysUserById" resultType="com.sien.common.vo.SysUserQueryVo">
<include refid="BaseQuerySelect"/>
and u.id = #{id}
</select>
<select id="getSysUserPageList" resultType="com.sien.common.vo.SysUserQueryVo">
<include refid="BaseQuerySelect"/>
<if test="param.departmentId != null">
and u.department_id = #{param.departmentId}
</if>
<if test="param.roleId != null">
and u.role_id = #{param.roleId}
</if>
<if test="param.state != null">
and u.state = #{param.state}
</if>
<if test="param.createTimeStart != null">
and date_format(u.create_time,'%Y-%m-%d') >= date_format(#{param.createTimeStart},'%Y-%m-%d')
</if>
<if test="param.createTimeEnd != null">
and date_format(u.create_time,'%Y-%m-%d') &lt;= date_format(#{param.createTimeEnd},'%Y-%m-%d')
</if>
<if test="param.keyword != null and param.keyword != ''">
and (
u.username like concat('%', #{param.keyword} ,'%') or
u.nickname like concat('%', #{param.keyword} ,'%')
)
</if>
<if test="param.username != null and param.username != ''">
and u.username like concat('%', #{param.username} ,'%')
</if>
<if test="param.nickname != null and param.nickname != ''">
and u.nickname like concat('%', #{param.nickname} ,'%')
</if>
</select>
</mapper>
generator/src/main/java/io/geekidea/springbootplus/generator/SpringBootPlusGenerator.java
...@@ -70,7 +70,7 @@ public class SpringBootPlusGenerator { ...@@ -70,7 +70,7 @@ public class SpringBootPlusGenerator {
.setUsername("root") .setUsername("root")
.setPassword("temple123456") .setPassword("temple123456")
.setDriverName("com.mysql.jdbc.Driver") .setDriverName("com.mysql.jdbc.Driver")
.setUrl("jdbc:mysql://47.99.47.225:3306/SiEn?useUnicode=true&characterEncoding=UTF-8&useSSL=false"); .setUrl("jdbc:mysql://47.99.47.225:3306/sien?useUnicode=true&characterEncoding=UTF-8&useSSL=false");
// 生成配置 // 生成配置
generatorProperties.getGeneratorConfig() generatorProperties.getGeneratorConfig()
......
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