From 7cee6151b42670dbcd8c08fb4716c8d9414a951b Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 02 十二月 2022 19:00:34 +0800
Subject: [PATCH] 优化代码

---
 service-store/src/main/java/com/java110/store/cmd/store/ListStoresCmd.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/service-store/src/main/java/com/java110/store/cmd/store/ListStoresCmd.java b/service-store/src/main/java/com/java110/store/cmd/store/ListStoresCmd.java
index 22226fd..30a31d3 100644
--- a/service-store/src/main/java/com/java110/store/cmd/store/ListStoresCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/store/ListStoresCmd.java
@@ -3,23 +3,25 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.dto.store.StoreAttrDto;
 import com.java110.dto.store.StoreDto;
 import com.java110.intf.store.IStoreAttrV1InnerServiceSMO;
 import com.java110.intf.store.IStoreV1InnerServiceSMO;
 import com.java110.utils.exception.CmdException;
-import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
 import com.java110.vo.api.store.ApiStoreDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Java110Cmd(serviceCode = "store.listStores")
-public class ListStoresCmd extends AbstractServiceCmdListener {
+public class ListStoresCmd extends Cmd {
 
     @Autowired
     private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
@@ -34,8 +36,6 @@
         storeDto.setStoreId(reqJson.getString("storeId"));
         List<StoreDto> storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
 
-        Assert.listOnlyOne(storeDtos, "闈炴硶鎿嶄綔");
-
         //鍙湁杩愯惀鍙互鐪嬫墍鏈� 鍟嗘埛淇℃伅
         if (StoreDto.STORE_TYPE_ADMIN.equals(storeDtos.get(0).getStoreTypeCd())) {
             reqJson.remove("storeId");
@@ -46,16 +46,22 @@
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
         StoreDto storeDto = BeanConvertUtil.covertBean(reqJson, StoreDto.class);
         storeDto.setUserId("");
-        int storeCount = storeV1InnerServiceSMOImpl.queryStoresCount(storeDto);
+        int count = storeV1InnerServiceSMOImpl.queryStoresCount(storeDto);
         List<StoreDto> storeDtos = null;
         List<ApiStoreDataVo> stores = null;
-        if (storeCount > 0) {
+        if (count > 0) {
             storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
             stores = BeanConvertUtil.covertBeanList(storeDtos, ApiStoreDataVo.class);
             refreshStoreAttr(stores);
         } else {
             stores = new ArrayList<>();
         }
+
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, stores);
+
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 
 

--
Gitblit v1.8.0