From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-store/src/main/java/com/java110/store/cmd/property/ListPropertyCmd.java | 73 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/property/ListPropertyCmd.java b/service-store/src/main/java/com/java110/store/cmd/property/ListPropertyCmd.java
index b38d0f6..5a84840 100644
--- a/service-store/src/main/java/com/java110/store/cmd/property/ListPropertyCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/property/ListPropertyCmd.java
@@ -18,20 +18,23 @@
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.StoreDto;
+import com.java110.intf.store.IStoreInnerServiceSMO;
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 org.springframework.beans.factory.annotation.Autowired;
-import com.java110.dto.store.StoreDto;
-import java.util.List;
-import java.util.ArrayList;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.HttpStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+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;
/**
@@ -45,36 +48,66 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "property.listProperty")
-public class ListPropertyCmd extends AbstractServiceCmdListener {
+public class ListPropertyCmd extends Cmd {
- private static Logger logger = LoggerFactory.getLogger(ListPropertyCmd.class);
+ private static Logger logger = LoggerFactory.getLogger(ListPropertyCmd.class);
+
@Autowired
private IStoreV1InnerServiceSMO storeV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IStoreInnerServiceSMO storeInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
+
+ StoreDto storeDto = new StoreDto();
+ 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");
+ }
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- StoreDto storeDto = BeanConvertUtil.covertBean(reqJson, StoreDto.class);
+ StoreDto storeDto = BeanConvertUtil.covertBean(reqJson, StoreDto.class);
+ storeDto.setUserId("");
+ storeDto.setStoreTypeCd(StoreDto.STORE_TYPE_PROPERTY);
- int count = storeV1InnerServiceSMOImpl.queryStoresCount(storeDto);
+ StoreDto storeDto1 = BeanConvertUtil.covertBean(reqJson, StoreDto.class);
+ storeDto1.setUserId("");
+ storeDto1.setStoreTypeCd(StoreDto.STORE_TYPE_PROPERTY);
- List<StoreDto> storeDtos = null;
+ int count = storeV1InnerServiceSMOImpl.queryStoresCount(storeDto);
- if (count > 0) {
- storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
- } else {
- storeDtos = new ArrayList<>();
- }
+ List<StoreDto> storeDtos = new ArrayList<>();
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, storeDtos);
+ if (count > 0) {
+ List<StoreDto> storeList = storeV1InnerServiceSMOImpl.queryStores(storeDto);
+ List<StoreDto> stores = storeInnerServiceSMOImpl.getStores(storeDto1);
+ for (StoreDto store : storeList) {
+ for (StoreDto store1 : stores) {
+ if (store.getStoreId().equals(store1.getStoreId())) {
+ store.setNearByLandmarks(store1.getNearByLandmarks());
+ }
+ }
+ storeDtos.add(store);
+ }
+// storeDtos = storeV1InnerServiceSMOImpl.queryStores(storeDto);
+ } else {
+ storeDtos = new ArrayList<>();
+ }
- ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, storeDtos);
- cmdDataFlowContext.setResponseEntity(responseEntity);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+
+ cmdDataFlowContext.setResponseEntity(responseEntity);
}
}
--
Gitblit v1.8.0