From 287a115f0006cc7ed4d5bd8b6418d89d46be9db5 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 26 七月 2024 13:39:51 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java | 88 ++------------------------------------------
1 files changed, 4 insertions(+), 84 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java
index 567247d..7e8445b 100644
--- a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/ListChargeMachineCmd.java
@@ -25,6 +25,7 @@
import com.java110.dto.wechat.SmallWeChatDto;
import com.java110.intf.common.IChargeMachineV1InnerServiceSMO;
import com.java110.intf.common.IChargeRuleFeeV1InnerServiceSMO;
+import com.java110.intf.job.IIotInnerServiceSMO;
import com.java110.intf.store.ISmallWeChatInnerServiceSMO;
import com.java110.utils.cache.UrlCache;
import com.java110.utils.exception.CmdException;
@@ -58,16 +59,7 @@
private static Logger logger = LoggerFactory.getLogger(ListChargeMachineCmd.class);
@Autowired
- private IChargeMachineV1InnerServiceSMO chargeMachineV1InnerServiceSMOImpl;
-
- @Autowired
- private ISmallWeChatInnerServiceSMO smallWeChatInnerServiceSMOImpl;
-
- @Autowired
- private IChargeRuleFeeV1InnerServiceSMO chargeRuleFeeV1InnerServiceSMOImpl;
-
- @Autowired
- private IChargeCore chargeCoreImpl;
+ private IIotInnerServiceSMO iotInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -78,82 +70,10 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- ChargeMachineDto chargeMachineDto = BeanConvertUtil.covertBean(reqJson, ChargeMachineDto.class);
-
- int count = chargeMachineV1InnerServiceSMOImpl.queryChargeMachinesCount(chargeMachineDto);
-
- List<ChargeMachineDto> chargeMachineDtos = null;
-
- if (count > 0) {
- chargeMachineDtos = chargeMachineV1InnerServiceSMOImpl.queryChargeMachines(chargeMachineDto);
- freshQrCodeUrl(chargeMachineDtos);
-
- // todo 鏌ヨ璁惧鏄惁鍦ㄧ嚎
- queryMachineState(chargeMachineDtos);
-
- // todo 鍒峰叆绠楄垂瑙勫垯
- queryChargeRuleFee(chargeMachineDtos);
- } else {
- chargeMachineDtos = new ArrayList<>();
- }
-
- ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, chargeMachineDtos);
-
+ reqJson.put("iotApiCode", "listChargeMachineBmoImpl");
+ ResultVo resultVo = iotInnerServiceSMOImpl.postIot(reqJson);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
cmdDataFlowContext.setResponseEntity(responseEntity);
- }
-
- private void queryChargeRuleFee(List<ChargeMachineDto> chargeMachineDtos) {
- if (chargeMachineDtos == null || chargeMachineDtos.size() != 1) {
- return;
- }
-
- ChargeRuleFeeDto chargeRuleFeeDto = new ChargeRuleFeeDto();
- chargeRuleFeeDto.setRuleId(chargeMachineDtos.get(0).getRuleId());
- chargeRuleFeeDto.setCommunityId(chargeMachineDtos.get(0).getCommunityId());
- List<ChargeRuleFeeDto> fees = chargeRuleFeeV1InnerServiceSMOImpl.queryChargeRuleFees(chargeRuleFeeDto);
-
- chargeMachineDtos.get(0).setFees(fees);
-
- }
-
- private void queryMachineState(List<ChargeMachineDto> chargeMachineDtos) {
-
- if (chargeMachineDtos == null || chargeMachineDtos.size() < 1 || chargeMachineDtos.size() > 10) {
- return;
- }
-
- chargeCoreImpl.queryChargeMachineState(chargeMachineDtos);
- }
-
- /**
- * 鍏呯數妗╀簩缁寸爜
- *
- * @param chargeMachineDtos
- */
- private void freshQrCodeUrl(List<ChargeMachineDto> chargeMachineDtos) {
-
- if (chargeMachineDtos == null || chargeMachineDtos.size() < 1) {
- return;
- }
-
- SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
- smallWeChatDto.setObjId(chargeMachineDtos.get(0).getCommunityId());
- smallWeChatDto.setWeChatType(SmallWeChatDto.WECHAT_TYPE_PUBLIC);
- List<SmallWeChatDto> smallWeChatDtos = smallWeChatInnerServiceSMOImpl.querySmallWeChats(smallWeChatDto);
- String appId = "";
- if (smallWeChatDtos != null && smallWeChatDtos.size() > 0) {
- appId = smallWeChatDtos.get(0).getAppId();
- }
- String ownerUrl = UrlCache.getOwnerUrl();
-
- for (ChargeMachineDto chargeMachineDto : chargeMachineDtos) {
- chargeMachineDto.setQrCode(ownerUrl + "/#/pages/machine/machineToCharge?machineId="
- + chargeMachineDto.getMachineId()
- + "&communityId=" + chargeMachineDto.getCommunityId()
- + "&wAppId=" + appId
- );
- }
}
}
--
Gitblit v1.8.0