diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountRest.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountRest.java index 7e28f257..f81b7490 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountRest.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountRest.java @@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + /** * @author shkstart * @create 2023-05-09-9:53 @@ -36,4 +38,10 @@ public class CrawlSalesAmountRest { PagerVo pv = crawlSalesAmountService.listPageVo(pq); return rb.success().setData(pv); } + + @ApiOperation("手动抓取信息") + @RequestMapping("/handCrawl") + public ResultBean handCrawl(@RequestBody Map param){ + return crawlSalesAmountService.handCrawl(param); + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountService.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountService.java index 52803148..c28b904e 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountService.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountService.java @@ -9,11 +9,17 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.dbcenter.zhj.crawl.ZhjSpider; +import com.yxt.supervise.dbcenter.zhj.crawl.biz.crawlSalesDishes.CrawlSalesDishesService; +import com.yxt.supervise.dbcenter.zhj.crawl.biz.crawlpurchase.CrawlPurchaseService; import com.yxt.supervise.dbcenter.zhj.crawl.spider.RespSalesAmount; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.Map; /** * @author shkstart @@ -22,6 +28,11 @@ import java.util.List; @Service public class CrawlSalesAmountService extends ServiceImpl { + @Autowired + private CrawlSalesDishesService crawlSalesDishesService; + @Autowired + private CrawlPurchaseService crawlPurchaseService; + public ResultBean saveCrawlSalesAmount(CrawlSalesAmountDto dto){ ResultBean rb = ResultBean.fireFail(); CrawlSalesAmount amount = new CrawlSalesAmount(); @@ -101,4 +112,24 @@ public class CrawlSalesAmountService extends ServiceImpl param){ + ResultBean rb = ResultBean.fireFail(); + String time = (String)param.get("time"); + Date date = new Date(); + SimpleDateFormat d = new SimpleDateFormat("yyyy-MM-dd"); + if (time.equals(d.format(date))){ + return rb.setMsg("只能抓取今天之前的数据"); + } + if (param.get("salesAmount").toString() != null && !param.get("salesAmount").toString().equals("")){ + pullData(time); + } + if (param.get("purchase").toString() != null && !param.get("purchase").toString().equals("")){ + crawlPurchaseService.pullData(time); + } + if (param.get("salesDishes").toString() != null && !param.get("salesDishes").toString().equals("")){ + crawlSalesDishesService.pullData(time); + } + return rb.success().setMsg("抓取成功"); + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountVo.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountVo.java index 9f40c1d6..0ced439c 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountVo.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/crawlSalesAmount/CrawlSalesAmountVo.java @@ -10,6 +10,8 @@ import io.swagger.annotations.ApiModelProperty; */ @ApiModel(value = "返回值 视图") public class CrawlSalesAmountVo implements Vo { + private String id; + private String sid; @ApiModelProperty("数据日期") private String dataDate; @@ -102,4 +104,20 @@ public class CrawlSalesAmountVo implements Vo { public void setTotalCount(Double totalCount) { this.totalCount = totalCount; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoRest.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoRest.java index 2c4181cd..d7bd77d5 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoRest.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoRest.java @@ -2,6 +2,7 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.dishesInfo; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +45,7 @@ public class DishesInfoRest { @RequestMapping("/selectDishesInfoList") public ResultBean selectDishesInfoList(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - dishesInfoService.listPageVo(pq); - return null; + PagerVo pagerVo = dishesInfoService.listPageVo(pq); + return rb.success().setData(pagerVo); } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoService.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoService.java index ca78339d..8df847cc 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoService.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoService.java @@ -55,15 +55,17 @@ public class DishesInfoService extends MybatisBaseService listPageVo(PagerQuery pq){ + public PagerVo listPageVo(PagerQuery pq){ DishesInfoQuery params = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotNull(params.getName())){ - qw.eq("name",params.getName()); + if(params != null){ + if (StringUtils.isNotNull(params.getName()) && !params.getName().equals("")){ + qw.eq("name",params.getName()); + } } IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPageVo(page, qw); - PagerVo pv = PagerUtil.pageToVo(pagging, null); + PagerVo pv = PagerUtil.pageToVo(pagging, null); return pv; } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoVo.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoVo.java index 0f521167..cdfef2f1 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoVo.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/dishesInfo/DishesInfoVo.java @@ -10,6 +10,8 @@ import io.swagger.annotations.ApiModelProperty; */ @ApiModel(value = "返回值 视图") public class DishesInfoVo implements Vo { + private String id; + private String sid; @ApiModelProperty("菜品编码") private String code; @ApiModelProperty("菜品名称") @@ -50,4 +52,20 @@ public class DishesInfoVo implements Vo { public void setSellingPrice(Double sellingPrice) { this.sellingPrice = sellingPrice; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandMapper.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandMapper.java index 8dc2b3ed..12e5e5ee 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandMapper.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandMapper.java @@ -1,6 +1,10 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpBrand; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.dbcenter.zhj.crawl.biz.dishesInfo.DishesInfo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -11,4 +15,6 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface EnpBrandMapper extends BaseMapper { EnpBrand selectEnpBrandBEnpySid(@Param("sid") String sid); + + IPage listPage(IPage page, @Param(Constants.WRAPPER) Wrapper qw); } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandMapper.xml b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandMapper.xml index a646fe6a..7ce51d45 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandMapper.xml +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandMapper.xml @@ -4,4 +4,12 @@ + + \ No newline at end of file diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandQuery.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandQuery.java new file mode 100644 index 00000000..df1210ae --- /dev/null +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandQuery.java @@ -0,0 +1,21 @@ +package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpBrand; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; + +/** + * @author feikefei + * @create 2023-05-12-9:21 + */ +@ApiModel("企业品牌信息 分页传输对象") +public class EnpBrandQuery implements Query { + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandRest.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandRest.java index fc3901d7..e80c0800 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandRest.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandRest.java @@ -1,6 +1,8 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpBrand; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -38,4 +40,12 @@ public class EnpBrandRest { public ResultBean alterEnpBrand(@RequestBody EnpBrandDto dto){ return enpBrandService.alterEnpBrand(dto); } + + @ApiOperation("查询企业品牌分页") + @RequestMapping("/selectEnpBrandList") + public ResultBean selectEnpBrandList(@RequestBody PagerQuery query){ + ResultBean rb = ResultBean.fireFail(); + PagerVo enpBrandVoPagerVo = enpBrandService.selectEnpBrandList(query); + return rb.success().setData(enpBrandVoPagerVo); + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandService.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandService.java index a16ec196..34982980 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandService.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandService.java @@ -1,9 +1,17 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpBrand; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.PageUtil; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.query.Query; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.dbcenter.zhj.crawl.biz.enpStore.EnpStore; import com.yxt.supervise.dbcenter.zhj.crawl.biz.enpStore.EnpStoreMapper; import org.springframework.beans.factory.annotation.Autowired; @@ -57,4 +65,18 @@ public class EnpBrandService extends MybatisBaseService selectEnpBrandList(PagerQuery query){ + EnpBrandQuery params = query.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (params != null){ + if (StringUtils.isNotNull(params.getName()) && !params.getName().equals("")){ + qw.eq("b.name",params.getName()); + } + } + IPage page = PagerUtil.queryToPage(query); + IPage page1 = baseMapper.listPage(page, qw); + PagerVo pv = PagerUtil.pageToVo(page1, null); + return pv; + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandVo.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandVo.java new file mode 100644 index 00000000..ec9d4339 --- /dev/null +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpBrand/EnpBrandVo.java @@ -0,0 +1,81 @@ +package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpBrand; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author feikefei + * @create 2023-05-12-9:22 + */ +@ApiModel("企业品牌信息 返回视图对象") +public class EnpBrandVo implements Vo { + private String id; + private String sid; + @ApiModelProperty("品牌编码") + private String code; + @ApiModelProperty("品牌名称") + private String name; + @ApiModelProperty("所属企业Sid") + private String enpSid; + @ApiModelProperty("所属企业编码") + private String enpCode; + @ApiModelProperty("所属企业名称") + private String enpName; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEnpSid() { + return enpSid; + } + + public void setEnpSid(String enpSid) { + this.enpSid = enpSid; + } + + public String getEnpCode() { + return enpCode; + } + + public void setEnpCode(String enpCode) { + this.enpCode = enpCode; + } + + public String getEnpName() { + return enpName; + } + + public void setEnpName(String enpName) { + this.enpName = enpName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } +} diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoMapper.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoMapper.java index bb368759..0714624e 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoMapper.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoMapper.java @@ -1,7 +1,11 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpInfo; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * @author shkstart @@ -9,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface EnpInfoMapper extends BaseMapper { + IPage listPage(IPage iPage, @Param(Constants.WRAPPER) Wrapper qw); } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoMapper.xml b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoMapper.xml index 2172d5a2..944306b8 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoMapper.xml +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoMapper.xml @@ -1,5 +1,10 @@ - + \ No newline at end of file diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoQuery.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoQuery.java new file mode 100644 index 00000000..ab0fd010 --- /dev/null +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoQuery.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpInfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author feikefei + * @create 2023-05-12-9:41 + */ +@ApiModel("企业信息 分页") +public class EnpInfoQuery implements Query { + @ApiModelProperty("企业名称") + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoRest.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoRest.java index 5540c9c7..4f23cacf 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoRest.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoRest.java @@ -1,6 +1,9 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpInfo; +import com.baomidou.mybatisplus.extension.api.R; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -38,4 +41,12 @@ public class EnpInfoRest { public ResultBean alterEnpInfo(@RequestBody EnpInfoDto dto){ return enpInfoService.alterEnpInfo(dto); } + + @ApiOperation("查询企业信息分页") + @RequestMapping("/selectEnpInfo") + public ResultBean selectEnpInfo(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo vo = enpInfoService.selectEnpInfo(pq); + return rb.success().setData(vo); + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoService.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoService.java index 29237ea4..799116b1 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoService.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoService.java @@ -1,9 +1,14 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpInfo; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.dbcenter.zhj.crawl.biz.enpBrand.EnpBrand; import com.yxt.supervise.dbcenter.zhj.crawl.biz.enpBrand.EnpBrandMapper; import com.yxt.supervise.dbcenter.zhj.crawl.biz.enpStore.EnpStore; @@ -73,4 +78,18 @@ public class EnpInfoService extends MybatisBaseService{ } return rb.success().setMsg("修改成功"); } + + public PagerVo selectEnpInfo(PagerQuery pq){ + EnpInfoQuery params = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (params != null){ + if (StringUtils.isNotNull(params.getName()) && !params.getName().equals("")){ + qw.eq("name",params.getName()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage iPage = baseMapper.listPage(page, qw); + PagerVo vo = PagerUtil.pageToVo(iPage, null); + return vo; + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoVo.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoVo.java new file mode 100644 index 00000000..5f36c680 --- /dev/null +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpInfo/EnpInfoVo.java @@ -0,0 +1,51 @@ +package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpInfo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author feikefei + * @create 2023-05-12-9:43 + */ +@ApiModel("企业信息 返回视图") +public class EnpInfoVo { + private String id; + private String sid; + + @ApiModelProperty("企业名称") + private String name; + @ApiModelProperty("企业编码") + private String code; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } +} diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreMapper.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreMapper.java index 2f8d0394..3cedf116 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreMapper.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreMapper.java @@ -1,6 +1,9 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpStore; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -13,4 +16,6 @@ public interface EnpStoreMapper extends BaseMapper { EnpStore selectEnpStoreByEnpSid(@Param("sid") String sid); EnpStore selectEnpStoreByBrandSid(@Param("sid") String sid); + + IPage listPage(IPage page, @Param(Constants.WRAPPER) Wrapper qw); } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreMapper.xml b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreMapper.xml index 33471513..64fda465 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreMapper.xml +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreMapper.xml @@ -8,4 +8,11 @@ + + \ No newline at end of file diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreQuery.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreQuery.java new file mode 100644 index 00000000..f5bb4201 --- /dev/null +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreQuery.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpStore; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author feikefei + * @create 2023-05-12-9:53 + */ +@ApiModel("企业门店信息 分页传输对象") +public class EnpStoreQuery implements Query { + @ApiModelProperty("门店名称") + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreRest.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreRest.java index 44c8c179..e74523fa 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreRest.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreRest.java @@ -1,6 +1,8 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpStore; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -38,4 +40,12 @@ public class EnpStoreRest { public ResultBean alterEnpStore(@RequestBody EnpStoreDto dto){ return enpStoreService.alterEnpStore(dto); } + + @ApiOperation("查询企业门店信息分页") + @RequestMapping("/selectEnpStoreList") + public ResultBean selectEnpStoreList(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = enpStoreService.selectEnpStoreList(pq); + return rb.success().setData(pv); + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreService.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreService.java index e3eac574..eb7b3954 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreService.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreService.java @@ -1,8 +1,14 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpStore; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; /** @@ -39,4 +45,18 @@ public class EnpStoreService extends MybatisBaseService selectEnpStoreList(PagerQuery pq){ + EnpStoreQuery params = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (params != null){ + if (StringUtils.isNotNull(params.getName()) && !params.getName().equals("")){ + qw.eq("name",params.getName()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage iPage = baseMapper.listPage(page, qw); + PagerVo pv = PagerUtil.pageToVo(iPage, null); + return pv; + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreVo.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreVo.java new file mode 100644 index 00000000..f18d8119 --- /dev/null +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/enpStore/EnpStoreVo.java @@ -0,0 +1,111 @@ +package com.yxt.supervise.dbcenter.zhj.crawl.biz.enpStore; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author feikefei + * @create 2023-05-12-9:57 + */ +@ApiModel("企业门店信息 返回视图字段") +public class EnpStoreVo implements Vo { + private String id; + private String sid; + @ApiModelProperty("门店编码") + private String code; + @ApiModelProperty("门店名称") + private String name; + @ApiModelProperty("所属企业Sid") + private String enpSid; + @ApiModelProperty("所属企业编码") + private String enpCode; + @ApiModelProperty("所属企业名称") + private String enpName; + @ApiModelProperty("所属品牌Sid") + private String brandSid; + @ApiModelProperty("所属品牌编码") + private String brandCode; + @ApiModelProperty("所属品牌名称") + private String brandName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getEnpSid() { + return enpSid; + } + + public void setEnpSid(String enpSid) { + this.enpSid = enpSid; + } + + public String getEnpCode() { + return enpCode; + } + + public void setEnpCode(String enpCode) { + this.enpCode = enpCode; + } + + public String getEnpName() { + return enpName; + } + + public void setEnpName(String enpName) { + this.enpName = enpName; + } + + public String getBrandSid() { + return brandSid; + } + + public void setBrandSid(String brandSid) { + this.brandSid = brandSid; + } + + public String getBrandCode() { + return brandCode; + } + + public void setBrandCode(String brandCode) { + this.brandCode = brandCode; + } + + public String getBrandName() { + return brandName; + } + + public void setBrandName(String brandName) { + this.brandName = brandName; + } +} diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfo.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfo.java index 3bd2f317..881e88c8 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfo.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfo.java @@ -17,7 +17,7 @@ public class MaterialInfo extends BaseEntity { @ApiModelProperty("规格单位") private String unit; @ApiModelProperty("含税单位") - private String taxPrice; + private Double taxPrice; public String getCode() { return code; @@ -43,11 +43,11 @@ public class MaterialInfo extends BaseEntity { this.unit = unit; } - public String getTaxPrice() { + public Double getTaxPrice() { return taxPrice; } - public void setTaxPrice(String taxPrice) { + public void setTaxPrice(Double taxPrice) { this.taxPrice = taxPrice; } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoDto.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoDto.java index 9bc3037a..39dbe0fe 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoDto.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoDto.java @@ -20,7 +20,7 @@ public class MaterialInfoDto implements Dto { @ApiModelProperty("规格单位") private String unit; @ApiModelProperty("含税单位") - private String taxPrice; + private Double taxPrice; public String getId() { return id; @@ -62,11 +62,11 @@ public class MaterialInfoDto implements Dto { this.unit = unit; } - public String getTaxPrice() { + public Double getTaxPrice() { return taxPrice; } - public void setTaxPrice(String taxPrice) { + public void setTaxPrice(Double taxPrice) { this.taxPrice = taxPrice; } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoMapper.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoMapper.java index 4f713ac0..25b39b3b 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoMapper.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoMapper.java @@ -1,7 +1,12 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.materialInfo; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + /** * @author shkstart @@ -9,4 +14,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface MaterialInfoMapper extends BaseMapper { + IPage listPage(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + void add(MaterialInfo materialInfo); } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoMapper.xml b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoMapper.xml index da31a71b..47d15e9f 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoMapper.xml +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoMapper.xml @@ -1,4 +1,14 @@ + + + + insert into material_info (sid,name,code,unit,taxPrice) values (#{sid},#{name},#{code},#{unit},#{taxPrice}) + \ No newline at end of file diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoQuery.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoQuery.java new file mode 100644 index 00000000..6085df9b --- /dev/null +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoQuery.java @@ -0,0 +1,23 @@ +package com.yxt.supervise.dbcenter.zhj.crawl.biz.materialInfo; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author feikefei + * @create 2023-05-12-10:15 + */ +@ApiModel("物料信息 分页传输对象") +public class MaterialInfoQuery implements Query { + @ApiModelProperty("物料名称") + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoRest.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoRest.java index 810adc62..5ab2bffc 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoRest.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoRest.java @@ -1,6 +1,8 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.materialInfo; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -38,4 +40,12 @@ public class MaterialInfoRest { public ResultBean alterMaterialInfo(@RequestBody MaterialInfoDto dto){ return materialInfoService.alterMaterialInfo(dto); } + + @ApiOperation("查询物料信息 分页") + @RequestMapping("/selectMaterialInfoList") + public ResultBean selectMaterialInfoList(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = materialInfoService.selectMaterialInfoList(pq); + return rb.success().setData(pv); + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoService.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoService.java index 40807263..f44f5cf9 100644 --- a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoService.java +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoService.java @@ -1,10 +1,18 @@ package com.yxt.supervise.dbcenter.zhj.crawl.biz.materialInfo; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; + + /** * @author shkstart * @create 2023-05-11-11:34 @@ -39,4 +47,18 @@ public class MaterialInfoService extends MybatisBaseService selectMaterialInfoList(PagerQuery pq){ + MaterialInfoQuery params = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (params != null){ + if (StringUtils.isNotNull(params.getName()) && !params.getName().equals("")){ + qw.eq("name",params.getName()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage iPage = baseMapper.listPage(page, qw); + PagerVo pv = PagerUtil.pageToVo(iPage, null); + return pv; + } } diff --git a/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoVo.java b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoVo.java new file mode 100644 index 00000000..4c31633e --- /dev/null +++ b/yxt-supervise-dbcenter/yxt-supervise-dbcenter-biz/src/main/java/com/yxt/supervise/dbcenter/zhj/crawl/biz/materialInfo/MaterialInfoVo.java @@ -0,0 +1,72 @@ +package com.yxt.supervise.dbcenter.zhj.crawl.biz.materialInfo; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +/** + * @author feikefei + * @create 2023-05-12-10:18 + */ +@ApiModel("物料信息 返回视图字段") +public class MaterialInfoVo implements Vo { + private String id; + private String sid; + + @ApiModelProperty("物料编码") + private String code; + @ApiModelProperty("物料名称") + private String name; + @ApiModelProperty("规格单位") + private String unit; + @ApiModelProperty("含税单位") + private Double taxPrice; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + + public Double getTaxPrice() { + return taxPrice; + } + + public void setTaxPrice(Double taxPrice) { + this.taxPrice = taxPrice; + } +}