Skip to content

C
cloud-platform
Commit d654519e authored by hanfeng's avatar hanfeng
Browse files
Options

Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

parents bbd34e9e 4da900ea
Show whitespace changes
Inline Side-by-side
Showing with 1387 additions and 3377 deletions
ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/BaseController.java
View file @ d654519e
...@@ -25,6 +25,10 @@ public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseContro ...@@ -25,6 +25,10 @@ public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseContro
@Autowired @Autowired
protected Biz baseBiz; protected Biz baseBiz;
public Biz getBaseBiz() {
return baseBiz;
}
@ApiOperation("添加") @ApiOperation("添加")
@RequestMapping(value = "",method = RequestMethod.POST) @RequestMapping(value = "",method = RequestMethod.POST)
@ResponseBody @ResponseBody
......
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java 0 → 100644
View file @ d654519e
package com.github.wxiaoqi.security.admin.entity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 会员等级表
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-06-11 11:06:45
*/
@Data
@Table(name = "base_user_member_level")
public class BaseUserMemberLevel implements Serializable {
private static final long serialVersionUID = 1L;
//主键id
@Id
@GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键id")
private Integer id;
//等级名称
@Column(name = "name")
@ApiModelProperty(value = "等级名称")
private String name;
//图标
@Column(name = "icon")
@ApiModelProperty(value = "图标")
private String icon;
//等级
@Column(name = "level")
@ApiModelProperty(value = "等级")
private Integer level;
//描述
@Column(name = "describes")
@ApiModelProperty(value = "描述")
private String describe;
//有效数；-1是永久有效
@Column(name = "end_date")
@ApiModelProperty(value = "有效数；-1是永久有效")
private Integer endDate;
//折扣
@Column(name = "discount")
@ApiModelProperty(value = "折扣")
private Integer discount;
//是否删除；0-正常；1-删除
@Column(name = "isdel")
@ApiModelProperty(value = "是否删除；0-正常；1-删除")
private Integer isdel;
//购买会员价格
@Column(name = "price")
@ApiModelProperty(value = "购买会员价格")
private BigDecimal price;
}
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
View file @ d654519e
package com.github.wxiaoqi.security.admin.feign; package com.github.wxiaoqi.security.admin.feign;
import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO; import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO; import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
...@@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
/** /**
* ${DESCRIPTION} * ${DESCRIPTION}
* *
...@@ -32,6 +35,9 @@ public interface UserFeign { ...@@ -32,6 +35,9 @@ public interface UserFeign {
public ObjectRestResponse authentication( @RequestParam(value="userId")Integer userId, public ObjectRestResponse authentication( @RequestParam(value="userId")Integer userId,
@RequestParam(value="idNumber")String idNumber, @RequestParam(value="idNumber")String idNumber,
@RequestParam(value="status")Integer status); @RequestParam(value="status")Integer status);
@RequestMapping(value = "/member/levels", method = RequestMethod.GET)
public List<BaseUserMemberLevel> levels();
} }
ace-modules/ace-admin/pom.xml
View file @ d654519e
...@@ -30,10 +30,6 @@ ...@@ -30,10 +30,6 @@
<pagehelper.version>4.1.1</pagehelper.version> <pagehelper.version>4.1.1</pagehelper.version>
</properties> </properties>
<dependencies> <dependencies>
<!-- <dependency>-->
<!-- <groupId>com.github.wxiaoqi</groupId>-->
<!-- <artifactId>ace-admin-api</artifactId>-->
<!-- </dependency>-->
<dependency> <dependency>
<groupId>com.github.wxiaoqi</groupId> <groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-common</artifactId> <artifactId>ace-common</artifactId>
...@@ -197,6 +193,12 @@ ...@@ -197,6 +193,12 @@
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-admin-api</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<finalName>ace-admin</finalName> <finalName>ace-admin</finalName>
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserMemberBiz.java 0 → 100644
View file @ d654519e
package com.github.wxiaoqi.security.admin.biz;
import com.ace.cache.annotation.Cache;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.wxiaoqi.security.admin.entity.AppUser;
import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
import com.github.wxiaoqi.security.admin.entity.Group;
import com.github.wxiaoqi.security.admin.entity.User;
import com.github.wxiaoqi.security.admin.mapper.AppUserMapper;
import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.msg.TableResultResponse;
import com.github.wxiaoqi.security.common.util.Query;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import tk.mybatis.mapper.entity.Example;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Set;
import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_TRUE;
/**
* @author keliii
*/
@Service
public class UserMemberBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUserMemberLevel> {
@Transactional
public List<BaseUserMemberLevel> getLevesls() {
return mapper.selectAll();
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/constant/AdminCommonConstant.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.constant;
/**
* ${DESCRIPTION}
*
* @author wanghaobin
* @create 2017-06-17 14:41
*/
public class AdminCommonConstant {
public final static int ROOT = -1;
public final static int DEFAULT_GROUP_TYPE = 0;
/**
* 权限关联类型
*/
public final static String AUTHORITY_TYPE_GROUP = "group";
/**
* 权限资源类型
*/
public final static String RESOURCE_TYPE_MENU = "menu";
public final static String RESOURCE_TYPE_BTN = "button";
public final static String RESOURCE_REQUEST_METHOD_GET = "GET";
public final static String RESOURCE_REQUEST_METHOD_PUT = "PUT";
public final static String RESOURCE_REQUEST_METHOD_DELETE = "DELETE";
public final static String RESOURCE_REQUEST_METHOD_POST = "POST";
public final static String RESOURCE_ACTION_VISIT = "访问";
public final static String BOOLEAN_NUMBER_FALSE = "0";
public final static String BOOLEAN_NUMBER_TRUE = "1";
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/constant/RedisKey.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.constant;
public class RedisKey {
/**
*验证码key前缀
*/
public static final String CONSTANT_CODE_PREFIX ="cache:mobilecode:";
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUser.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.entity;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Date;
/**
* @author keliii
*/
@Table(name = "app_user")
public class AppUser {
@Id
@GeneratedValue(generator = "JDBC")//此处加上注解
private Integer id;
private String username;
private String password;
private String name;
private String birthday;
private String address;
@Column(name = "mobile_phone")
private String mobilePhone;
@Column(name = "tel_phone")
private String telPhone;
private String email;
private String sex;
private String type;
@Column(name = "status")
private Integer status;
@Column(name = "zone_id")
private Integer zoneId;
@Column(name = "company_id")
private Integer companyId;
private String description;
@Column(name = "crt_time")
private Date crtTime;
@Column(name = "crt_user")
private String crtUser;
@Column(name = "crt_name")
private String crtName;
@Column(name = "crt_host")
private String crtHost;
@Column(name = "upd_time")
private Date updTime;
@Column(name = "upd_user")
private String updUser;
@Column(name = "upd_name")
private String updName;
@Column(name = "upd_host")
private String updHost;
@Column(name = "data_all")
private Integer dataAll;
@Column(name = "data_zone")
private String dataZone;
@Column(name = "data_company")
private String dataCompany;
private String attr1;
private String attr2;
private String attr3;
private String attr4;
private String attr5;
private String attr6;
private String attr7;
private String attr8;
/**
* @return id
*/
public Integer getId() {
return id;
}
/**
* @param id
*/
public void setId(Integer id) {
this.id = id;
}
/**
* @return username
*/
public String getUsername() {
return username;
}
/**
* @param username
*/
public void setUsername(String username) {
this.username = username;
}
/**
* @return password
*/
public String getPassword() {
return password;
}
/**
* @param password
*/
public void setPassword(String password) {
this.password = password;
}
/**
* @return name
*/
public String getName() {
return name;
}
/**
* @param name
*/
public void setName(String name) {
this.name = name;
}
/**
* @return birthday
*/
public String getBirthday() {
return birthday;
}
/**
* @param birthday
*/
public void setBirthday(String birthday) {
this.birthday = birthday;
}
/**
* @return address
*/
public String getAddress() {
return address;
}
/**
* @param address
*/
public void setAddress(String address) {
this.address = address;
}
/**
* @return mobile_phone
*/
public String getMobilePhone() {
return mobilePhone;
}
/**
* @param mobilePhone
*/
public void setMobilePhone(String mobilePhone) {
this.mobilePhone = mobilePhone;
}
/**
* @return tel_phone
*/
public String getTelPhone() {
return telPhone;
}
/**
* @param telPhone
*/
public void setTelPhone(String telPhone) {
this.telPhone = telPhone;
}
/**
* @return email
*/
public String getEmail() {
return email;
}
/**
* @param email
*/
public void setEmail(String email) {
this.email = email;
}
/**
* @return sex
*/
public String getSex() {
return sex;
}
/**
* @param sex
*/
public void setSex(String sex) {
this.sex = sex;
}
/**
* @return type
*/
public String getType() {
return type;
}
/**
* @param type
*/
public void setType(String type) {
this.type = type;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getZoneId() {
return zoneId;
}
public void setZoneId(Integer zoneId) {
this.zoneId = zoneId;
}
public Integer getCompanyId() {
return companyId;
}
public void setCompanyId(Integer companyId) {
this.companyId = companyId;
}
/**
* @return description
*/
public String getDescription() {
return description;
}
/**
* @param description
*/
public void setDescription(String description) {
this.description = description;
}
/**
* @return crt_time
*/
public Date getCrtTime() {
return crtTime;
}
/**
* @param crtTime
*/
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
/**
* @return crt_user
*/
public String getCrtUser() {
return crtUser;
}
/**
* @param crtUser
*/
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
/**
* @return crt_name
*/
public String getCrtName() {
return crtName;
}
/**
* @param crtName
*/
public void setCrtName(String crtName) {
this.crtName = crtName;
}
/**
* @return crt_host
*/
public String getCrtHost() {
return crtHost;
}
/**
* @param crtHost
*/
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
/**
* @return upd_time
*/
public Date getUpdTime() {
return updTime;
}
/**
* @param updTime
*/
public void setUpdTime(Date updTime) {
this.updTime = updTime;
}
/**
* @return upd_user
*/
public String getUpdUser() {
return updUser;
}
/**
* @param updUser
*/
public void setUpdUser(String updUser) {
this.updUser = updUser;
}
/**
* @return upd_name
*/
public String getUpdName() {
return updName;
}
/**
* @param updName
*/
public void setUpdName(String updName) {
this.updName = updName;
}
/**
* @return upd_host
*/
public String getUpdHost() {
return updHost;
}
/**
* @param updHost
*/
public void setUpdHost(String updHost) {
this.updHost = updHost;
}
public Integer getDataAll() {
return dataAll;
}
public void setDataAll(Integer dataAll) {
this.dataAll = dataAll;
}
public String getDataZone() {
return dataZone;
}
public void setDataZone(String dataZone) {
this.dataZone = dataZone;
}
public String getDataCompany() {
return dataCompany;
}
public void setDataCompany(String dataCompany) {
this.dataCompany = dataCompany;
}
/**
* @return attr1
*/
public String getAttr1() {
return attr1;
}
/**
* @param attr1
*/
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
/**
* @return attr2
*/
public String getAttr2() {
return attr2;
}
/**
* @param attr2
*/
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
/**
* @return attr3
*/
public String getAttr3() {
return attr3;
}
/**
* @param attr3
*/
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
/**
* @return attr4
*/
public String getAttr4() {
return attr4;
}
/**
* @param attr4
*/
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
/**
* @return attr5
*/
public String getAttr5() {
return attr5;
}
/**
* @param attr5
*/
public void setAttr5(String attr5) {
this.attr5 = attr5;
}
/**
* @return attr6
*/
public String getAttr6() {
return attr6;
}
/**
* @param attr6
*/
public void setAttr6(String attr6) {
this.attr6 = attr6;
}
/**
* @return attr7
*/
public String getAttr7() {
return attr7;
}
/**
* @param attr7
*/
public void setAttr7(String attr7) {
this.attr7 = attr7;
}
/**
* @return attr8
*/
public String getAttr8() {
return attr8;
}
/**
* @param attr8
*/
public void setAttr8(String attr8) {
this.attr8 = attr8;
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.entity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* 用户详情信息表
*/
@Table(name = "app_user_detail")
@Data
public class AppUserDetail {
@Id
@GeneratedValue(generator = "JDBC")
private int id;
private Integer userid;
@Column(name = "is_member")
private Integer isMember;
private String nickname;
private String realname;
private String headimgurl;
private String email;
private Integer sex;
private String birthday;
@Column(name = "person_sign")
private String personSign;
private String remark;
private Long createtime;
private Long updatetime;
private Integer isdel;
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserLogin.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.entity;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* 用户登录信息表
*/
@Table(name = "app_user_login")
@Data
public class AppUserLogin {
@Id
@GeneratedValue(generator = "JDBC")
private int id;
@Column(name = "im_userid")
private Integer imUserid;
private String username;
private String password;
@Column(name = "wx_openid")
private String wxOpenid;
private String unionid;
private String openid;
private Long createtime;
private Long updatetime;
private Integer isdel;
private Integer status;
@Column(name = "id_number")
private String idNumber;
@Column(name = "certification_status")
private Integer certificationStatus;
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/entity/Element.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.entity;
import java.util.Date;
import javax.persistence.*;
@Table(name = "base_element")
public class Element {
@Id
private Integer id;
private String code;
private String type;
private String name;
private String uri;
@Column(name = "menu_id")
private String menuId;
@Column(name = "parent_id")
private String parentId;
private String path;
private String method;
private String description;
@Column(name = "crt_time")
private Date crtTime;
@Column(name = "crt_user")
private String crtUser;
@Column(name = "crt_name")
private String crtName;
@Column(name = "crt_host")
private String crtHost;
private String attr1;
private String attr2;
private String attr3;
private String attr4;
private String attr5;
private String attr6;
private String attr7;
private String attr8;
/**
* @return id
*/
public Integer getId() {
return id;
}
/**
* @param id
*/
public void setId(Integer id) {
this.id = id;
}
/**
* @return code
*/
public String getCode() {
return code;
}
/**
* @param code
*/
public void setCode(String code) {
this.code = code;
}
/**
* @return type
*/
public String getType() {
return type;
}
/**
* @param type
*/
public void setType(String type) {
this.type = type;
}
/**
* @return name
*/
public String getName() {
return name;
}
/**
* @param name
*/
public void setName(String name) {
this.name = name;
}
/**
* @return uri
*/
public String getUri() {
return uri;
}
/**
* @param uri
*/
public void setUri(String uri) {
this.uri = uri;
}
/**
* @return menu_id
*/
public String getMenuId() {
return menuId;
}
/**
* @param menuId
*/
public void setMenuId(String menuId) {
this.menuId = menuId;
}
/**
* @return parent_id
*/
public String getParentId() {
return parentId;
}
/**
* @param parentId
*/
public void setParentId(String parentId) {
this.parentId = parentId;
}
/**
* @return path
*/
public String getPath() {
return path;
}
/**
* @param path
*/
public void setPath(String path) {
this.path = path;
}
/**
* @return method
*/
public String getMethod() {
return method;
}
/**
* @param method
*/
public void setMethod(String method) {
this.method = method;
}
/**
* @return description
*/
public String getDescription() {
return description;
}
/**
* @param description
*/
public void setDescription(String description) {
this.description = description;
}
/**
* @return crt_time
*/
public Date getCrtTime() {
return crtTime;
}
/**
* @param crtTime
*/
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
/**
* @return crt_user
*/
public String getCrtUser() {
return crtUser;
}
/**
* @param crtUser
*/
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
/**
* @return crt_name
*/
public String getCrtName() {
return crtName;
}
/**
* @param crtName
*/
public void setCrtName(String crtName) {
this.crtName = crtName;
}
/**
* @return crt_host
*/
public String getCrtHost() {
return crtHost;
}
/**
* @param crtHost
*/
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
/**
* @return attr1
*/
public String getAttr1() {
return attr1;
}
/**
* @param attr1
*/
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
/**
* @return attr2
*/
public String getAttr2() {
return attr2;
}
/**
* @param attr2
*/
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
/**
* @return attr3
*/
public String getAttr3() {
return attr3;
}
/**
* @param attr3
*/
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
/**
* @return attr4
*/
public String getAttr4() {
return attr4;
}
/**
* @param attr4
*/
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
/**
* @return attr5
*/
public String getAttr5() {
return attr5;
}
/**
* @param attr5
*/
public void setAttr5(String attr5) {
this.attr5 = attr5;
}
/**
* @return attr6
*/
public String getAttr6() {
return attr6;
}
/**
* @param attr6
*/
public void setAttr6(String attr6) {
this.attr6 = attr6;
}
/**
* @return attr7
*/
public String getAttr7() {
return attr7;
}
/**
* @param attr7
*/
public void setAttr7(String attr7) {
this.attr7 = attr7;
}
/**
* @return attr8
*/
public String getAttr8() {
return attr8;
}
/**
* @param attr8
*/
public void setAttr8(String attr8) {
this.attr8 = attr8;
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/entity/GateLog.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.Column;
import javax.persistence.Id;
import javax.persistence.Table;
import java.util.Date;
@Table(name = "gate_log")
public class GateLog {
@Id
private Integer id;
private String menu;
private String opt;
private String uri;
private String body;
@Column(name = "crt_time")
@JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
private Date crtTime;
@Column(name = "crt_user")
private String crtUser;
@Column(name = "crt_name")
private String crtName;
@Column(name = "crt_host")
private String crtHost;
/**
* @return id
*/
public Integer getId() {
return id;
}
/**
* @param id
*/
public void setId(Integer id) {
this.id = id;
}
/**
* @return menu
*/
public String getMenu() {
return menu;
}
/**
* @param menu
*/
public void setMenu(String menu) {
this.menu = menu;
}
/**
* @return uri
*/
public String getUri() {
return uri;
}
/**
* @param uri
*/
public void setUri(String uri) {
this.uri = uri;
}
/**
* @return crt_time
*/
public Date getCrtTime() {
return crtTime;
}
/**
* @param crtTime
*/
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
/**
* @return crt_user
*/
public String getCrtUser() {
return crtUser;
}
/**
* @param crtUser
*/
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
/**
* @return crt_name
*/
public String getCrtName() {
return crtName;
}
/**
* @param crtName
*/
public void setCrtName(String crtName) {
this.crtName = crtName;
}
/**
* @return crt_host
*/
public String getCrtHost() {
return crtHost;
}
/**
* @param crtHost
*/
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
public String getOpt() {
return opt;
}
public void setOpt(String opt) {
this.opt = opt;
}
public String getBody() {
return body;
}
public void setBody(String body) {
this.body = body;
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/entity/Group.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.entity;
import com.github.wxiaoqi.security.admin.constant.AdminCommonConstant;
import java.util.Date;
import javax.persistence.*;
@Table(name = "base_group")
public class Group {
@Id
private Integer id;
private String code;
private String name;
@Column(name = "parent_id")
private Integer parentId;
private String path;
private String type;
@Column(name = "group_type")
private Integer groupType = AdminCommonConstant.DEFAULT_GROUP_TYPE;
private String description;
@Column(name = "crt_time")
private Date crtTime;
@Column(name = "crt_user")
private String crtUser;
@Column(name = "crt_name")
private String crtName;
@Column(name = "crt_host")
private String crtHost;
@Column(name = "upd_time")
private Date updTime;
@Column(name = "upd_user")
private String updUser;
@Column(name = "upd_name")
private String updName;
@Column(name = "upd_host")
private String updHost;
private String attr1;
private String attr2;
private String attr3;
private String attr4;
private String attr5;
private String attr6;
private String attr7;
private String attr8;
/**
* @return id
*/
public Integer getId() {
return id;
}
/**
* @param id
*/
public void setId(Integer id) {
this.id = id;
}
/**
* @return code
*/
public String getCode() {
return code;
}
/**
* @param code
*/
public void setCode(String code) {
this.code = code;
}
/**
* @return name
*/
public String getName() {
return name;
}
/**
* @param name
*/
public void setName(String name) {
this.name = name;
}
/**
* @return parent_id
*/
public Integer getParentId() {
return parentId;
}
/**
* @param parentId
*/
public void setParentId(Integer parentId) {
this.parentId = parentId;
}
/**
* @return path
*/
public String getPath() {
return path;
}
/**
* @param path
*/
public void setPath(String path) {
this.path = path;
}
/**
* @return type
*/
public String getType() {
return type;
}
/**
* @param type
*/
public void setType(String type) {
this.type = type;
}
/**
* @return group_type
*/
public Integer getGroupType() {
return groupType;
}
/**
* @param groupType
*/
public void setGroupType(Integer groupType) {
this.groupType = groupType;
}
/**
* @return description
*/
public String getDescription() {
return description;
}
/**
* @param description
*/
public void setDescription(String description) {
this.description = description;
}
/**
* @return crt_time
*/
public Date getCrtTime() {
return crtTime;
}
/**
* @param crtTime
*/
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
/**
* @return crt_user
*/
public String getCrtUser() {
return crtUser;
}
/**
* @param crtUser
*/
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
/**
* @return crt_name
*/
public String getCrtName() {
return crtName;
}
/**
* @param crtName
*/
public void setCrtName(String crtName) {
this.crtName = crtName;
}
/**
* @return crt_host
*/
public String getCrtHost() {
return crtHost;
}
/**
* @param crtHost
*/
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
/**
* @return upd_time
*/
public Date getUpdTime() {
return updTime;
}
/**
* @param updTime
*/
public void setUpdTime(Date updTime) {
this.updTime = updTime;
}
/**
* @return upd_user
*/
public String getUpdUser() {
return updUser;
}
/**
* @param updUser
*/
public void setUpdUser(String updUser) {
this.updUser = updUser;
}
/**
* @return upd_name
*/
public String getUpdName() {
return updName;
}
/**
* @param updName
*/
public void setUpdName(String updName) {
this.updName = updName;
}
/**
* @return upd_host
*/
public String getUpdHost() {
return updHost;
}
/**
* @param updHost
*/
public void setUpdHost(String updHost) {
this.updHost = updHost;
}
/**
* @return attr1
*/
public String getAttr1() {
return attr1;
}
/**
* @param attr1
*/
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
/**
* @return attr2
*/
public String getAttr2() {
return attr2;
}
/**
* @param attr2
*/
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
/**
* @return attr3
*/
public String getAttr3() {
return attr3;
}
/**
* @param attr3
*/
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
/**
* @return attr4
*/
public String getAttr4() {
return attr4;
}
/**
* @param attr4
*/
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
/**
* @return attr5
*/
public String getAttr5() {
return attr5;
}
/**
* @param attr5
*/
public void setAttr5(String attr5) {
this.attr5 = attr5;
}
/**
* @return attr6
*/
public String getAttr6() {
return attr6;
}
/**
* @param attr6
*/
public void setAttr6(String attr6) {
this.attr6 = attr6;
}
/**
* @return attr7
*/
public String getAttr7() {
return attr7;
}
/**
* @param attr7
*/
public void setAttr7(String attr7) {
this.attr7 = attr7;
}
/**
* @return attr8
*/
public String getAttr8() {
return attr8;
}
/**
* @param attr8
*/
public void setAttr8(String attr8) {
this.attr8 = attr8;
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/entity/GroupType.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.entity;
import java.util.Date;
import javax.persistence.*;
@Table(name = "base_group_type")
public class GroupType {
@Id
private Integer id;
private String code;
private String name;
private String description;
@Column(name = "crt_time")
private Date crtTime;
@Column(name = "crt_user")
private String crtUser;
@Column(name = "crt_name")
private String crtName;
@Column(name = "crt_host")
private String crtHost;
@Column(name = "upd_time")
private Date updTime;
@Column(name = "upd_user")
private String updUser;
@Column(name = "upd_name")
private String updName;
@Column(name = "upd_host")
private String updHost;
private String attr1;
private String attr2;
private String attr3;
private String attr4;
private String attr5;
private String attr6;
private String attr7;
private String attr8;
/**
* @return id
*/
public Integer getId() {
return id;
}
/**
* @param id
*/
public void setId(Integer id) {
this.id = id;
}
/**
* @return code
*/
public String getCode() {
return code;
}
/**
* @param code
*/
public void setCode(String code) {
this.code = code;
}
/**
* @return name
*/
public String getName() {
return name;
}
/**
* @param name
*/
public void setName(String name) {
this.name = name;
}
/**
* @return description
*/
public String getDescription() {
return description;
}
/**
* @param description
*/
public void setDescription(String description) {
this.description = description;
}
/**
* @return crt_time
*/
public Date getCrtTime() {
return crtTime;
}
/**
* @param crtTime
*/
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
/**
* @return crt_user
*/
public String getCrtUser() {
return crtUser;
}
/**
* @param crtUser
*/
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
/**
* @return crt_name
*/
public String getCrtName() {
return crtName;
}
/**
* @param crtName
*/
public void setCrtName(String crtName) {
this.crtName = crtName;
}
/**
* @return crt_host
*/
public String getCrtHost() {
return crtHost;
}
/**
* @param crtHost
*/
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
/**
* @return upd_time
*/
public Date getUpdTime() {
return updTime;
}
/**
* @param updTime
*/
public void setUpdTime(Date updTime) {
this.updTime = updTime;
}
/**
* @return upd_user
*/
public String getUpdUser() {
return updUser;
}
/**
* @param updUser
*/
public void setUpdUser(String updUser) {
this.updUser = updUser;
}
/**
* @return upd_name
*/
public String getUpdName() {
return updName;
}
/**
* @param updName
*/
public void setUpdName(String updName) {
this.updName = updName;
}
/**
* @return upd_host
*/
public String getUpdHost() {
return updHost;
}
/**
* @param updHost
*/
public void setUpdHost(String updHost) {
this.updHost = updHost;
}
/**
* @return attr1
*/
public String getAttr1() {
return attr1;
}
/**
* @param attr1
*/
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
/**
* @return attr2
*/
public String getAttr2() {
return attr2;
}
/**
* @param attr2
*/
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
/**
* @return attr3
*/
public String getAttr3() {
return attr3;
}
/**
* @param attr3
*/
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
/**
* @return attr4
*/
public String getAttr4() {
return attr4;
}
/**
* @param attr4
*/
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
/**
* @return attr5
*/
public String getAttr5() {
return attr5;
}
/**
* @param attr5
*/
public void setAttr5(String attr5) {
this.attr5 = attr5;
}
/**
* @return attr6
*/
public String getAttr6() {
return attr6;
}
/**
* @param attr6
*/
public void setAttr6(String attr6) {
this.attr6 = attr6;
}
/**
* @return attr7
*/
public String getAttr7() {
return attr7;
}
/**
* @param attr7
*/
public void setAttr7(String attr7) {
this.attr7 = attr7;
}
/**
* @return attr8
*/
public String getAttr8() {
return attr8;
}
/**
* @param attr8
*/
public void setAttr8(String attr8) {
this.attr8 = attr8;
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/entity/Menu.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.entity;
import com.github.wxiaoqi.security.admin.constant.AdminCommonConstant;
import java.util.Date;
import javax.persistence.*;
@Table(name = "base_menu")
public class Menu {
@Id
private Integer id;
private String code;
private String title;
@Column(name = "parent_id")
private Integer parentId = AdminCommonConstant.ROOT;
private String href;
private String icon;
private String type;
private String description;
@Column(name = "crt_time")
private Date crtTime;
@Column(name = "crt_user")
private String crtUser;
@Column(name = "crt_name")
private String crtName;
@Column(name = "crt_host")
private String crtHost;
@Column(name = "upd_time")
private Date updTime;
@Column(name = "upd_user")
private String updUser;
@Column(name = "upd_name")
private String updName;
@Column(name = "upd_host")
private String updHost;
private String attr1;
private String attr2;
private String attr3;
private String attr4;
private String attr5;
private String attr6;
private String attr7;
private String attr8;
private String path;
/**
* @return id
*/
public Integer getId() {
return id;
}
/**
* @param id
*/
public void setId(Integer id) {
this.id = id;
}
/**
* @return code
*/
public String getCode() {
return code;
}
/**
* @param code
*/
public void setCode(String code) {
this.code = code;
}
/**
* @return title
*/
public String getTitle() {
return title;
}
/**
* @param title
*/
public void setTitle(String title) {
this.title = title;
}
/**
* @return parent_id
*/
public Integer getParentId() {
return parentId;
}
/**
* @param parentId
*/
public void setParentId(Integer parentId) {
this.parentId = parentId;
}
/**
* @return href
*/
public String getHref() {
return href;
}
/**
* @param href
*/
public void setHref(String href) {
this.href = href;
}
/**
* @return icon
*/
public String getIcon() {
return icon;
}
/**
* @param icon
*/
public void setIcon(String icon) {
this.icon = icon;
}
/**
* @return type
*/
public String getType() {
return type;
}
/**
* @param type
*/
public void setType(String type) {
this.type = type;
}
/**
* @return description
*/
public String getDescription() {
return description;
}
/**
* @param description
*/
public void setDescription(String description) {
this.description = description;
}
/**
* @return crt_time
*/
public Date getCrtTime() {
return crtTime;
}
/**
* @param crtTime
*/
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
/**
* @return crt_user
*/
public String getCrtUser() {
return crtUser;
}
/**
* @param crtUser
*/
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
/**
* @return crt_name
*/
public String getCrtName() {
return crtName;
}
/**
* @param crtName
*/
public void setCrtName(String crtName) {
this.crtName = crtName;
}
/**
* @return crt_host
*/
public String getCrtHost() {
return crtHost;
}
/**
* @param crtHost
*/
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
/**
* @return upd_time
*/
public Date getUpdTime() {
return updTime;
}
/**
* @param updTime
*/
public void setUpdTime(Date updTime) {
this.updTime = updTime;
}
/**
* @return upd_user
*/
public String getUpdUser() {
return updUser;
}
/**
* @param updUser
*/
public void setUpdUser(String updUser) {
this.updUser = updUser;
}
/**
* @return upd_name
*/
public String getUpdName() {
return updName;
}
/**
* @param updName
*/
public void setUpdName(String updName) {
this.updName = updName;
}
/**
* @return upd_host
*/
public String getUpdHost() {
return updHost;
}
/**
* @param updHost
*/
public void setUpdHost(String updHost) {
this.updHost = updHost;
}
/**
* @return attr1
*/
public String getAttr1() {
return attr1;
}
/**
* @param attr1
*/
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
/**
* @return attr2
*/
public String getAttr2() {
return attr2;
}
/**
* @param attr2
*/
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
/**
* @return attr3
*/
public String getAttr3() {
return attr3;
}
/**
* @param attr3
*/
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
/**
* @return attr4
*/
public String getAttr4() {
return attr4;
}
/**
* @param attr4
*/
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
/**
* @return attr5
*/
public String getAttr5() {
return attr5;
}
/**
* @param attr5
*/
public void setAttr5(String attr5) {
this.attr5 = attr5;
}
/**
* @return attr6
*/
public String getAttr6() {
return attr6;
}
/**
* @param attr6
*/
public void setAttr6(String attr6) {
this.attr6 = attr6;
}
/**
* @return attr7
*/
public String getAttr7() {
return attr7;
}
/**
* @param attr7
*/
public void setAttr7(String attr7) {
this.attr7 = attr7;
}
/**
* @return attr8
*/
public String getAttr8() {
return attr8;
}
/**
* @param attr8
*/
public void setAttr8(String attr8) {
this.attr8 = attr8;
}
/**
* @return path
*/
public String getPath() {
return path;
}
/**
* @param path
*/
public void setPath(String path) {
this.path = path;
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/entity/ResourceAuthority.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.entity;
import java.util.Date;
import javax.persistence.*;
@Table(name = "base_resource_authority")
public class ResourceAuthority {
@Id
private Integer id;
@Column(name = "authority_id")
private String authorityId;
@Column(name = "authority_type")
private String authorityType;
@Column(name = "resource_id")
private String resourceId;
@Column(name = "resource_type")
private String resourceType;
@Column(name = "parent_id")
private String parentId;
private String path;
private String description;
@Column(name = "crt_time")
private Date crtTime;
@Column(name = "crt_user")
private String crtUser;
@Column(name = "crt_name")
private String crtName;
@Column(name = "crt_host")
private String crtHost;
private String attr1;
private String attr2;
private String attr3;
private String attr4;
private String attr5;
private String attr6;
private String attr7;
private String attr8;
public ResourceAuthority(String authorityType, String resourceType) {
this.authorityType = authorityType;
this.resourceType = resourceType;
}
public ResourceAuthority() {
}
/**
* @return id
*/
public Integer getId() {
return id;
}
/**
* @param id
*/
public void setId(Integer id) {
this.id = id;
}
/**
* @return authority_id
*/
public String getAuthorityId() {
return authorityId;
}
/**
* @param authorityId
*/
public void setAuthorityId(String authorityId) {
this.authorityId = authorityId;
}
/**
* @return authority_type
*/
public String getAuthorityType() {
return authorityType;
}
/**
* @param authorityType
*/
public void setAuthorityType(String authorityType) {
this.authorityType = authorityType;
}
/**
* @return resource_id
*/
public String getResourceId() {
return resourceId;
}
/**
* @param resourceId
*/
public void setResourceId(String resourceId) {
this.resourceId = resourceId;
}
/**
* @return resource_type
*/
public String getResourceType() {
return resourceType;
}
/**
* @param resourceType
*/
public void setResourceType(String resourceType) {
this.resourceType = resourceType;
}
/**
* @return parent_id
*/
public String getParentId() {
return parentId;
}
/**
* @param parentId
*/
public void setParentId(String parentId) {
this.parentId = parentId;
}
/**
* @return path
*/
public String getPath() {
return path;
}
/**
* @param path
*/
public void setPath(String path) {
this.path = path;
}
/**
* @return description
*/
public String getDescription() {
return description;
}
/**
* @param description
*/
public void setDescription(String description) {
this.description = description;
}
/**
* @return crt_time
*/
public Date getCrtTime() {
return crtTime;
}
/**
* @param crtTime
*/
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
/**
* @return crt_user
*/
public String getCrtUser() {
return crtUser;
}
/**
* @param crtUser
*/
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
/**
* @return crt_name
*/
public String getCrtName() {
return crtName;
}
/**
* @param crtName
*/
public void setCrtName(String crtName) {
this.crtName = crtName;
}
/**
* @return crt_host
*/
public String getCrtHost() {
return crtHost;
}
/**
* @param crtHost
*/
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
/**
* @return attr1
*/
public String getAttr1() {
return attr1;
}
/**
* @param attr1
*/
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
/**
* @return attr2
*/
public String getAttr2() {
return attr2;
}
/**
* @param attr2
*/
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
/**
* @return attr3
*/
public String getAttr3() {
return attr3;
}
/**
* @param attr3
*/
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
/**
* @return attr4
*/
public String getAttr4() {
return attr4;
}
/**
* @param attr4
*/
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
/**
* @return attr5
*/
public String getAttr5() {
return attr5;
}
/**
* @param attr5
*/
public void setAttr5(String attr5) {
this.attr5 = attr5;
}
/**
* @return attr6
*/
public String getAttr6() {
return attr6;
}
/**
* @param attr6
*/
public void setAttr6(String attr6) {
this.attr6 = attr6;
}
/**
* @return attr7
*/
public String getAttr7() {
return attr7;
}
/**
* @param attr7
*/
public void setAttr7(String attr7) {
this.attr7 = attr7;
}
/**
* @return attr8
*/
public String getAttr8() {
return attr8;
}
/**
* @param attr8
*/
public void setAttr8(String attr8) {
this.attr8 = attr8;
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/entity/User.java deleted 100644 → 0
View file @ bbd34e9e
package com.github.wxiaoqi.security.admin.entity;
import java.util.Date;
import javax.persistence.*;
@Table(name = "base_user")
public class User {
@Id
@GeneratedValue(generator = "JDBC")//此处加上注解
private Integer id;
private String username;
private String password;
private String name;
private String birthday;
private String address;
@Column(name = "mobile_phone")
private String mobilePhone;
@Column(name = "tel_phone")
private String telPhone;
private String email;
private String sex;
private String type;
@Column(name = "status")
private Integer status;
@Column(name = "zone_id")
private Integer zoneId;
@Column(name = "company_id")
private Integer companyId;
private String description;
@Column(name = "crt_time")
private Date crtTime;
@Column(name = "crt_user")
private String crtUser;
@Column(name = "crt_name")
private String crtName;
@Column(name = "crt_host")
private String crtHost;
@Column(name = "upd_time")
private Date updTime;
@Column(name = "upd_user")
private String updUser;
@Column(name = "upd_name")
private String updName;
@Column(name = "upd_host")
private String updHost;
@Column(name = "data_all")
private Integer dataAll;
@Column(name = "data_zone")
private String dataZone;
@Column(name = "data_company")
private String dataCompany;
private String attr1;
private String attr2;
private String attr3;
private String attr4;
private String attr5;
private String attr6;
private String attr7;
private String attr8;
/**
* @return id
*/
public Integer getId() {
return id;
}
/**
* @param id
*/
public void setId(Integer id) {
this.id = id;
}
/**
* @return username
*/
public String getUsername() {
return username;
}
/**
* @param username
*/
public void setUsername(String username) {
this.username = username;
}
/**
* @return password
*/
public String getPassword() {
return password;
}
/**
* @param password
*/
public void setPassword(String password) {
this.password = password;
}
/**
* @return name
*/
public String getName() {
return name;
}
/**
* @param name
*/
public void setName(String name) {
this.name = name;
}
/**
* @return birthday
*/
public String getBirthday() {
return birthday;
}
/**
* @param birthday
*/
public void setBirthday(String birthday) {
this.birthday = birthday;
}
/**
* @return address
*/
public String getAddress() {
return address;
}
/**
* @param address
*/
public void setAddress(String address) {
this.address = address;
}
/**
* @return mobile_phone
*/
public String getMobilePhone() {
return mobilePhone;
}
/**
* @param mobilePhone
*/
public void setMobilePhone(String mobilePhone) {
this.mobilePhone = mobilePhone;
}
/**
* @return tel_phone
*/
public String getTelPhone() {
return telPhone;
}
/**
* @param telPhone
*/
public void setTelPhone(String telPhone) {
this.telPhone = telPhone;
}
/**
* @return email
*/
public String getEmail() {
return email;
}
/**
* @param email
*/
public void setEmail(String email) {
this.email = email;
}
/**
* @return sex
*/
public String getSex() {
return sex;
}
/**
* @param sex
*/
public void setSex(String sex) {
this.sex = sex;
}
/**
* @return type
*/
public String getType() {
return type;
}
/**
* @param type
*/
public void setType(String type) {
this.type = type;
}
public Integer getStatus() {
return status;
}
public void setStatus(Integer status) {
this.status = status;
}
public Integer getZoneId() {
return zoneId;
}
public void setZoneId(Integer zoneId) {
this.zoneId = zoneId;
}
public Integer getCompanyId() {
return companyId;
}
public void setCompanyId(Integer companyId) {
this.companyId = companyId;
}
/**
* @return description
*/
public String getDescription() {
return description;
}
/**
* @param description
*/
public void setDescription(String description) {
this.description = description;
}
/**
* @return crt_time
*/
public Date getCrtTime() {
return crtTime;
}
/**
* @param crtTime
*/
public void setCrtTime(Date crtTime) {
this.crtTime = crtTime;
}
/**
* @return crt_user
*/
public String getCrtUser() {
return crtUser;
}
/**
* @param crtUser
*/
public void setCrtUser(String crtUser) {
this.crtUser = crtUser;
}
/**
* @return crt_name
*/
public String getCrtName() {
return crtName;
}
/**
* @param crtName
*/
public void setCrtName(String crtName) {
this.crtName = crtName;
}
/**
* @return crt_host
*/
public String getCrtHost() {
return crtHost;
}
/**
* @param crtHost
*/
public void setCrtHost(String crtHost) {
this.crtHost = crtHost;
}
/**
* @return upd_time
*/
public Date getUpdTime() {
return updTime;
}
/**
* @param updTime
*/
public void setUpdTime(Date updTime) {
this.updTime = updTime;
}
/**
* @return upd_user
*/
public String getUpdUser() {
return updUser;
}
/**
* @param updUser
*/
public void setUpdUser(String updUser) {
this.updUser = updUser;
}
/**
* @return upd_name
*/
public String getUpdName() {
return updName;
}
/**
* @param updName
*/
public void setUpdName(String updName) {
this.updName = updName;
}
/**
* @return upd_host
*/
public String getUpdHost() {
return updHost;
}
/**
* @param updHost
*/
public void setUpdHost(String updHost) {
this.updHost = updHost;
}
public Integer getDataAll() {
return dataAll;
}
public void setDataAll(Integer dataAll) {
this.dataAll = dataAll;
}
public String getDataZone() {
return dataZone;
}
public void setDataZone(String dataZone) {
this.dataZone = dataZone;
}
public String getDataCompany() {
return dataCompany;
}
public void setDataCompany(String dataCompany) {
this.dataCompany = dataCompany;
}
/**
* @return attr1
*/
public String getAttr1() {
return attr1;
}
/**
* @param attr1
*/
public void setAttr1(String attr1) {
this.attr1 = attr1;
}
/**
* @return attr2
*/
public String getAttr2() {
return attr2;
}
/**
* @param attr2
*/
public void setAttr2(String attr2) {
this.attr2 = attr2;
}
/**
* @return attr3
*/
public String getAttr3() {
return attr3;
}
/**
* @param attr3
*/
public void setAttr3(String attr3) {
this.attr3 = attr3;
}
/**
* @return attr4
*/
public String getAttr4() {
return attr4;
}
/**
* @param attr4
*/
public void setAttr4(String attr4) {
this.attr4 = attr4;
}
/**
* @return attr5
*/
public String getAttr5() {
return attr5;
}
/**
* @param attr5
*/
public void setAttr5(String attr5) {
this.attr5 = attr5;
}
/**
* @return attr6
*/
public String getAttr6() {
return attr6;
}
/**
* @param attr6
*/
public void setAttr6(String attr6) {
this.attr6 = attr6;
}
/**
* @return attr7
*/
public String getAttr7() {
return attr7;
}
/**
* @param attr7
*/
public void setAttr7(String attr7) {
this.attr7 = attr7;
}
/**
* @return attr8
*/
public String getAttr8() {
return attr8;
}
/**
* @param attr8
*/
public void setAttr8(String attr8) {
this.attr8 = attr8;
}
}
\ No newline at end of file
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BaseUserMemberLevelMapper.java 0 → 100644
View file @ d654519e
package com.github.wxiaoqi.security.admin.mapper;
import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
import tk.mybatis.mapper.common.Mapper;
/**
* 会员等级表
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-06-11 11:06:45
*/
public interface BaseUserMemberLevelMapper extends Mapper<BaseUserMemberLevel> {
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MemberController.java 0 → 100644
View file @ d654519e
package com.github.wxiaoqi.security.admin.rest;
import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
import com.github.wxiaoqi.security.admin.biz.UserBiz;
import com.github.wxiaoqi.security.admin.biz.UserMemberBiz;
import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
import com.github.wxiaoqi.security.admin.entity.User;
import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* ${DESCRIPTION}
*
* @author wanghaobin
* @create 2017-06-08 11:51
*/
@RestController
@RequestMapping("member")
public class MemberController {
@Autowired
private UserMemberBiz memberBiz;
@RequestMapping(value = "/levels", method = RequestMethod.GET)
public @ResponseBody
List<BaseUserMemberLevel> levels(String token) throws Exception {
return memberBiz.getLevesls();
}
}
ace-modules/ace-generator/src/main/resources/application.yml
View file @ d654519e
...@@ -10,7 +10,7 @@ spring: ...@@ -10,7 +10,7 @@ spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.jdbc.Driver driverClassName: com.mysql.jdbc.Driver
url: jdbc:mysql://10.5.52.3:3306/xxfc_order?useUnicode=true&characterEncoding=UTF-8 url: jdbc:mysql://10.5.52.3:3306/ag_admin_v1?useUnicode=true&characterEncoding=UTF-8
username: root username: root
password: sslcloud123*() password: sslcloud123*()
jackson: jackson:
......
ace-modules/ace-generator/src/main/resources/generator.properties
View file @ d654519e
#代码生成器，配置信息 #代码生成器，配置信息
#包名 #包名
package=com.xxfc.platform.order package=package com.github.wxiaoqi.security.admin
#作者 #作者
author=zjw author=zjw
#Email #Email
......
ace-modules/ace-generator/src/main/resources/template/entity.java.vm
View file @ d654519e
...@@ -24,13 +24,17 @@ public class ${className} implements Serializable { ...@@ -24,13 +24,17 @@ public class ${className} implements Serializable {
#foreach ($column in $columns) #foreach ($column in $columns)
#if($column.columnName == $pk.columnName) #if($column.columnName == $pk.columnName)
//$column.comments /**
* $column.comments
*/
@Id @Id
@GeneratedValue(generator = "JDBC") @GeneratedValue(generator = "JDBC")
@ApiModelProperty("$column.comments") @ApiModelProperty("$column.comments")
private $column.attrType $column.attrname; private $column.attrType $column.attrname;
#else #else
//$column.comments /**
* $column.comments
*/
@Column(name = "$column.columnName") @Column(name = "$column.columnName")
@ApiModelProperty(value = "$column.comments"#if($column.columnName == "crt_time"||$column.columnName == "upd_time"), hidden = true #end) @ApiModelProperty(value = "$column.comments"#if($column.columnName == "crt_time"||$column.columnName == "upd_time"), hidden = true #end)
private $column.attrType $column.attrname; private $column.attrType $column.attrname;
......
xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/Cofig.java
View file @ d654519e
package com.xxfc.platform.app.entity; package com.xxfc.platform.app.entity;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import javax.persistence.*; import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -15,40 +14,55 @@ import lombok.Data; ...@@ -15,40 +14,55 @@ import lombok.Data;
* @date 2019-06-03 15:57:13 * @date 2019-06-03 15:57:13
*/ */
@Data @Data
@Table(name = "cofig") @Table(name = "config")
public class Cofig implements Serializable { public class Cofig implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
//主键id /**
* 主键id
*/
@Id @Id
@GeneratedValue(generator = "JDBC") @GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键id") @ApiModelProperty("主键id")
private Integer id; private Integer id;
//1-租车须知；2-预定须知 /**
* 1-租车须知；2-预定须知
*/
@Column(name = "type") @Column(name = "type")
@ApiModelProperty(value = "1-租车须知；2-预定须知") @ApiModelProperty(value = "1-租车须知；2-预定须知;3-旅游")
private Integer type; private Integer type;
// /**
*
*/
@Column(name = "value") @Column(name = "value")
@ApiModelProperty(value = "") @ApiModelProperty(value = "")
private String value; private String value;
//创建时间 /**
* 创建时间
*/
@Column(name = "crt_time") @Column(name = "crt_time")
@ApiModelProperty(value = "创建时间", hidden = true ) @ApiModelProperty(value = "创建时间", hidden = true )
private Long crtTime; private Long crtTime;
//更新时间 /**
* 更新时间
*/
@Column(name = "upd_time") @Column(name = "upd_time")
@ApiModelProperty(value = "更新时间", hidden = true ) @ApiModelProperty(value = "更新时间", hidden = true )
private Long updTime; private Long updTime;
//是否删除；0-1正常；1-删除 /**
* 是否删除；0-1正常；1-删除
*/
@Column(name = "is_del") @Column(name = "is_del")
@ApiModelProperty(value = "是否删除；0-1正常；1-删除") @ApiModelProperty(value = "是否删除；0-1正常；1-删除")
private Integer isDel; private Integer isDel;
@Column(name = "title")
@ApiModelProperty(value = "标题")
private String title;
} }
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/CofigBiz.java
View file @ d654519e
...@@ -22,5 +22,4 @@ public class CofigBiz extends BaseBiz<CofigMapper,Cofig> { ...@@ -22,5 +22,4 @@ public class CofigBiz extends BaseBiz<CofigMapper,Cofig> {
return mapper.getAllByType(list); return mapper.getAllByType(list);
} }
} }
\ No newline at end of file
xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/admin/CofigAdminController.java 0 → 100644
View file @ d654519e
package com.xxfc.platform.app.rest.admin;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.xxfc.platform.app.biz.CofigBiz;
import com.xxfc.platform.app.entity.Cofig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author libin
* @version 1.0
* @description 后台*通用配置
* @data 2019/6/12 9:56
*/
@RestController
@RequestMapping("/admin/config")
@Slf4j
public class CofigAdminController extends BaseController<CofigBiz,Cofig> {
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderTourController.java
View file @ d654519e
...@@ -84,10 +84,11 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz,Order ...@@ -84,10 +84,11 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz,Order
@ApiModelProperty(value = "具体商品（商品项）id") @ApiModelProperty(value = "具体商品（商品项）id")
private String spePriceId; private String spePriceId;
//自己乘客ids @ApiModelProperty(value = "成人个数")
@ApiModelProperty(value = "自己乘客ids") Integer number;
private String tourUserIds;
@ApiModelProperty(value = "儿童个数")
Integer childNumber;
} }
} }
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java
View file @ d654519e
...@@ -131,6 +131,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To ...@@ -131,6 +131,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
BigDecimal tourAmount = BigDecimal.ZERO; BigDecimal tourAmount = BigDecimal.ZERO;
BigDecimal realAmount = BigDecimal.ZERO; BigDecimal realAmount = BigDecimal.ZERO;
if(StrUtil.isNotBlank(detail.getTourUserIds())) {
List<TourUser> users = new ArrayList<TourUser>(); List<TourUser> users = new ArrayList<TourUser>();
if(StrUtil.isNotBlank(detail.getTourUserIds())) { if(StrUtil.isNotBlank(detail.getTourUserIds())) {
users = tourFeign.getTourUsers(detail.getTourUserIds()).getData(); users = tourFeign.getTourUsers(detail.getTourUserIds()).getData();
...@@ -147,6 +148,10 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To ...@@ -147,6 +148,10 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
detail.setNumber(childs.size()); detail.setNumber(childs.size());
detail.setChildNumber(notChilds.size()); detail.setChildNumber(notChilds.size());
detail.setTotalNumber(users.size()); detail.setTotalNumber(users.size());
}else{
detail.setTotalNumber(detail.getNumber() + detail.getChildNumber());
}
//计算旅游价格 //计算旅游价格
ObjectRestResponse<TourSpePriceVo> objectRestResponse = tourFeign.refund(new TourSpePriceDTO(){{ ObjectRestResponse<TourSpePriceVo> objectRestResponse = tourFeign.refund(new TourSpePriceDTO(){{
......
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/GoodBannerDTO.java 0 → 100644
View file @ d654519e
package com.xxfc.platform.tour.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 商品轮播图
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-06-06 11:41:51
*/
@Data
public class GoodBannerDTO {
//首页banner图主键
@ApiModelProperty("首页banner图主键")
private Integer id;
//标题
@ApiModelProperty(value = "标题")
private String title;
//封面
@ApiModelProperty(value = "封面")
private String cover;
//跳转链接
@ApiModelProperty(value = "跳转链接")
private String url;
}
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/GoodSearchDTO.java 0 → 100644
View file @ d654519e
package com.xxfc.platform.tour.dto;
import com.github.wxiaoqi.security.common.vo.PageParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 旅游商品
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-06-06 11:41:51
*/
@Data
public class GoodSearchDTO extends PageParam {
//商品名
@ApiModelProperty(value = "商品名")
private String name;
//商品名
@ApiModelProperty(value = "标签id")
private String tagId;
}
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/GoodSiteDTO.java 0 → 100644
View file @ d654519e
package com.xxfc.platform.tour.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 路线站点
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-06-06 11:41:51
*/
@Data
public class GoodSiteDTO {
private Integer id;
//路线id
@ApiModelProperty(value = "路线id")
private Integer goodId;
//站点名称
@ApiModelProperty(value = "站点名称")
private String name;
//站点地址
@ApiModelProperty(value = "站点地址")
private String address;
//分公司id
@ApiModelProperty(value = "分公司id")
private String companyId;
/**
* 地址-省/直辖市(编码)
*/
@ApiModelProperty("地址-省/直辖市(编码)")
private Integer province;
/**
* 地址-省/直辖市(名称)
*/
@ApiModelProperty("地址-省/直辖市(名称)")
private Integer provinceName;
/**
* 地址-市(编码)
*/
@ApiModelProperty("地址-市(编码)")
private Integer city;
/**
* 地址-市(名称)
*/
@ApiModelProperty("地址-市(名称)")
private Integer cityName;
//出发时间
@ApiModelProperty(value = "出发时间")
private Long departTime;
//站点经度
@ApiModelProperty(value = "站点经度")
private Double longitude;
//站点纬度
@ApiModelProperty(value = "站点纬度")
private Double latitude;
//类型：0起点，1-途径点；2-终点
@ApiModelProperty(value = "类型：0起点，1-途径点；2-终点")
private Integer type;
//排序
@ApiModelProperty(value = "排序")
private Integer rank;
//状态 0正常 1关闭
@ApiModelProperty(value = "状态 0正常 1关闭")
private Integer status;
//站点介绍
@ApiModelProperty(value = "站点介绍")
private String intro;
}
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/GoodSpePriceDTO.java 0 → 100644
View file @ d654519e
package com.xxfc.platform.tour.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* 商品规格
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-06-06 11:41:51
*/
@Data
public class GoodSpePriceDTO {
private Integer id;
//出行时间
@ApiModelProperty(value = "出行时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
//结束时间
@ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
//规格id
@ApiModelProperty(value = "规格id")
private String speId;
//价格
@ApiModelProperty(value = "价格")
private BigDecimal price;
//儿童价格
@ApiModelProperty(value = "儿童价格")
private BigDecimal childPrice;
//会员价格
@ApiModelProperty(value = "会员价格")
private String memberPrice;
//库存
@ApiModelProperty(value = "库存")
private Integer stock;
}
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/GoodTagDTO.java 0 → 100644
View file @ d654519e
package com.xxfc.platform.tour.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 商品标签
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-06-06 11:41:51
*/
@Data
public class GoodTagDTO {
//
@ApiModelProperty("")
private Integer id;
//标签id
@ApiModelProperty(value = "标签id")
private Integer tagId;
}
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/TourGoodDTO.java 0 → 100644
View file @ d654519e
package com.xxfc.platform.tour.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
/**
* 旅游商品
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-06-06 11:41:51
*/
@Data
public class TourGoodDTO {
@ApiModelProperty("")
private Integer id;
//商品名
@ApiModelProperty(value = "商品名")
private String name;
//商品封面图
@ApiModelProperty(value = "商品封面图")
private String cover;
//商品原价
@ApiModelProperty(value = "商品原价")
private BigDecimal price;
//儿童价格
@ApiModelProperty(value = "儿童价格")
private BigDecimal childPrice;
//商品浏览量
@ApiModelProperty(value = "商品浏览量")
private Integer viewCount;
//商品销售量
@ApiModelProperty(value = "商品销售量")
private Integer saleCount;
//天数
@ApiModelProperty(value = "天数")
private Integer number;
//商品描述
@ApiModelProperty(value = "商品描述")
private String describe;
//商品详情(行程亮点)
@ApiModelProperty(value = "商品详情(行程亮点)")
private String content;
//行程介绍
@ApiModelProperty(value = "行程介绍")
private String introduce;
//费用说明
@ApiModelProperty(value = "费用说明")
private String explain;
//排序
@ApiModelProperty(value = "排序")
private Integer rank;
//状态:0-未发布;1-上架；2-下架
@ApiModelProperty(value = "状态:0-未发布;1-上架；2-下架")
private Integer status;
//是否推荐:0-未推荐；1-已推荐
@ApiModelProperty(value = "是否推荐:0-未推荐；1-已推荐")
private Integer recommend;
//是否会员价:0-否；1-是
@ApiModelProperty(value = "是否会员价:0-否；1-是")
private Integer isMember;
//库存
@ApiModelProperty(value = "库存")
private Integer stock;
//单位
@ApiModelProperty(value = "单位")
private String unit;
//商品轮播
@ApiModelProperty(value = "商品轮播")
List<GoodBannerDTO> bannerDTOS;
//出发,途径,终点
@ApiModelProperty(value = "出发,途径,终点")
List<GoodSiteDTO> siteDTOS;
//商品规格
@ApiModelProperty(value = "商品规格")
List<GoodSpePriceDTO> priceDTOS;
//商品标签
@ApiModelProperty(value = "商品标签")
List<GoodTagDTO> tagDTOS;
}
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGood.java
View file @ d654519e
...@@ -56,8 +56,13 @@ public class TourGood implements Serializable { ...@@ -56,8 +56,13 @@ public class TourGood implements Serializable {
@ApiModelProperty(value = "商品销售量") @ApiModelProperty(value = "商品销售量")
private Integer saleCount; private Integer saleCount;
//天数
@Column(name = "number")
@ApiModelProperty(value = "天数")
private Integer number;
//商品描述 //商品描述
@Column(name = "describe") @Column(name = "describes")
@ApiModelProperty(value = "商品描述") @ApiModelProperty(value = "商品描述")
private String describe; private String describe;
...@@ -72,7 +77,7 @@ public class TourGood implements Serializable { ...@@ -72,7 +77,7 @@ public class TourGood implements Serializable {
private String introduce; private String introduce;
//费用说明 //费用说明
@Column(name = "explain") @Column(name = "explains")
@ApiModelProperty(value = "费用说明") @ApiModelProperty(value = "费用说明")
private String explain; private String explain;
......
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGoodSite.java
View file @ d654519e
...@@ -45,6 +45,35 @@ public class TourGoodSite implements Serializable { ...@@ -45,6 +45,35 @@ public class TourGoodSite implements Serializable {
@ApiModelProperty(value = "分公司id") @ApiModelProperty(value = "分公司id")
private String companyId; private String companyId;
/**
* 地址-省/直辖市(编码)
*/
@Column(name = "province")
@ApiModelProperty("地址-省/直辖市(编码)")
private Integer province;
/**
* 地址-省/直辖市(名称)
*/
@Column(name = "province_name")
@ApiModelProperty("地址-省/直辖市(名称)")
private Integer provinceName;
/**
* 地址-市(编码)
*/
@Column(name = "city")
@ApiModelProperty("地址-市(编码)")
private Integer city;
/**
* 地址-市(名称)
*/
@Column(name = "city_name")
@ApiModelProperty("地址-市(名称)")
private Integer cityName;
//出发时间 //出发时间
@Column(name = "depart_time") @Column(name = "depart_time")
...@@ -77,9 +106,9 @@ public class TourGoodSite implements Serializable { ...@@ -77,9 +106,9 @@ public class TourGoodSite implements Serializable {
private Integer status; private Integer status;
//创建时间 //创建时间
@Column(name = "ctr_time") @Column(name = "crt_time")
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Long ctrTime; private Long crtTime;
//更新时间 //更新时间
@Column(name = "upd_time") @Column(name = "upd_time")
......
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourTag.java
View file @ d654519e
package com.xxfc.platform.tour.entity; package com.xxfc.platform.tour.entity;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import javax.persistence.*; import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
/** /**
...@@ -16,61 +18,88 @@ import lombok.Data; ...@@ -16,61 +18,88 @@ import lombok.Data;
*/ */
@Data @Data
@Table(name = "tour_tag") @Table(name = "tour_tag")
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TourTag implements Serializable { public class TourTag implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
//主键id /**
* 主键id
*/
@Id @Id
@GeneratedValue(generator = "JDBC") @GeneratedValue(generator = "JDBC")
@ApiModelProperty("主键id") @ApiModelProperty("主键id")
private Integer id; private Integer id;
//名称 /**
* 名称
*/
@Column(name = "name") @Column(name = "name")
@ApiModelProperty(value = "名称") @ApiModelProperty(value = "名称")
private String name; private String name;
//图片 /**
* 图片
*/
@Column(name = "img") @Column(name = "img")
@ApiModelProperty(value = "图片") @ApiModelProperty(value = "图片")
private String img; private String img;
//描述 /**
* 描述
*/
@Column(name = "describe") @Column(name = "describe")
@ApiModelProperty(value = "描述") @ApiModelProperty(value = "描述")
private String describe; private String describe;
//链接 /**
* 链接
*/
@Column(name = "link") @Column(name = "link")
@ApiModelProperty(value = "链接") @ApiModelProperty(value = "链接")
private String link; private String link;
//是否热门：0-否；1-是 /**
* 是否热门：0-否；1-是
*/
@Column(name = "is_hot") @Column(name = "is_hot")
@ApiModelProperty(value = "是否热门：0-否；1-是") @ApiModelProperty(value = "是否热门：0-否；1-是")
private Integer isHot; private Integer isHot;
//成单量 /**
* 成单量
*/
@Column(name = "count") @Column(name = "count")
@ApiModelProperty(value = "成单量") @ApiModelProperty(value = "成单量")
private Integer count; private Integer count;
//排序 /**
* 排序
*/
@Column(name = "rank") @Column(name = "rank")
@ApiModelProperty(value = "排序") @ApiModelProperty(value = "排序")
private Integer rank; private Integer rank;
//创建时间 /**
* 创建时间
*/
@Column(name = "ctr_time") @Column(name = "ctr_time")
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
private Long ctrTime; private Long ctrTime;
//更新时间 /**
* 更新时间
*/
@Column(name = "upd_time") @Column(name = "upd_time")
@ApiModelProperty(value = "更新时间", hidden = true ) @ApiModelProperty(value = "更新时间", hidden = true )
private Long updTime; private Long updTime;
//是否删除:0-正常；1-删除 /**
* 是否删除:0-正常；1-删除
*/
@Column(name = "is_del") @Column(name = "is_del")
@ApiModelProperty(value = "是否删除:0-正常；1-删除") @ApiModelProperty(value = "是否删除:0-正常；1-删除")
private Integer isDel; private Integer isDel;
......
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourTagBanner.java
View file @ d654519e
package com.xxfc.platform.tour.entity; package com.xxfc.platform.tour.entity;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date;
import javax.persistence.*; import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -19,54 +18,74 @@ import lombok.Data; ...@@ -19,54 +18,74 @@ import lombok.Data;
public class TourTagBanner implements Serializable { public class TourTagBanner implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
//首页banner图主键 /**
* 首页banner图主键
*/
@Id @Id
@GeneratedValue(generator = "JDBC") @GeneratedValue(generator = "JDBC")
@ApiModelProperty("首页banner图主键") @ApiModelProperty("首页banner图主键")
private Long id; private Long id;
//标签id /**
* 标签id
*/
@Column(name = "tag_id") @Column(name = "tag_id")
@ApiModelProperty(value = "标签id") @ApiModelProperty(value = "标签id")
private Integer tagId; private Integer tagId;
//标题 /**
* 标题
*/
@Column(name = "title") @Column(name = "title")
@ApiModelProperty(value = "标题") @ApiModelProperty(value = "标题")
private String title; private String title;
//封面 /**
* 封面
*/
@Column(name = "cover") @Column(name = "cover")
@ApiModelProperty(value = "封面") @ApiModelProperty(value = "封面")
private String cover; private String cover;
//创建人 /**
* 创建人
*/
@Column(name = "crt_name") @Column(name = "crt_name")
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private String crtName; private String crtName;
//创建时间 /**
* 创建时间
*/
@Column(name = "crt_time") @Column(name = "crt_time")
@ApiModelProperty(value = "创建时间", hidden = true ) @ApiModelProperty(value = "创建时间", hidden = true )
private Long crtTime; private Long crtTime;
//更新人 /**
* 更新人
*/
@Column(name = "upd_name") @Column(name = "upd_name")
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private String updName; private String updName;
//修改时间 /**
* 修改时间
*/
@Column(name = "upd_time") @Column(name = "upd_time")
@ApiModelProperty(value = "修改时间", hidden = true ) @ApiModelProperty(value = "修改时间", hidden = true )
private Long updTime; private Long updTime;
//跳转链接 /**
* 跳转链接
*/
@Column(name = "url") @Column(name = "url")
@ApiModelProperty(value = "跳转链接") @ApiModelProperty(value = "跳转链接")
private String url; private String url;
//是否删除，0否，1是 /**
* 是否删除，0否，1是
*/
@Column(name = "is_del") @Column(name = "is_del")
@ApiModelProperty(value = "是否删除，0否，1是") @ApiModelProperty(value = "是否删除，0否，1是")
private Integer isDel; private Integer isDel;
......
xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodVo.java 0 → 100644
View file @ d654519e
package com.xxfc.platform.tour.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 旅游商品
*
* @author zjw
* @email nishijjo@qq.com
* @date 2019-06-06 11:41:51
*/
@Data
public class TourGoodVo implements Serializable {
private static final long serialVersionUID = 1L;
//
@ApiModelProperty("")
private Integer id;
//商品名
@ApiModelProperty(value = "商品名")
private String name;
//商品封面图
@ApiModelProperty(value = "商品封面图")
private String cover;
//商品原价
@ApiModelProperty(value = "商品原价")
private BigDecimal price;
//儿童价格
@ApiModelProperty(value = "儿童价格")
private BigDecimal childPrice;
//商品浏览量
@ApiModelProperty(value = "商品浏览量")
private Integer viewCount;
//商品销售量
@ApiModelProperty(value = "商品销售量")
private Integer saleCount;
//商品描述
@ApiModelProperty(value = "商品描述")
private String describe;
//商品详情(行程亮点)
@ApiModelProperty(value = "商品详情(行程亮点)")
private String content;
//行程介绍
@ApiModelProperty(value = "行程介绍")
private String introduce;
//费用说明
@ApiModelProperty(value = "费用说明")
private String explain;
//排序
@ApiModelProperty(value = "排序")
private Integer rank;
//状态:0-未发布;1-上架；2-下架
@ApiModelProperty(value = "状态:0-未发布;1-上架；2-下架")
private Integer status;
//创建时间
@ApiModelProperty(value = "创建时间", hidden = true )
private Long crtTime;
//更新时间
@ApiModelProperty(value = "更新时间", hidden = true )
private Long updTime;
//是否推荐:0-未推荐；1-已推荐
@ApiModelProperty(value = "是否推荐:0-未推荐；1-已推荐")
private Integer recommend;
//是否会员价:0-否；1-是
@ApiModelProperty(value = "是否会员价:0-否；1-是")
private Integer isMember;
//库存
@ApiModelProperty(value = "库存")
private Integer stock;
//单位
@ApiModelProperty(value = "单位")
private String unit;
//是否删除，0否，1是
@ApiModelProperty(value = "是否删除，0否，1是")
private Integer isDel;
//标签id
@ApiModelProperty(value = "标签")
private String tagNames;
}
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/TourApplication.java
View file @ d654519e
...@@ -2,8 +2,6 @@ package com.xxfc.platform.tour; ...@@ -2,8 +2,6 @@ package com.xxfc.platform.tour;
import com.ace.cache.EnableAceCache; import com.ace.cache.EnableAceCache;
import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient; import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
import com.spring4all.swagger.EnableSwagger2Doc;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cache.annotation.EnableCaching; import org.springframework.cache.annotation.EnableCaching;
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java
View file @ d654519e
package com.xxfc.platform.tour.biz; package com.xxfc.platform.tour.biz;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.github.wxiaoqi.security.common.biz.BaseBiz; import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.constant.RestCode; import com.github.wxiaoqi.security.common.constant.RestCode;
import com.github.wxiaoqi.security.common.msg.BaseResponse;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.vo.PageDataVO; import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.entity.TourGood; import com.xxfc.platform.tour.dto.*;
import com.xxfc.platform.tour.mapper.TourGoodMapper; import com.xxfc.platform.tour.entity.*;
import com.xxfc.platform.tour.mapper.*;
import com.xxfc.platform.tour.vo.TourGoodVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.beanutils.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.lang.reflect.InvocationTargetException;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
...@@ -27,7 +38,16 @@ import java.util.Map; ...@@ -27,7 +38,16 @@ import java.util.Map;
public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
@Autowired @Autowired
private TourGoodMapper tourGoodMapper; private TourGoodBannerBiz bannerBiz;
@Autowired
private TourGoodSiteBiz siteBiz;
@Autowired
private TourGoodTagBiz tagBiz;
@Autowired
private TourGoodSpeBiz speBiz;
@Autowired
private UserFeign userFeign;
/** /**
* 查询旅游路线列表 * 查询旅游路线列表
...@@ -58,4 +78,125 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -58,4 +78,125 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
public TourGood getOne(Integer id) { public TourGood getOne(Integer id) {
return mapper.getOne(id); return mapper.getOne(id);
} }
//获取商品列表
public PageDataVO<TourGoodVo> getAll(GoodSearchDTO dto){
PageHelper.startPage(dto.getPage(),dto.getLimit());
PageInfo<TourGoodVo> goodPageInfo = new PageInfo<>(mapper.findGoodList(dto));
return PageDataVO.pageInfo(goodPageInfo);
}
//获取商品列表
public ObjectRestResponse goodsEdit(TourGoodDTO dto){
if(dto==null){
return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
}
TourGood good=new TourGood();
try {
Long times=System.currentTimeMillis();
BeanUtils.copyProperties(good,dto);
Integer goodId=good.getId();
good.setUpdTime(times);
if(goodId==null||goodId==0){
good.setCrtTime(times);
mapper.insertSelective(good);
goodId=good.getId();
}else {
mapper.updateByPrimaryKeySelective(good);
}
if(goodId>0){
List<GoodBannerDTO> bannerList=dto.getBannerDTOS();
if(bannerList.size()>0){
for (GoodBannerDTO bannerDTO:bannerList){
Integer bannerId=bannerDTO.getId();
TourGoodBanner goodBanner=new TourGoodBanner();
BeanUtils.copyProperties(goodBanner,bannerDTO);
goodBanner.setGoodId(goodId);
if(bannerId==null||bannerId==0){
bannerBiz.insertSelective(goodBanner);
}else {
bannerBiz.updateSelectiveById(goodBanner);
}
}
}
List<GoodSiteDTO> siteDTOList=dto.getSiteDTOS();
if(siteDTOList.size()>0){
for (GoodSiteDTO siteDTO:siteDTOList){
Integer siteId=siteDTO.getId();
TourGoodSite site=new TourGoodSite();
BeanUtils.copyProperties(site,siteDTO);
site.setGoodId(goodId);
if(siteId==null||siteId==0){
siteBiz.insertSelective(site);
}else {
siteBiz.updateById(site);
}
}
}
List<GoodTagDTO> tagList=dto.getTagDTOS();
if(siteDTOList.size()>0){
for (GoodTagDTO tagDTO:tagList){
Integer tagId=tagDTO.getId();
TourGoodTag tag=new TourGoodTag();
BeanUtils.copyProperties(tag,tagDTO);
tag.setGoodId(goodId);
if(tagId==null||tagId==0){
tagBiz.insertSelective(tag);
}else {
tagBiz.updateById(tag);
}
}
}
List<GoodSpePriceDTO> priceDTOList=dto.getPriceDTOS();
if(siteDTOList.size()>0){
for (GoodSpePriceDTO priceDTO:priceDTOList){
Integer priceId=priceDTO.getId();
TourGoodSpePrice spePrice=new TourGoodSpePrice();
BeanUtils.copyProperties(spePrice,priceDTO);
BigDecimal price=good.getPrice();
BigDecimal childPrice=good.getChildPrice();
spePrice.setPrice(price);
spePrice.setChildPrice(childPrice);
spePrice.setGoodId(goodId);
List<BaseUserMemberLevel> levelsList=userFeign.levels();
if(levelsList.size()>0){
JSONArray array=new JSONArray();
for(BaseUserMemberLevel memberLevel :levelsList){
JSONObject obj=new JSONObject();
Integer level=memberLevel.getLevel();
Integer discount=memberLevel.getDiscount();
BigDecimal price1=price.multiply(new BigDecimal(discount+"")).divide(new BigDecimal("100"))
.setScale(2, RoundingMode.HALF_UP);
BigDecimal price2=childPrice.multiply(new BigDecimal(discount+"")).divide(new BigDecimal("100"))
.setScale(2, RoundingMode.HALF_UP);
obj.put("level",level);
obj.put("price",price1);
obj.put("childPrice",price2);
array.add(obj);
}
if(array.size()>0){
String json=array.toJSONString();
spePrice.setMemberPrice(json);
}
}
if(priceId==null||priceId==0){
speBiz.insertSelective(spePrice);
}else {
speBiz.updateById(spePrice);
}
}
}
}
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
return ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
}
return ObjectRestResponse.succ(good);
}
} }
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodDetailBiz.java
View file @ d654519e
package com.xxfc.platform.tour.biz; package com.xxfc.platform.tour.biz;
import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.process.ResultCode; import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.xxfc.platform.tour.entity.TourGood; import com.xxfc.platform.tour.entity.TourGood;
...@@ -39,6 +41,8 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -39,6 +41,8 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
TourGoodSpePriceMapper priceMapper; TourGoodSpePriceMapper priceMapper;
@Autowired @Autowired
TourGoodSiteMapper siteMapper; TourGoodSiteMapper siteMapper;
@Autowired
private UserFeign userFeign;
//获取商品详情 //获取商品详情
public ObjectRestResponse<TourGoodDetailVo> getGoodDetaileById(Integer id){ public ObjectRestResponse<TourGoodDetailVo> getGoodDetaileById(Integer id){
...@@ -53,16 +57,21 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -53,16 +57,21 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
BigDecimal price=detailVo.getPrice(); BigDecimal price=detailVo.getPrice();
if(price!=null&&detailVo.getIsMember()>0){ if(price!=null&&detailVo.getIsMember()>0){
List<TourMemberVo> memberList=new ArrayList<>(); List<TourMemberVo> memberList=new ArrayList<>();
for(int i=1;i<4;i++){ List<BaseUserMemberLevel> levelsList=userFeign.levels();
if(levelsList.size()>0){
for(BaseUserMemberLevel memberLevel :levelsList){
TourMemberVo memberVo=new TourMemberVo(); TourMemberVo memberVo=new TourMemberVo();
memberVo.setLevel(i); memberVo.setLevel(memberLevel.getLevel());
memberVo.setName(getName(i)); memberVo.setName(memberLevel.getName());
BigDecimal member_price=price.multiply(new BigDecimal("0.88")).setScale(2, RoundingMode.HALF_UP); ; BigDecimal member_price=price.multiply(new BigDecimal(memberLevel.getDiscount()+"")).divide(new BigDecimal("100"))
.setScale(2, RoundingMode.HALF_UP); ;
memberVo.setPrice(member_price); memberVo.setPrice(member_price);
memberList.add(memberVo); memberList.add(memberVo);
} }
detailVo.setMemberVo(memberList); detailVo.setMemberVo(memberList);
} }
}
//获取出行时间 //获取出行时间
List<TourDepartTimeVo> timelist=priceMapper.getAllByGoodId(id); List<TourDepartTimeVo> timelist=priceMapper.getAllByGoodId(id);
...@@ -80,23 +89,6 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> { ...@@ -80,23 +89,6 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
} }
} }
public String getName(Integer type){
String name="";
switch (type){
case 1:
name="普通会员";
break;
case 2:
name="黄金会员";
break;
case 3:
name="钻石会员";
break;
}
return name;
}
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodSpeBiz.java
View file @ d654519e
...@@ -69,7 +69,7 @@ public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpeP ...@@ -69,7 +69,7 @@ public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpeP
} }
} }
totalPrice = price.multiply(new BigDecimal(number)).setScale(2, RoundingMode.HALF_UP); totalPrice = price.multiply(new BigDecimal(number)).setScale(2, RoundingMode.HALF_UP);
totalChildPrice = childNumber > 0 ? price.multiply(new BigDecimal(childNumber)).setScale(2, RoundingMode.HALF_UP): new BigDecimal("0.00"); totalChildPrice = childNumber > 0 ? childPrice.multiply(new BigDecimal(childNumber)).setScale(2, RoundingMode.HALF_UP): new BigDecimal("0.00");
priceVo.setPrice(price); priceVo.setPrice(price);
priceVo.setChildPrice(childPrice); priceVo.setChildPrice(childPrice);
priceVo.setRealPrice(totalPrice); priceVo.setRealPrice(totalPrice);
......
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBannerBiz.java
View file @ d654519e
package com.xxfc.platform.tour.biz; package com.xxfc.platform.tour.biz;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.mapper.TourTagBannerMapper; import com.xxfc.platform.tour.mapper.TourTagBannerMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.xxfc.platform.tour.entity.TourTagBanner; import com.xxfc.platform.tour.entity.TourTagBanner;
...@@ -27,4 +27,27 @@ public class TourTagBannerBiz extends BaseBiz<TourTagBannerMapper,TourTagBanner> ...@@ -27,4 +27,27 @@ public class TourTagBannerBiz extends BaseBiz<TourTagBannerMapper,TourTagBanner>
tourTagBanner.setIsDel(0); tourTagBanner.setIsDel(0);
return mapper.select(tourTagBanner); return mapper.select(tourTagBanner);
} }
/**
* 分页查询旅游标签banner数据
* @param pageNo
* @param pageSize
* @return
*/
public PageDataVO<TourTagBanner> findTourTagBannerWithPage(Integer pageNo,Integer pageSize){
return PageDataVO.pageInfo(pageNo,pageSize,()->mapper.findAllByState(0));
}
/**
* 根据id更改banner状态
* @param id
* @param status
* @return
*/
public int updateTourTagBannerStatusById(int id, int status) {
return mapper.updateTourTagBannerStatusById(id,status);
}
} }
\ No newline at end of file
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBiz.java
View file @ d654519e
package com.xxfc.platform.tour.biz; package com.xxfc.platform.tour.biz;
import com.ace.cache.annotation.Cache;
import com.ace.cache.annotation.CacheClear; import com.ace.cache.annotation.CacheClear;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import com.github.wxiaoqi.security.common.vo.PageDataVO; import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.comstnt.RedisKey; import com.xxfc.platform.tour.comstnt.RedisKey;
import com.xxfc.platform.tour.entity.TourBanner;
import com.xxfc.platform.tour.mapper.TourTagMapper; import com.xxfc.platform.tour.mapper.TourTagMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.xxfc.platform.tour.entity.TourTag; import com.xxfc.platform.tour.entity.TourTag;
import com.github.wxiaoqi.security.common.biz.BaseBiz; import com.github.wxiaoqi.security.common.biz.BaseBiz;
import java.time.Instant;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -28,14 +23,6 @@ import java.util.Map; ...@@ -28,14 +23,6 @@ import java.util.Map;
@Service @Service
public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> { public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
@Autowired
private RedisTemplate redisTemplate;
@Autowired
private TourTagBiz tagBiz;
// @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG) // @Cache(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
public List<TourTag> getHotTag() { public List<TourTag> getHotTag() {
...@@ -54,8 +41,6 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> { ...@@ -54,8 +41,6 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
return PageDataVO.pageInfo((Integer)map.get("page"),(Integer)map.get("limit"),() -> mapper.findAllByIsDel(tag)); return PageDataVO.pageInfo((Integer)map.get("page"),(Integer)map.get("limit"),() -> mapper.findAllByIsDel(tag));
} }
@CacheClear(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG) @CacheClear(key = RedisKey.CONSTANT_CODE_PREFIX_HOTTAG)
public void update(TourTag banner) { public void update(TourTag banner) {
this.updateSelectiveById(banner); this.updateSelectiveById(banner);
...@@ -67,4 +52,45 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> { ...@@ -67,4 +52,45 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
this.deleteById(id); this.deleteById(id);
} }
/**
* 分页查询旅游标签
* @param pageNo 查询的当前
* @param pageSize 分页大小
* @return
*/
public PageDataVO<TourTag> findTourTagWithPage(Integer pageNo, Integer pageSize) {
return PageDataVO.pageInfo(pageNo, pageSize, () -> mapper.findAllByIsDel(TourTag.builder().isDel(0).build()));
}
/**
* 根据主键id查询 旅游标签
* @param id
* @return
*/
public TourTag findTourTagById(Integer id){
return mapper.findById(id);
}
/**
* 保存旅游标签
* @param tourTag
* @return
*/
public int saveTourTag(TourTag tourTag) {
tourTag.setCtrTime(Instant.now().toEpochMilli());
tourTag.setUpdTime(Instant.now().toEpochMilli());
return mapper.save(tourTag);
}
/**
* 根据主键修改标签状态
* @param id
* @param status
* @return
*/
public int updateTourTagStateById(Integer id,int status) {
return mapper.updateTourTagStatusById(id,status);
}
} }
\ No newline at end of file
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodMapper.java
View file @ d654519e
package com.xxfc.platform.tour.mapper; package com.xxfc.platform.tour.mapper;
import com.xxfc.platform.tour.dto.GoodSearchDTO;
import com.xxfc.platform.tour.entity.TourGood; import com.xxfc.platform.tour.entity.TourGood;
import com.xxfc.platform.tour.vo.TourGoodVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import tk.mybatis.mapper.common.Mapper; import tk.mybatis.mapper.common.Mapper;
import java.util.List; import java.util.List;
...@@ -20,4 +22,7 @@ public interface TourGoodMapper extends Mapper<TourGood> { ...@@ -20,4 +22,7 @@ public interface TourGoodMapper extends Mapper<TourGood> {
//查询旅游路线列表 //查询旅游路线列表
public List<TourGood> getGoodList(@Param("params") Map<String,Object> map); public List<TourGood> getGoodList(@Param("params") Map<String,Object> map);
//获取商品列表
public List<TourGoodVo> findGoodList(@Param("params") GoodSearchDTO tourGoodDTO);
} }
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourTagBannerMapper.java
View file @ d654519e
package com.xxfc.platform.tour.mapper; package com.xxfc.platform.tour.mapper;
import com.xxfc.platform.tour.entity.TourTagBanner; import com.xxfc.platform.tour.entity.TourTagBanner;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
import tk.mybatis.mapper.common.Mapper; import tk.mybatis.mapper.common.Mapper;
import java.util.List;
/** /**
* 标签轮播图 * 标签轮播图
* *
...@@ -12,4 +17,20 @@ import tk.mybatis.mapper.common.Mapper; ...@@ -12,4 +17,20 @@ import tk.mybatis.mapper.common.Mapper;
*/ */
public interface TourTagBannerMapper extends Mapper<TourTagBanner> { public interface TourTagBannerMapper extends Mapper<TourTagBanner> {
/**
* 根据是否删除状态来查询数据
* @param isDel
*/
@Select("select * from tour_tag_banner where `is_del`=#{isDel}")
List<TourTagBanner> findAllByState(@Param("isDel") int isDel);
/**
* 根据主键id更新banner状态
* @param id
* @param status
* @return
*/
@Update("update tour_tag_banner set `is_del`=#{status} where `id`=#{id}")
int updateTourTagBannerStatusById(@Param("id") int id, @Param("status") int status);
} }
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourTagMapper.java
View file @ d654519e
package com.xxfc.platform.tour.mapper; package com.xxfc.platform.tour.mapper;
import com.xxfc.platform.tour.entity.TourTag; import com.xxfc.platform.tour.entity.TourTag;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import tk.mybatis.mapper.common.Mapper; import tk.mybatis.mapper.common.Mapper;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* 旅游路线标签 * 旅游路线标签
...@@ -17,9 +16,37 @@ import java.util.Map; ...@@ -17,9 +16,37 @@ import java.util.Map;
*/ */
@Repository @Repository
public interface TourTagMapper extends Mapper<TourTag> { public interface TourTagMapper extends Mapper<TourTag> {
@Select("select * from tour_tag where is_del=${isDel} and is_hot=${isHot} order by rank ASC") @Select("select * from tour_tag where is_del=#{isDel} and is_hot=#{isHot} order by rank ASC")
List<TourTag> findHotListTag(TourTag tag); List<TourTag> findHotListTag(TourTag tag);
@Select("select * from tour_tag where is_del=${isDel} order by rank ASC") @Select("select * from tour_tag where is_del=#{isDel} order by rank ASC")
@ResultMap(value = "tourTagMap")
List<TourTag> findAllByIsDel(TourTag tagBanner); List<TourTag> findAllByIsDel(TourTag tagBanner);
/**
* 根据主要id查询
* @param id
* @return
*/
@Select("select * from tour_tag where id=#{id}")
@ResultMap(value = "tourTagMap")
TourTag findById(Integer id);
/**
* 保存旅游标签
* @param tourTag
* @return
*/
@Insert("insert tour_tag(`name`,`img`,`describe`,`link`,`is_hot`,`count`,`rank`,`ctr_time`,`upd_time`,`is_del`)" +
"values(#{name},#{img},#{describe},#{link},#{isHot},#{count},#{rank},#{ctrTime},#{updTime},#{isDel})")
int save(TourTag tourTag);
/**
* 更新旅游标签的 删除状态
* @param id
* @param status
* @return
*/
@Update("update tour_tag set `is_del`=#{status} where `id`=#{id}")
int updateTourTagStatusById(@Param("id") Integer id, @Param("status") int status);
} }
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodController.java
View file @ d654519e
package com.xxfc.platform.tour.rest; package com.xxfc.platform.tour.rest;
import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken; import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
import com.github.wxiaoqi.security.common.msg.BaseResponse;
import com.github.wxiaoqi.security.common.msg.ListRestResponse;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController; import com.github.wxiaoqi.security.common.rest.BaseController;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.biz.TourGoodBiz; import com.xxfc.platform.tour.biz.TourGoodBiz;
import com.xxfc.platform.tour.dto.GoodSearchDTO;
import com.xxfc.platform.tour.entity.TourGood; import com.xxfc.platform.tour.entity.TourGood;
import com.xxfc.platform.tour.entity.TourTag;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@RestController @RestController
...@@ -44,4 +40,6 @@ public class TourGoodController extends BaseController<TourGoodBiz, TourGood> { ...@@ -44,4 +40,6 @@ public class TourGoodController extends BaseController<TourGoodBiz, TourGood> {
public ObjectRestResponse<TourGood> getOne(@PathVariable Integer id) { public ObjectRestResponse<TourGood> getOne(@PathVariable Integer id) {
return ObjectRestResponse.succ(baseBiz.getOne(id)); return ObjectRestResponse.succ(baseBiz.getOne(id));
} }
} }
\ No newline at end of file
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/admin/TourGoodController.java → xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/admin/TourGoodAdminController.java
View file @ d654519e
...@@ -4,6 +4,8 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken; ...@@ -4,6 +4,8 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController; import com.github.wxiaoqi.security.common.rest.BaseController;
import com.xxfc.platform.tour.biz.TourGoodBiz; import com.xxfc.platform.tour.biz.TourGoodBiz;
import com.xxfc.platform.tour.dto.GoodSearchDTO;
import com.xxfc.platform.tour.dto.TourGoodDTO;
import com.xxfc.platform.tour.entity.TourGood; import com.xxfc.platform.tour.entity.TourGood;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -11,27 +13,19 @@ import org.springframework.web.bind.annotation.*; ...@@ -11,27 +13,19 @@ import org.springframework.web.bind.annotation.*;
@RestController @RestController
@RequestMapping("good") @RequestMapping("good")
@IgnoreClientToken @IgnoreClientToken
public class TourGoodController extends BaseController<TourGoodBiz, TourGood> { public class TourGoodAdminController extends BaseController<TourGoodBiz, TourGood> {
/** @ApiOperation("后台查询旅游路线列表")
* 查询旅游路线列表 @RequestMapping(value = "/admin/goodList", method = RequestMethod.GET)
* public ObjectRestResponse<TourGood> goodList(@RequestBody GoodSearchDTO dto) {
* @param page return ObjectRestResponse.succ(baseBiz.getAll(dto));
* @param limit }
* @param query
* @param latitude
* @param longitude
* @param tagId
* @param distance
* @return
*/
@ApiOperation("查询旅游路线列表")
@RequestMapping(value = "//getGoodList", method = RequestMethod.GET)
public ObjectRestResponse<TourGood> getGoodList(@RequestParam(value = "page", required = true) Integer page, @RequestParam(value = "limit", required = true) Integer limit, @ApiOperation("后台查询旅游路线列表")
@RequestParam(value = "query", required = false) String query, @RequestParam(value = "latitude", required = false) Double latitude, @RequestMapping(value = "/admin/goodEdit", method = RequestMethod.GET)
@RequestParam(value = "longitude", required = false) Double longitude, @RequestParam(value = "tagId", required = false) Integer tagId, public ObjectRestResponse<TourGood> goodEdit(@RequestBody TourGoodDTO dto) {
@RequestParam(value = "distance", defaultValue = "10.00") Double distance) { return ObjectRestResponse.succ(baseBiz.goodsEdit(dto));
return baseBiz.getGoodList(page, limit, query, latitude, longitude, tagId, distance);
} }
} }
\ No newline at end of file
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/admin/TourTagAdminController.java 0 → 100644
View file @ d654519e
package com.xxfc.platform.tour.rest.admin;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.biz.TourTagBiz;
import com.xxfc.platform.tour.entity.TourTag;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiResponse;
import org.springframework.web.bind.annotation.*;
/**
* @author libin
* @version 1.0
* @description 旅游标签
* @data 2019/6/11 9:57
*/
@RestController
@RequestMapping("/admin/tourTag")
@Api(value = "后台*旅游标签")
public class TourTagAdminController extends BaseController<TourTagBiz, TourTag> {
/**
* 分页查询标签
*
* @param pageNo 访问页
* @param pageSize 分页大小
* @return
*/
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageNo",paramType = "query",dataType = "integer",defaultValue = "0"),
@ApiImplicitParam(name = "pageSize",paramType = "query",dataType = "integer",defaultValue = "10")
})
@ApiResponse(code = 200,message = "Success")
@GetMapping("/pages")
public ObjectRestResponse<PageDataVO> findTourTageWithPage(@RequestParam(name = "pageNoe", defaultValue = "0",required = false) Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10",required = false) Integer pageSize) {
PageDataVO<TourTag> pageDataVO = getBaseBiz().findTourTagWithPage(pageNo, pageSize);
return ObjectRestResponse.succ(pageDataVO);
}
/**
* 根据 id 查询旅游标签
* @param id
* @return
*/
@Override
public ObjectRestResponse<TourTag> get(@PathVariable int id) {
TourTag tourTag = getBaseBiz().findTourTagById(id);
return ObjectRestResponse.succ(tourTag);
}
/**
* 保存旅游标签
* @param tourTag
* @return
*/
@Override
public ObjectRestResponse<TourTag> add(@RequestBody TourTag tourTag) {
int insertRows = getBaseBiz().saveTourTag(tourTag);
if (insertRows>0){
return ObjectRestResponse.succ();
}
return ObjectRestResponse.createDefaultFail();
}
/**
* 逻辑删除
* @param id
* @return
*/
@Override
public ObjectRestResponse<TourTag> remove(@PathVariable int id) {
int effRow = getBaseBiz().updateTourTagStateById(id,1);
if (effRow>0){
return ObjectRestResponse.succ();
}
return ObjectRestResponse.createDefaultFail();
}
}
\ No newline at end of file
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/admin/TourTagBannerAdminController.java 0 → 100644
View file @ d654519e
package com.xxfc.platform.tour.rest.admin;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.xxfc.platform.tour.biz.TourTagBannerBiz;
import com.xxfc.platform.tour.entity.TourTagBanner;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import org.springframework.web.bind.annotation.*;
/**
* @author libin
* @version 1.0
* @description 旅游标签banner
* @data 2019/6/11 9:45
*/
@RestController
@RequestMapping("/admin/tourTagBanner")
@Api(value = "后台*旅游标签banner接口")
public class TourTagBannerAdminController extends BaseController<TourTagBannerBiz,TourTagBanner> {
/**
* 分页查询旅游标签banner数据
* @param pageNo
* @param pageSize
* @return
*/
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageNo",paramType = "query",dataType = "integer",defaultValue = "0"),
@ApiImplicitParam(name = "pageSize",paramType = "query",dataType = "integer",defaultValue = "10")
})
@GetMapping("/pages")
public ObjectRestResponse<PageDataVO<TourTagBanner>> findTourTagBannerWithPage(@RequestParam(name = "pageNo",required = false,defaultValue = "0")Integer pageNo,
@RequestParam(name = "pageSize",required = false,defaultValue = "10")Integer pageSize){
PageDataVO<TourTagBanner> tagBannerPageDataVO = getBaseBiz().findTourTagBannerWithPage(pageNo, pageSize);
return ObjectRestResponse.succ(tagBannerPageDataVO);
}
/**
* 根据主键id逻辑删除
* @param id
* @return
*/
@Override
public ObjectRestResponse<TourTagBanner> remove(@PathVariable int id) {
int effRows = getBaseBiz().updateTourTagBannerStatusById(id,1);
if (effRows>0){
return ObjectRestResponse.succ();
}
return ObjectRestResponse.createDefaultFail();
}
}
\ No newline at end of file
xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml
View file @ d654519e
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
<result property="childPrice" column="child_price"/> <result property="childPrice" column="child_price"/>
<result property="viewCount" column="view_count"/> <result property="viewCount" column="view_count"/>
<result property="saleCount" column="sale_count"/> <result property="saleCount" column="sale_count"/>
<result property="describe" column="describe"/> <result property="describe" column="describes"/>
<result property="content" column="content"/> <result property="content" column="content"/>
<result property="explain" column="explains"/>
<result property="introduce" column="introduce"/> <result property="introduce" column="introduce"/>
<result property="rank" column="rank"/> <result property="rank" column="rank"/>
<result property="status" column="status"/> <result property="status" column="status"/>
...@@ -25,6 +26,29 @@ ...@@ -25,6 +26,29 @@
<result property="unit" column="unit"/> <result property="unit" column="unit"/>
</resultMap> </resultMap>
<resultMap type="com.xxfc.platform.tour.vo.TourGoodVo" id="tourGoodVoMap">
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="cover" column="cover"/>
<result property="price" column="price"/>
<result property="childPrice" column="child_price"/>
<result property="viewCount" column="view_count"/>
<result property="saleCount" column="sale_count"/>
<result property="describe" column="describes"/>
<result property="explain" column="explains"/>
<result property="content" column="content"/>
<result property="introduce" column="introduce"/>
<result property="rank" column="rank"/>
<result property="status" column="status"/>
<result property="crtTime" column="crt_time"/>
<result property="updTime" column="upd_time"/>
<result property="recommend" column="recommend"/>
<result property="isMember" column="is_member"/>
<result property="stock" column="stock"/>
<result property="unit" column="unit"/>
<result property="tagNames" column="tagNames"/>
</resultMap>
<!--查询旅游路线列表--> <!--查询旅游路线列表-->
<select id="getGoodList" parameterType="java.util.Map" resultMap="tourGoodMap"> <select id="getGoodList" parameterType="java.util.Map" resultMap="tourGoodMap">
SELECT * from tour_good t SELECT * from tour_good t
...@@ -45,7 +69,7 @@ ...@@ -45,7 +69,7 @@
</if> </if>
<if test="params.tagId != null and params.tagId != '' "> <if test="params.tagId != null and params.tagId != '' ">
and t.id in (SELECT tg.good_id from tour_good_tag tg and t.id in (SELECT tg.good_id from tour_good_tag tg
where tg.tag_id = 1) and t.recommend = 1 where tg.tag_id = #{params.tagId}) and t.recommend = 1
ORDER BY t.recommend ORDER BY t.recommend
</if> </if>
...@@ -54,4 +78,24 @@ ...@@ -54,4 +78,24 @@
<select id="getOne" resultMap="tourGoodMap"> <select id="getOne" resultMap="tourGoodMap">
SELECT * FROM tour_good WHERE id =#{id} and is_del=0 SELECT * FROM tour_good WHERE id =#{id} and is_del=0
</select> </select>
<!--后台查询旅游路线列表-->
<select id="findGoodList" resultMap="tourGoodMap">
SELECT g.*,REPLACE(GROUP_CONCAT( DISTINCT t.`name`),',','|')as tagNames from tour_good g
LEFT JOIN tour_good_tag tag ON g.id=tag.good_id
LEFT JOIN tour_tag t ON tag.tag_id=t.id
<where>
<if test="params.query != null and params.query != ''">
and (g.`name` like CONCAT('%',#{params.query},'%') or g.introduce like CONCAT('%',#{params.query},'%'))
</if>
<if test="params.tagId != null and params.tagId != '' ">
and g.id in (SELECT good_id from tour_good_tag
where tag_id = #{params.tagId})
</if>
</where>
GROUP BY g.id
ORDER BY g.rank DESC ,g.id DESC
</select>
</mapper> </mapper>
\ No newline at end of file
xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodSiteMapper.xml
View file @ d654519e
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<result property="type" column="type"/> <result property="type" column="type"/>
<result property="rank" column="rank"/> <result property="rank" column="rank"/>
<result property="status" column="status"/> <result property="status" column="status"/>
<result property="ctrTime" column="ctr_time"/> <result property="crtTime" column="crt_time"/>
<result property="updTime" column="upd_time"/> <result property="updTime" column="upd_time"/>
<result property="intro" column="intro"/> <result property="intro" column="intro"/>
<result property="isDel" column="is_del"/> <result property="isDel" column="is_del"/>
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/UploadController.java
View file @ d654519e
...@@ -45,6 +45,22 @@ public class UploadController{ ...@@ -45,6 +45,22 @@ public class UploadController{
return JsonResultUtil.createSuccessResultWithObj(uploadService.uploadFile(file,prefix)); return JsonResultUtil.createSuccessResultWithObj(uploadService.uploadFile(file,prefix));
} }
@RequestMapping(value = "/admin/upload", method = RequestMethod.POST)
public JSONObject uploads(
@RequestParam("file") MultipartFile file,
@RequestParam(value = "prefix",defaultValue = "admin")String prefix
)throws Exception {
String contentType = file.getContentType(); //图片文件类型
// String fileName = file.getOriginalFilename(); //图片名字
/* if (!contentType.equals("image/jpeg") && !contentType.equals("image/gif")&&!contentType.equals("image/png")) {
return JsonResultUtil.createFailedResult(2001,"格式不对!!!");
}*/
if (file.getSize() > MAX_DRIVING_LICENSE_SIZE) {
return JsonResultUtil.createFailedResult(2002,"大小超过限制!!!");
}
return JsonResultUtil.createSuccessResultWithObj(uploadService.uploadFile(file,prefix));
}
@IgnoreUserToken @IgnoreUserToken
@RequestMapping(value = "/app/unauth/download", method = RequestMethod.GET) //匹配的是href中的download请求 @RequestMapping(value = "/app/unauth/download", method = RequestMethod.GET) //匹配的是href中的download请求
public ResponseEntity<byte[]> download(@RequestParam("realFileRelPath") String realFileRelPath) throws Exception { public ResponseEntity<byte[]> download(@RequestParam("realFileRelPath") String realFileRelPath) throws Exception {
......
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