Skip to content

P
poc-api
Commit f2523c9d authored by alex yao's avatar alex yao
Browse files
Options

feat：应用分类

parent 76fdc087
Hide whitespace changes
Inline Side-by-side
Showing with 511 additions and 332 deletions
src/main/java/cn/com/poc/agent_application/convert/BizAgentApplicationMallConvert.java
View file @ f2523c9d
......@@ -28,6 +28,7 @@ public class BizAgentApplicationMallConvert {
entity.setId(model.getId());
entity.setAgentPublishId(model.getAgentPublishId());
entity.setAgentType(model.getAgentType());
entity.setCategoryId(model.getCategoryId());
entity.setCollectNumber(model.getCollectNumber());
entity.setClickNumber(model.getClickNumber());
entity.setIsCopy(model.getIsCopy());
......@@ -40,6 +41,7 @@ public class BizAgentApplicationMallConvert {
BizAgentApplicationMallModel model = new BizAgentApplicationMallModel();
model.setId(entity.getId());
model.setAgentPublishId(entity.getAgentPublishId());
model.setCategoryId(entity.getCategoryId());
model.setAgentType(entity.getAgentType());
model.setCollectNumber(entity.getCollectNumber());
model.setClickNumber(entity.getClickNumber());
......@@ -175,6 +177,7 @@ public class BizAgentApplicationMallConvert {
entity.setId(dto.getId());
entity.setAgentPublishId(dto.getAgentPublishId());
entity.setAgentType(dto.getAgentType());
entity.setCategoryId(dto.getCategoryId());
entity.setCollectNumber(dto.getCollectNumber());
entity.setClickNumber(dto.getClickNumber());
entity.setIsCopy(dto.getIsCopy());
......
src/main/java/cn/com/poc/agent_application/dto/AgentApplicationMallCategoryDto.java 0 → 100644
View file @ f2523c9d
package cn.com.poc.agent_application.dto;
public class AgentApplicationMallCategoryDto {
private Integer id;
private String categoryName;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getCategoryName() {
return categoryName;
}
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
}
}
src/main/java/cn/com/poc/agent_application/dto/AgentApplicationMallQueryDto.java
View file @ f2523c9d
......@@ -6,8 +6,18 @@ public class AgentApplicationMallQueryDto implements Serializable {
private String agentType;
private Integer categoryId;
private String search;
public Integer getCategoryId() {
return categoryId;
}
public void setCategoryId(Integer categoryId) {
this.categoryId = categoryId;
}
public String getAgentType() {
return agentType;
}
......
src/main/java/cn/com/poc/agent_application/dto/BizAgentApplicationMallDto.java
View file @ f2523c9d
package cn.com.poc.agent_application.dto;
package cn.com.poc.agent_application.dto;
public class BizAgentApplicationMallDto extends AgentApplicationInfoDto{
public class BizAgentApplicationMallDto extends AgentApplicationInfoDto {
private static final long serialVersionUID = 1L;
/** id
*自增ID
*/
/**
* id
* 自增ID
*/
private java.lang.Integer id;
public java.lang.Integer getId(){
public java.lang.Integer getId() {
return this.id;
}
public void setId(java.lang.Integer id){
public void setId(java.lang.Integer id) {
this.id = id;
}
/** agent_publish_id
*发布应用的ID
*/
/**
* agent_publish_id
* 发布应用的ID
*/
private java.lang.Integer agentPublishId;
public java.lang.Integer getAgentPublishId(){
public java.lang.Integer getAgentPublishId() {
return this.agentPublishId;
}
public void setAgentPublishId(java.lang.Integer agentPublishId){
public void setAgentPublishId(java.lang.Integer agentPublishId) {
this.agentPublishId = agentPublishId;
}
/** agent_type
*应用类型
*/
/**
* agent_type
* 应用类型
*/
private java.lang.String agentType;
public java.lang.String getAgentType(){
public java.lang.String getAgentType() {
return this.agentType;
}
public void setAgentType(java.lang.String agentType){
public void setAgentType(java.lang.String agentType) {
this.agentType = agentType;
}
/** collect_number
*收藏人数
*/
/**
* category_id
* 应用分类ID
*/
private Integer categoryId;
public Integer getCategoryId() {
return categoryId;
}
public void setCategoryId(Integer categoryId) {
this.categoryId = categoryId;
}
/**
* collect_number
* 收藏人数
*/
private java.lang.Integer collectNumber;
public java.lang.Integer getCollectNumber(){
public java.lang.Integer getCollectNumber() {
return this.collectNumber;
}
public void setCollectNumber(java.lang.Integer collectNumber){
public void setCollectNumber(java.lang.Integer collectNumber) {
this.collectNumber = collectNumber;
}
/** click_number
*点击次数
/**
* click_number
* 点击次数
*/
private java.lang.Integer clickNumber;
public java.lang.Integer getClickNumber(){
public java.lang.Integer getClickNumber() {
return this.clickNumber;
}
public void setClickNumber(java.lang.Integer clickNumber){
public void setClickNumber(java.lang.Integer clickNumber) {
this.clickNumber = clickNumber;
}
/** is_copy
*是否允许被复制 1、Y 是 2、N 否
*/
/**
* is_copy
* 是否允许被复制 1、Y 是 2、N 否
*/
private java.lang.String isCopy;
public java.lang.String getIsCopy(){
public java.lang.String getIsCopy() {
return this.isCopy;
}
public void setIsCopy(java.lang.String isCopy){
public void setIsCopy(java.lang.String isCopy) {
this.isCopy = isCopy;
}
/** is_sale
*是否上架应用 1、Y 是 2、N 否
/**
* is_sale
* 是否上架应用 1、Y 是 2、N 否
*/
private java.lang.String isSale;
public java.lang.String getIsSale(){
public java.lang.String getIsSale() {
return this.isSale;
}
public void setIsSale(java.lang.String isSale){
public void setIsSale(java.lang.String isSale) {
this.isSale = isSale;
}
/** popularity
*应用热度
/**
* popularity
* 应用热度
*/
private java.lang.Double popularity;
public java.lang.Double getPopularity(){
public java.lang.Double getPopularity() {
return this.popularity;
}
public void setPopularity(java.lang.Double popularity){
public void setPopularity(java.lang.Double popularity) {
this.popularity = popularity;
}
/**
* isCollect
* 当前用户是否收藏 1、Y 是 2、N 否
* */
*/
private String isCollect;
public String getIsCollect() {
......
src/main/java/cn/com/poc/agent_application/entity/BizAgentApplicationMallEntity.java
View file @ f2523c9d
package cn.com.poc.agent_application.entity;
public class BizAgentApplicationMallEntity {
private static final long serialVersionUID = 1L;
/** id
*自增ID
*/
/**
* id
* 自增ID
*/
private java.lang.Integer id;
public java.lang.Integer getId(){
public java.lang.Integer getId() {
return this.id;
}
public void setId(java.lang.Integer id){
public void setId(java.lang.Integer id) {
this.id = id;
}
/** agent_publish_id
*发布应用的ID
*/
/**
* agent_publish_id
* 发布应用的ID
*/
private java.lang.Integer agentPublishId;
public java.lang.Integer getAgentPublishId(){
public java.lang.Integer getAgentPublishId() {
return this.agentPublishId;
}
public void setAgentPublishId(java.lang.Integer agentPublishId){
public void setAgentPublishId(java.lang.Integer agentPublishId) {
this.agentPublishId = agentPublishId;
}
/** agent_type
*应用类型
*/
/**
* agent_type
* 应用类型
*/
private java.lang.String agentType;
public java.lang.String getAgentType(){
public java.lang.String getAgentType() {
return this.agentType;
}
public void setAgentType(java.lang.String agentType){
public void setAgentType(java.lang.String agentType) {
this.agentType = agentType;
}
/** collect_number
*收藏人数
*/
/**
* category_id
* 应用分类ID
*/
private Integer categoryId;
public Integer getCategoryId() {
return categoryId;
}
public void setCategoryId(Integer categoryId) {
this.categoryId = categoryId;
}
/**
* collect_number
* 收藏人数
*/
private java.lang.Integer collectNumber;
public java.lang.Integer getCollectNumber(){
public java.lang.Integer getCollectNumber() {
return this.collectNumber;
}
public void setCollectNumber(java.lang.Integer collectNumber){
public void setCollectNumber(java.lang.Integer collectNumber) {
this.collectNumber = collectNumber;
}
/** click_number
*点击次数
/**
* click_number
* 点击次数
*/
private java.lang.Integer clickNumber;
public java.lang.Integer getClickNumber(){
public java.lang.Integer getClickNumber() {
return this.clickNumber;
}
public void setClickNumber(java.lang.Integer clickNumber){
public void setClickNumber(java.lang.Integer clickNumber) {
this.clickNumber = clickNumber;
}
/** is_copy
*是否允许被复制 1、Y 是 2、N 否
*/
/**
* is_copy
* 是否允许被复制 1、Y 是 2、N 否
*/
private java.lang.String isCopy;
public java.lang.String getIsCopy(){
public java.lang.String getIsCopy() {
return this.isCopy;
}
public void setIsCopy(java.lang.String isCopy){
public void setIsCopy(java.lang.String isCopy) {
this.isCopy = isCopy;
}
/** is_sale
*是否上架应用 1、Y 是 2、N 否
/**
* is_sale
* 是否上架应用 1、Y 是 2、N 否
*/
private java.lang.String isSale;
public java.lang.String getIsSale(){
public java.lang.String getIsSale() {
return this.isSale;
}
public void setIsSale(java.lang.String isSale){
public void setIsSale(java.lang.String isSale) {
this.isSale = isSale;
}
/** popularity
*应用热度
/**
* popularity
* 应用热度
*/
private java.lang.Double popularity;
public java.lang.Double getPopularity(){
public java.lang.Double getPopularity() {
return this.popularity;
}
public void setPopularity(java.lang.Double popularity){
public void setPopularity(java.lang.Double popularity) {
this.popularity = popularity;
}
/** is_deleted
*是否删除 1、Y 是 2、N 否
*/
/**
* is_deleted
* 是否删除 1、Y 是 2、N 否
*/
private java.lang.String isDeleted;
public java.lang.String getIsDeleted(){
public java.lang.String getIsDeleted() {
return this.isDeleted;
}
public void setIsDeleted(java.lang.String isDeleted){
public void setIsDeleted(java.lang.String isDeleted) {
this.isDeleted = isDeleted;
}
/** CREATOR
*创建人
*/
/**
* CREATOR
* 创建人
*/
private java.lang.String creator;
public java.lang.String getCreator(){
public java.lang.String getCreator() {
return this.creator;
}
public void setCreator(java.lang.String creator){
public void setCreator(java.lang.String creator) {
this.creator = creator;
}
/** CREATED_TIME
*创建时间
*/
/**
* CREATED_TIME
* 创建时间
*/
private java.util.Date createdTime;
public java.util.Date getCreatedTime(){
public java.util.Date getCreatedTime() {
return this.createdTime;
}
public void setCreatedTime(java.util.Date createdTime){
public void setCreatedTime(java.util.Date createdTime) {
this.createdTime = createdTime;
}
/** MODIFIER
*修改人
*/
/**
* MODIFIER
* 修改人
*/
private java.lang.String modifier;
public java.lang.String getModifier(){
public java.lang.String getModifier() {
return this.modifier;
}
public void setModifier(java.lang.String modifier){
public void setModifier(java.lang.String modifier) {
this.modifier = modifier;
}
/** MODIFIED_TIME
*修改时间
*/
/**
* MODIFIED_TIME
* 修改时间
*/
private java.util.Date modifiedTime;
public java.util.Date getModifiedTime(){
public java.util.Date getModifiedTime() {
return this.modifiedTime;
}
public void setModifiedTime(java.util.Date modifiedTime){
public void setModifiedTime(java.util.Date modifiedTime) {
this.modifiedTime = modifiedTime;
}
/** SYS_VERSION
*版本号
*/
/**
* SYS_VERSION
* 版本号
*/
private java.lang.Integer sysVersion;
public java.lang.Integer getSysVersion(){
public java.lang.Integer getSysVersion() {
return this.sysVersion;
}
public void setSysVersion(java.lang.Integer sysVersion){
public void setSysVersion(java.lang.Integer sysVersion) {
this.sysVersion = sysVersion;
}
}
\ No newline at end of file
src/main/java/cn/com/poc/agent_application/model/BizAgentApplicationMallModel.java
View file @ f2523c9d
package cn.com.poc.agent_application.model;
package cn.com.poc.agent_application.model;
import java.io.Serializable;
import cn.com.yict.framemax.data.model.BaseModelClass;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Id;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Version;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
......@@ -23,228 +27,259 @@ import javax.persistence.GenerationType;
public class BizAgentApplicationMallModel extends BaseModelClass implements Serializable {
private static final long serialVersionUID = 1L;
/** id
*自增ID
*/
/**
* id
* 自增ID
*/
private java.lang.Integer id;
@Column(name = "id",length = 10)
@Id @GeneratedValue(strategy = GenerationType.AUTO)
public java.lang.Integer getId(){
@Column(name = "id", length = 10)
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
public java.lang.Integer getId() {
return this.id;
}
public void setId(java.lang.Integer id){
public void setId(java.lang.Integer id) {
this.id = id;
super.addValidField("id");
}
/** agent_publish_id
*发布应用的ID
*/
/**
* agent_publish_id
* 发布应用的ID
*/
private java.lang.Integer agentPublishId;
@Column(name = "agent_publish_id",length = 10)
public java.lang.Integer getAgentPublishId(){
@Column(name = "agent_publish_id", length = 10)
public java.lang.Integer getAgentPublishId() {
return this.agentPublishId;
}
public void setAgentPublishId(java.lang.Integer agentPublishId){
public void setAgentPublishId(java.lang.Integer agentPublishId) {
this.agentPublishId = agentPublishId;
super.addValidField("agentPublishId");
}
/** agent_type
*应用类型
*/
/**
* agent_type
* 应用类型
*/
private java.lang.String agentType;
@Column(name = "agent_type",length = 200)
public java.lang.String getAgentType(){
@Column(name = "agent_type", length = 200)
public java.lang.String getAgentType() {
return this.agentType;
}
public void setAgentType(java.lang.String agentType){
public void setAgentType(java.lang.String agentType) {
this.agentType = agentType;
super.addValidField("agentType");
}
/** collect_number
*收藏人数
*/
/**
* category_id
* 应用分类ID
*/
private java.lang.Integer categoryId;
@Column(name = "category_id", length = 10)
public java.lang.Integer getCategoryId() {
return this.categoryId;
}
public void setCategoryId(java.lang.Integer categoryId) {
this.categoryId = categoryId;
super.addValidField("categoryId");
}
/**
* collect_number
* 收藏人数
*/
private java.lang.Integer collectNumber;
@Column(name = "collect_number",length = 10)
public java.lang.Integer getCollectNumber(){
@Column(name = "collect_number", length = 10)
public java.lang.Integer getCollectNumber() {
return this.collectNumber;
}
public void setCollectNumber(java.lang.Integer collectNumber){
public void setCollectNumber(java.lang.Integer collectNumber) {
this.collectNumber = collectNumber;
super.addValidField("collectNumber");
}
/** click_number
*点击次数
/**
* click_number
* 点击次数
*/
private java.lang.Integer clickNumber;
@Column(name = "click_number",length = 10)
public java.lang.Integer getClickNumber(){
@Column(name = "click_number", length = 10)
public java.lang.Integer getClickNumber() {
return this.clickNumber;
}
public void setClickNumber(java.lang.Integer clickNumber){
public void setClickNumber(java.lang.Integer clickNumber) {
this.clickNumber = clickNumber;
super.addValidField("clickNumber");
}
/** is_copy
*是否允许被复制 1、Y 是 2、N 否
*/
/**
* is_copy
* 是否允许被复制 1、Y 是 2、N 否
*/
private java.lang.String isCopy;
@Column(name = "is_copy",length = 1)
public java.lang.String getIsCopy(){
@Column(name = "is_copy", length = 1)
public java.lang.String getIsCopy() {
return this.isCopy;
}
public void setIsCopy(java.lang.String isCopy){
public void setIsCopy(java.lang.String isCopy) {
this.isCopy = isCopy;
super.addValidField("isCopy");
}
/** is_sale
*是否上架应用 1、Y 是 2、N 否
/**
* is_sale
* 是否上架应用 1、Y 是 2、N 否
*/
private java.lang.String isSale;
@Column(name = "is_sale",length = 1)
public java.lang.String getIsSale(){
@Column(name = "is_sale", length = 1)
public java.lang.String getIsSale() {
return this.isSale;
}
public void setIsSale(java.lang.String isSale){
public void setIsSale(java.lang.String isSale) {
this.isSale = isSale;
super.addValidField("isSale");
}
/** popularity
*应用热度
/**
* popularity
* 应用热度
*/
private java.lang.Double popularity;
@Column(name = "popularity",length = 10)
public java.lang.Double getPopularity(){
@Column(name = "popularity", length = 10)
public java.lang.Double getPopularity() {
return this.popularity;
}
public void setPopularity(java.lang.Double popularity){
public void setPopularity(java.lang.Double popularity) {
this.popularity = popularity;
super.addValidField("popularity");
}
/** is_deleted
*是否删除 1、Y 是 2、N 否
*/
/**
* is_deleted
* 是否删除 1、Y 是 2、N 否
*/
private java.lang.String isDeleted;
@Column(name = "is_deleted",length = 1)
public java.lang.String getIsDeleted(){
@Column(name = "is_deleted", length = 1)
public java.lang.String getIsDeleted() {
return this.isDeleted;
}
public void setIsDeleted(java.lang.String isDeleted){
public void setIsDeleted(java.lang.String isDeleted) {
this.isDeleted = isDeleted;
super.addValidField("isDeleted");
}
/** CREATOR
*创建人
*/
/**
* CREATOR
* 创建人
*/
private java.lang.String creator;
@Column(name = "CREATOR",length = 50)
public java.lang.String getCreator(){
@Column(name = "CREATOR", length = 50)
public java.lang.String getCreator() {
return this.creator;
}
public void setCreator(java.lang.String creator){
public void setCreator(java.lang.String creator) {
this.creator = creator;
super.addValidField("creator");
}
/** CREATED_TIME
*创建时间
*/
/**
* CREATED_TIME
* 创建时间
*/
private java.util.Date createdTime;
@Column(name = "CREATED_TIME",length = 19)
public java.util.Date getCreatedTime(){
@Column(name = "CREATED_TIME", length = 19)
public java.util.Date getCreatedTime() {
return this.createdTime;
}
public void setCreatedTime(java.util.Date createdTime){
public void setCreatedTime(java.util.Date createdTime) {
this.createdTime = createdTime;
super.addValidField("createdTime");
}
/** MODIFIER
*修改人
*/
/**
* MODIFIER
* 修改人
*/
private java.lang.String modifier;
@Column(name = "MODIFIER",length = 50)
public java.lang.String getModifier(){
@Column(name = "MODIFIER", length = 50)
public java.lang.String getModifier() {
return this.modifier;
}
public void setModifier(java.lang.String modifier){
public void setModifier(java.lang.String modifier) {
this.modifier = modifier;
super.addValidField("modifier");
}
/** MODIFIED_TIME
*修改时间
*/
/**
* MODIFIED_TIME
* 修改时间
*/
private java.util.Date modifiedTime;
@Column(name = "MODIFIED_TIME",length = 19)
public java.util.Date getModifiedTime(){
@Column(name = "MODIFIED_TIME", length = 19)
public java.util.Date getModifiedTime() {
return this.modifiedTime;
}
public void setModifiedTime(java.util.Date modifiedTime){
public void setModifiedTime(java.util.Date modifiedTime) {
this.modifiedTime = modifiedTime;
super.addValidField("modifiedTime");
}
/** SYS_VERSION
*版本号
*/
/**
* SYS_VERSION
* 版本号
*/
private java.lang.Integer sysVersion;
@Column(name = "SYS_VERSION",length = 10)
@Version
public java.lang.Integer getSysVersion(){
@Column(name = "SYS_VERSION", length = 10)
@Version
public java.lang.Integer getSysVersion() {
return this.sysVersion;
}
public void setSysVersion(java.lang.Integer sysVersion){
public void setSysVersion(java.lang.Integer sysVersion) {
this.sysVersion = sysVersion;
super.addValidField("sysVersion");
}
}
\ No newline at end of file
src/main/java/cn/com/poc/agent_application/query/MallAgentApplicationQuery.sql
View file @ f2523c9d
......@@ -2,6 +2,7 @@ select
baam.id,
baam.agent_publish_id,
baam.agent_type,
baam.category_id,
baam.collect_number,
baam.is_sale,
baam.click_number,
......@@ -14,5 +15,6 @@ left join biz_agent_application_publish baap on baap.id = baam.agent_publish_id
where baam.is_deleted ='N'
and baam.is_sale = 'Y'
<<and baam.agent_type = :agentType>>
<<and baam.category_id = :categoryId>>
<<and LOCATE(:query, baap.agent_title)>>
order by baam.CREATED_TIME desc
\ No newline at end of file
src/main/java/cn/com/poc/agent_application/query/MallAgentApplicationQueryCondition.java
View file @ f2523c9d
......@@ -20,6 +20,15 @@ public class MallAgentApplicationQueryCondition implements Serializable{
this.agentType = agentType;
}
private java.lang.Integer categoryId;
public Integer getCategoryId() {
return categoryId;
}
public void setCategoryId(Integer categoryId) {
this.categoryId = categoryId;
}
private java.lang.String query;
......
src/main/java/cn/com/poc/agent_application/query/MallAgentApplicationQueryItem.java
View file @ f2523c9d
package cn.com.poc.agent_application.query;
package cn.com.poc.agent_application.query;
import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.Entity;
import cn.com.yict.framemax.data.model.BaseItemClass;
/**
* Query Item class for MallAgentApplicationQuery
*/
@Entity
public class MallAgentApplicationQueryItem extends BaseItemClass implements Serializable{
public class MallAgentApplicationQueryItem extends BaseItemClass implements Serializable {
private static final long serialVersionUID = 1L;
/** id
*id
*/
/**
* id
* id
*/
private java.lang.Integer id;
@Column(name = "id")
public java.lang.Integer getId(){
public java.lang.Integer getId() {
return this.id;
}
public void setId(java.lang.Integer id){
public void setId(java.lang.Integer id) {
this.id = id;
}
/** agent_publish_id
*agent_publish_id
*/
/**
* agent_publish_id
* agent_publish_id
*/
private java.lang.Integer agentPublishId;
@Column(name = "agent_publish_id")
public java.lang.Integer getAgentPublishId(){
public java.lang.Integer getAgentPublishId() {
return this.agentPublishId;
}
public void setAgentPublishId(java.lang.Integer agentPublishId){
public void setAgentPublishId(java.lang.Integer agentPublishId) {
this.agentPublishId = agentPublishId;
}
/** agent_type
*agent_type
*/
/**
* agent_type
* agent_type
*/
private java.lang.String agentType;
@Column(name = "agent_type")
public java.lang.String getAgentType(){
public java.lang.String getAgentType() {
return this.agentType;
}
public void setAgentType(java.lang.String agentType){
public void setAgentType(java.lang.String agentType) {
this.agentType = agentType;
}
/** collect_number
*collect_number
*/
/**
* category_id
*/
private java.lang.Integer categoryId;
@Column(name = "category_id")
public java.lang.Integer getCategoryId() {
return this.categoryId;
}
public void setCategoryId(java.lang.Integer categoryId) {
this.categoryId = categoryId;
}
/**
* collect_number
* collect_number
*/
private java.lang.Integer collectNumber;
@Column(name = "collect_number")
public java.lang.Integer getCollectNumber(){
public java.lang.Integer getCollectNumber() {
return this.collectNumber;
}
public void setCollectNumber(java.lang.Integer collectNumber){
public void setCollectNumber(java.lang.Integer collectNumber) {
this.collectNumber = collectNumber;
}
/** baam.is_sale = 'Y'
*baam.is_sale = 'Y'
*/
/**
* baam.is_sale = 'Y'
* baam.is_sale = 'Y'
*/
private java.lang.String isSale;
@Column(name = "is_sale")
public java.lang.String getIsSale(){
public java.lang.String getIsSale() {
return this.isSale;
}
......@@ -83,60 +103,64 @@ public class MallAgentApplicationQueryItem extends BaseItemClass implements Seri
this.isSale = isSale;
}
/** click_number
*click_number
*/
/**
* click_number
* click_number
*/
private java.lang.Integer clickNumber;
@Column(name = "click_number")
public java.lang.Integer getClickNumber(){
public java.lang.Integer getClickNumber() {
return this.clickNumber;
}
public void setClickNumber(java.lang.Integer clickNumber){
public void setClickNumber(java.lang.Integer clickNumber) {
this.clickNumber = clickNumber;
}
/** is_copy
*is_copy
*/
/**
* is_copy
* is_copy
*/
private java.lang.String isCopy;
@Column(name = "is_copy")
public java.lang.String getIsCopy(){
public java.lang.String getIsCopy() {
return this.isCopy;
}
public void setIsCopy(java.lang.String isCopy){
public void setIsCopy(java.lang.String isCopy) {
this.isCopy = isCopy;
}
/** popularity
*popularity
*/
/**
* popularity
* popularity
*/
private java.lang.Double popularity;
@Column(name = "popularity")
public java.lang.Double getPopularity(){
public java.lang.Double getPopularity() {
return this.popularity;
}
public void setPopularity(java.lang.Double popularity){
public void setPopularity(java.lang.Double popularity) {
this.popularity = popularity;
}
/** agent_id
*agent_id
*/
/**
* agent_id
* agent_id
*/
private java.lang.String agentId;
@Column(name = "agent_id")
public java.lang.String getAgentId(){
public java.lang.String getAgentId() {
return this.agentId;
}
public void setAgentId(java.lang.String agentId){
public void setAgentId(java.lang.String agentId) {
this.agentId = agentId;
}
}
\ No newline at end of file
src/main/java/cn/com/poc/agent_application/rest/BizAgentApplicationMallRest.java
View file @ f2523c9d
package cn.com.poc.agent_application.rest;
import cn.com.poc.agent_application.dto.AgentApplicationMallCategoryDto;
import cn.com.poc.agent_application.dto.AgentApplicationMallQueryDto;
import cn.com.yict.framemax.core.rest.BaseRest;
import cn.com.poc.agent_application.dto.BizAgentApplicationMallDto;
......@@ -55,6 +56,6 @@ public interface BizAgentApplicationMallRest extends BaseRest {
/**
* 获取应用广场分类列表
*/
List<String> getMallCategoryList(HttpServletRequest httpServletRequest) throws Exception;
List<AgentApplicationMallCategoryDto> getMallCategoryList(HttpServletRequest httpServletRequest) throws Exception;
}
\ No newline at end of file
src/main/java/cn/com/poc/agent_application/rest/impl/BizAgentApplicationMallRestImpl.java
View file @ f2523c9d
......@@ -2,6 +2,7 @@ package cn.com.poc.agent_application.rest.impl;
import cn.com.poc.agent_application.aggregate.AgentApplicationMallService;
import cn.com.poc.agent_application.convert.BizAgentApplicationMallConvert;
import cn.com.poc.agent_application.dto.AgentApplicationMallCategoryDto;
import cn.com.poc.agent_application.dto.AgentApplicationMallQueryDto;
import cn.com.poc.agent_application.dto.BizAgentApplicationMallDto;
import cn.com.poc.agent_application.entity.BizAgentApplicationCategoryEntity;
......@@ -52,7 +53,7 @@ public class BizAgentApplicationMallRestImpl implements BizAgentApplicationMallR
public void publishAgentToMall(BizAgentApplicationMallDto dto) throws Exception {
Assert.notNull(dto);
Assert.notNull(dto.getAgentPublishId());
Assert.notNull(dto.getAgentType());
Assert.notNull(dto.getCategoryId());
Assert.notNull(dto.getIsCopy());
BizAgentApplicationPublishEntity publishEntity = bizAgentApplicationPublishService.get(dto.getAgentPublishId());
if (publishEntity == null) {
......@@ -72,7 +73,7 @@ public class BizAgentApplicationMallRestImpl implements BizAgentApplicationMallR
if (mallEntity != null) {
mallEntity.setIsSale(CommonConstant.IsDeleted.Y);
mallEntity.setAgentType(dto.getAgentType());
mallEntity.setCategoryId(dto.getCategoryId());
mallEntity.setIsCopy(dto.getIsCopy());
mallEntity.setCollectNumber(collectEntities.size());
// 如果上架过，则update操作
......@@ -105,6 +106,9 @@ public class BizAgentApplicationMallRestImpl implements BizAgentApplicationMallR
if (StringUtils.isNotBlank(dto.getAgentType())) {
mallAgentApplicationQueryCondition.setAgentType(dto.getAgentType());
}
if (dto.getCategoryId() != null) {
mallAgentApplicationQueryCondition.setCategoryId(dto.getCategoryId());
}
}
List<MallAgentApplicationQueryItem> items = bizAgentApplicationMallService.mallAgentApplicationQuery(mallAgentApplicationQueryCondition, pagingInfo);
......@@ -153,23 +157,30 @@ public class BizAgentApplicationMallRestImpl implements BizAgentApplicationMallR
}
@Override
public List<String> getMallCategoryList(HttpServletRequest httpServletRequest) throws Exception {
List<String> result = new ArrayList<>();
public List<AgentApplicationMallCategoryDto> getMallCategoryList(HttpServletRequest httpServletRequest) throws Exception {
List<AgentApplicationMallCategoryDto> result = new ArrayList<>();
String lang = httpServletRequest.getHeader("x-lang");
if (StringUtils.isEmpty(lang)) {
lang = XLangConstant.ZH_CN;
}
List<BizAgentApplicationCategoryEntity> bizAgentApplicationCategoryEntities = bizAgentApplicationCategoryService.findByExample(new BizAgentApplicationCategoryEntity(), null);
for (BizAgentApplicationCategoryEntity entity : bizAgentApplicationCategoryEntities) {
AgentApplicationMallCategoryDto dto = new AgentApplicationMallCategoryDto();
switch (lang) {
case XLangConstant.EN:
result.add(entity.getCategoryEn());
dto.setId(entity.getId());
dto.setCategoryName(entity.getCategoryEn());
result.add(dto);
break;
case XLangConstant.ZH_CN:
result.add(entity.getCategory());
dto.setId(entity.getId());
dto.setCategoryName(entity.getCategory());
result.add(dto);
break;
case XLangConstant.ZH_TW:
result.add(entity.getCategoryTw());
dto.setId(entity.getId());
dto.setCategoryName(entity.getCategoryTw());
result.add(dto);
break;
default:
throw new I18nMessageException("not support lang");
......
src/main/java/cn/com/poc/common/constant/XLangConstant.java
View file @ f2523c9d
......@@ -5,8 +5,8 @@ package cn.com.poc.common.constant;
*/
public interface XLangConstant {
String ZH_CN = "zh_cn";
String ZH_TW = "zh_tw";
String ZH_CN = "zh-cn";
String ZH_TW = "zh-tw";
String EN = "en";
......
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