From 7b578f8330cf25fe4a914436d45c355972190146 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 27 Dec 2020 15:21:46 +0800
Subject: [PATCH] finish

---
 zq-erp/src/main/java/com/matrix/system/app/mapper/SysStoreInfoMapper.java |   26 ++++++++
 zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java     |   50 ++++++++++++++++
 zq-erp/src/main/java/com/matrix/system/app/vo/StoreListVo.java            |   67 ++++++++++++++++++++++
 zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml         |    1 
 zq-erp/src/main/java/com/matrix/system/app/dto/BasePageDto.java           |    4 
 zq-erp/src/main/java/com/matrix/system/app/dto/StoreListDto.java          |   23 +++++++
 6 files changed, 169 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java
index 4df3fd4..6df035b 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/action/ApiStoreAction.java
@@ -1,15 +1,65 @@
 package com.matrix.system.app.action;
 
+import com.matrix.core.constance.MatrixConstance;
 import com.matrix.core.pojo.AjaxResult;
+import com.matrix.core.pojo.PaginationVO;
+import com.matrix.core.tools.WebUtil;
+import com.matrix.system.app.dto.StoreListDto;
+import com.matrix.system.app.mapper.SysStoreInfoMapper;
+import com.matrix.system.app.vo.StoreListVo;
+import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.tools.DataAuthUtil;
+import com.matrix.system.hive.bean.SysStoreInfo;
+import com.matrix.system.hive.dao.SysStoreInfoDao;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * @author wzy
  * @date 2020-12-27
  **/
 @Api(value = "ApiStoreAction", tags = "库存管理接口类")
+@RestController
 @RequestMapping(value = "/api/store")
 public class ApiStoreAction {
 
+    @Autowired
+    private SysStoreInfoDao sysStoreInfoDao;
+
+    @ApiOperation(value = "获取库存列表", notes = "获取库存列表")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "ok", response = StoreListVo.class)
+    })
+    @PostMapping(value = "/findStoreList")
+    public AjaxResult findStoreList(@RequestBody @Validated StoreListDto storeListDto) {
+        SysStoreInfo sysStoreInfo = new SysStoreInfo();
+
+        if (!DataAuthUtil.hasAllShopAuth()) {
+            SysUsers users = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
+            sysStoreInfo.setShopId(users.getShopId());
+            sysStoreInfo.setCompanyId(users.getCompanyId());
+        }
+
+        PaginationVO pageVo = new PaginationVO();
+        pageVo.setOffset((storeListDto.getPageNum() - 1) * storeListDto.getPageSize());
+        pageVo.setLimit(storeListDto.getPageSize());
+        pageVo.setSort("c.goods_no");
+        pageVo.setOrder("asc");
+
+        List<SysStoreInfo> dataList = sysStoreInfoDao.selectCountInPage(sysStoreInfo, pageVo);
+        List<StoreListVo> resultList = SysStoreInfoMapper.INSTANCE.entitiesToStoreVos(dataList);
+
+        return new AjaxResult(AjaxResult.STATUS_SUCCESS,  resultList, sysStoreInfoDao.selectCountTotalRecord(sysStoreInfo));
+    }
+
 }
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/BasePageDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/BasePageDto.java
index bab4e93..971f729 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/dto/BasePageDto.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/BasePageDto.java
@@ -13,11 +13,11 @@
 public class BasePageDto {
 
     @NotNull(message = "参数不能为空")
-    @ApiModelProperty(value = "第几页")
+    @ApiModelProperty(value = "第几页", example = "1")
     private Integer pageNum;
 
     @NotNull(message = "参数不能为空")
-    @ApiModelProperty(value ="数量")
+    @ApiModelProperty(value ="数量", example = "10")
     private Integer pageSize;
 
     public Integer getPageNum() {
diff --git a/zq-erp/src/main/java/com/matrix/system/app/dto/StoreListDto.java b/zq-erp/src/main/java/com/matrix/system/app/dto/StoreListDto.java
new file mode 100644
index 0000000..ee535e4
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/dto/StoreListDto.java
@@ -0,0 +1,23 @@
+package com.matrix.system.app.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author wzy
+ * @date 2020-12-27
+ **/
+@ApiModel(value = "StoreListDto", description = "库存列表参数接收类")
+public class StoreListDto extends BasePageDto {
+
+    @ApiModelProperty(value = "查询参数")
+    private String queryKey;
+
+    public String getQueryKey() {
+        return queryKey;
+    }
+
+    public void setQueryKey(String queryKey) {
+        this.queryKey = queryKey;
+    }
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/mapper/SysStoreInfoMapper.java b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysStoreInfoMapper.java
new file mode 100644
index 0000000..b8a0719
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/mapper/SysStoreInfoMapper.java
@@ -0,0 +1,26 @@
+package com.matrix.system.app.mapper;
+
+import com.matrix.system.app.vo.StoreListVo;
+import com.matrix.system.hive.bean.SysStoreInfo;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.factory.Mappers;
+
+import java.util.List;
+
+/**
+ * @author wzy
+ * @date 2020-12-27
+ **/
+@Mapper
+public abstract class SysStoreInfoMapper {
+    public static final SysStoreInfoMapper INSTANCE = Mappers.getMapper(SysStoreInfoMapper.class);
+
+    @Mapping(target = "goodsName", source = "goods.name")
+    @Mapping(target = "goodsCode", source = "goods.code")
+    @Mapping(target = "alarmNum", source = "goods.alarmNum")
+    @Mapping(target = "img", source = "goods.img")
+    public abstract StoreListVo entityToStoreVo(SysStoreInfo sysStoreInfo);
+
+    public abstract List<StoreListVo> entitiesToStoreVos(List<SysStoreInfo> list);
+}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/StoreListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/StoreListVo.java
new file mode 100644
index 0000000..954964b
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/StoreListVo.java
@@ -0,0 +1,67 @@
+package com.matrix.system.app.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @author wzy
+ * @date 2020-12-27
+ **/
+@ApiModel(value = "StoreListVo", description = "库存列表返回参数类")
+public class StoreListVo {
+
+    @ApiModelProperty(value = "商品名称")
+    private String goodsName;
+
+    @ApiModelProperty(value = "商品编号")
+    private String goodsCode;
+
+    @ApiModelProperty(value = "在库数量")
+    private Integer storeTotal;
+
+    @ApiModelProperty(value = "警戒值")
+    private Integer alarmNum;
+
+    @ApiModelProperty(value = "图片")
+    private String img;
+
+    public String getGoodsName() {
+        return goodsName;
+    }
+
+    public void setGoodsName(String goodsName) {
+        this.goodsName = goodsName;
+    }
+
+    public String getGoodsCode() {
+        return goodsCode;
+    }
+
+    public void setGoodsCode(String goodsCode) {
+        this.goodsCode = goodsCode;
+    }
+
+    public Integer getStoreTotal() {
+        return storeTotal;
+    }
+
+    public void setStoreTotal(Integer storeTotal) {
+        this.storeTotal = storeTotal;
+    }
+
+    public Integer getAlarmNum() {
+        return alarmNum;
+    }
+
+    public void setAlarmNum(Integer alarmNum) {
+        this.alarmNum = alarmNum;
+    }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
+}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
index 8a8975c..6f41218 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysStoreInfoDao.xml
@@ -388,6 +388,7 @@
 		c.volume as gs_volume,
 		c.price as gs_price,
 		c.wholesale as gs_wholesale,
+		c.img as gs_img,
 		a.shop_id,
 		a.company_id
 		from

--
Gitblit v1.9.1