diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java index 23ba282fb..f0af4a8ef 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java @@ -39,14 +39,13 @@ public class WxBusinessController extends BaseController { final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); return new ResultData(page); } - + @ApiOperation("业态全列表接口") @GetMapping("allist") @SystemControllerLog(description = "业态-全列表") - public ResultData getAllList() { + public ResultData listAll() { logger.debug("[" + getIpAddr() + "] WxBusinessController::getList"); - WxBusiness wxBusiness = new WxBusiness(); - final List busList = wxBusinessService.getList(wxBusiness); + final List busList = wxBusinessService.findListAll(); return new ResultData(busList); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java index 8f4b2fef3..8d8254712 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxBusinessController.java @@ -43,9 +43,8 @@ public class WxBusinessController extends BaseController { @ApiOperation("业态全列表接口") @GetMapping("allist") - public ResultData getAllList(@ModelAttribute WxBusiness wxBusiness) { - if (null == wxBusiness) wxBusiness = new WxBusiness(); - final List busList = wxBusinessService.getList(wxBusiness); + public ResultData listAll(@ModelAttribute WxBusiness wxBusiness) { + final List busList = wxBusinessService.findListAll(); return new ResultData(busList); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxSubBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxSubBusiness.java new file mode 100644 index 000000000..d42e32e4f --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxSubBusiness.java @@ -0,0 +1,163 @@ +package com.iformall.domain.po; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Table(name = "wx_sub_business") +public class WxSubBusiness implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Integer id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*子业态名**/ + @io.swagger.annotations.ApiModelProperty(value="子业态名",name="title") + private String title; + + /*业态ID**/ + @io.swagger.annotations.ApiModelProperty(value="业态ID",name="businessId") + private Integer businessId; + + /*业态名**/ + @io.swagger.annotations.ApiModelProperty(value="业态名",name="businessTitle") + private String businessTitle; + + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + + public String getTitle() { + return title; + } + public void setTitle(String _title) { + title = _title; + } + + public Integer getBusinessId() { + return businessId; + } + + public void setBusinessId(Integer businessId) { + this.businessId = businessId; + } + + public String getBusinessTitle() { + return businessTitle; + } + + public void setBusinessTitle(String businessTitle) { + this.businessTitle = businessTitle; + } + + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") + ,BusinessId_ASC("`business_id` ASC"),BusinessId_DESC("`business_id` DESC") + ,BusinessTitle_ASC("`business_title` ASC"),BusinessTitle_DESC("`business_title` DESC") + ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") + ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + this.sortColumns = sb.toString(); + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java index 7c4274677..13c167507 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java @@ -7,10 +7,7 @@ import com.iformall.domain.po.WxBusiness; public interface WxBusinessMapper extends CommonMapper { List findList(WxBusiness wxBusiness); - - - - - + List findListAll(); + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxSubBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxSubBusinessMapper.java new file mode 100644 index 000000000..58ddd2cf2 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxSubBusinessMapper.java @@ -0,0 +1,14 @@ +package com.iformall.mapper; + +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxSubBusiness; + +import java.util.List; + +public interface WxSubBusinessMapper extends CommonMapper { + + List findList(WxSubBusiness wxSubBusiness); + + List findListAll(); + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java index b656ef289..f62e0674b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessService.java @@ -23,7 +23,14 @@ public interface WxBusinessService { * @param record * @return */ - List getList(WxBusiness record); + List findList(WxBusiness record); + + /** + * 查询全部列表 + * + * @return + */ + List findListAll(); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/WxSubBusinessService.java b/mallinkService/src/main/java/com/iformall/service/WxSubBusinessService.java new file mode 100644 index 000000000..8b9ac1af5 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/WxSubBusinessService.java @@ -0,0 +1,44 @@ +package com.iformall.service; + +import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.WxSubBusiness; + +import java.util.List; + +public interface WxSubBusinessService { + + /** + * 根据实体查询分页列表 + * + * @param record + * @param pageIndex + * @param pageSize + * @return + */ + PageInfo listAsPage(WxSubBusiness record, Integer pageIndex, Integer pageSize); + + /** + * 根据实体查询列表 + * + * @param record + * @return + */ + List findList(WxSubBusiness record); + + /** + * 查询全部列表 + * + * @return + */ + List findListAll(); + + /** + * 根据Id获得实体 + * + * @param id + * @return + */ + WxSubBusiness getById(Integer id); + + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index 9f824ecca..896be04f8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -25,10 +25,16 @@ public class WxBusinessServiceImpl implements WxBusinessService { } @Override - public List getList(WxBusiness record) { + public List findList(WxBusiness record) { return wxBusinessMapper.findList(record); } + @Override + public List findListAll() { + return wxBusinessMapper.findListAll(); + } + + @Override public WxBusiness getById(Integer id) { return wxBusinessMapper.selectByPrimaryKey(id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxSubBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxSubBusinessServiceImpl.java new file mode 100644 index 000000000..53f3d1d0b --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxSubBusinessServiceImpl.java @@ -0,0 +1,47 @@ +package com.iformall.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.WxBusiness; +import com.iformall.domain.po.WxSubBusiness; +import com.iformall.mapper.WxBusinessMapper; +import com.iformall.mapper.WxSubBusinessMapper; +import com.iformall.service.WxBusinessService; +import com.iformall.service.WxSubBusinessService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class WxSubBusinessServiceImpl implements WxSubBusinessService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxSubBusinessMapper wxSubBusinessMapper; + + @Override + public PageInfo listAsPage(WxSubBusiness record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxSubBusinessMapper.findList(record)); + } + + @Override + public List findList(WxSubBusiness record) { + return wxSubBusinessMapper.findList(record); + } + + @Override + public List findListAll() { + return wxSubBusinessMapper.findListAll(); + } + + + @Override + public WxSubBusiness getById(Integer id) { + return wxSubBusinessMapper.selectByPrimaryKey(id); + } + + +} diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index 174f55950..d599e0233 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -48,7 +48,11 @@ select from wx_business - + + diff --git a/mallinkService/src/main/resources/mapper/WxSubBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxSubBusinessMapper.xml new file mode 100644 index 000000000..fbcfb05a2 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxSubBusinessMapper.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + `id`,`title`,`business_id`,`business_title`,`create_date`,`update_date` + + + + where 1 = 1 + + + and `id` = #{id} + + + + and `title` like concat('%', #{title},'%') + + + + and `business_id` = #{businessId} + + + + and `business_title` like concat('%', #{businessTitle},'%') + + + + and `create_date` = #{createDate} + + + + and `update_date` = #{updateDate} + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + +