From 3fe2aea7827eafc7513159db9a337fdf567584c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 08 五月 2023 01:21:13 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/MeterMachineV1InnerServiceSMOImpl.java | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/MeterMachineV1InnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/MeterMachineV1InnerServiceSMOImpl.java
index b451e0d..d223e2b 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/MeterMachineV1InnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/MeterMachineV1InnerServiceSMOImpl.java
@@ -16,9 +16,10 @@
package com.java110.common.smo.impl;
-import com.java110.common.SmartMeter.ISmartMeterFactoryAdapt;
+import com.java110.common.smartMeter.ISmartMeterFactoryAdapt;
import com.java110.common.dao.IMeterMachineV1ServiceDao;
-import com.java110.dto.meterMachineFactory.MeterMachineFactoryDto;
+import com.java110.core.log.LoggerFactory;
+import com.java110.dto.meterMachine.MeterMachineFactoryDto;
import com.java110.intf.common.IMeterMachineFactoryV1InnerServiceSMO;
import com.java110.intf.common.IMeterMachineV1InnerServiceSMO;
import com.java110.dto.meterMachine.MeterMachineDto;
@@ -28,15 +29,18 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
import com.java110.dto.PageDto;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
+import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* 绫昏〃杩帮細 鏈嶅姟涔嬪墠璋冪敤鐨勬帴鍙ｅ疄鐜扮被锛屼笉瀵瑰鎻愪緵鎺ュ彛鑳藉姏 鍙敤浜庢帴鍙ｅ缓璋冪敤
@@ -49,6 +53,8 @@
@RestController
public class MeterMachineV1InnerServiceSMOImpl extends BaseServiceSMO implements IMeterMachineV1InnerServiceSMO {
+ private Logger logger = LoggerFactory.getLogger(MeterMachineV1InnerServiceSMOImpl.class);
+
@Autowired
private IMeterMachineV1ServiceDao meterMachineV1ServiceDaoImpl;
@@ -57,26 +63,26 @@
@Override
- public int saveMeterMachine(@RequestBody MeterMachinePo meterMachinePo) {
+ public int saveMeterMachine(@RequestBody MeterMachinePo meterMachinePo) {
int saveFlag = meterMachineV1ServiceDaoImpl.saveMeterMachineInfo(BeanConvertUtil.beanCovertMap(meterMachinePo));
return saveFlag;
}
- @Override
- public int updateMeterMachine(@RequestBody MeterMachinePo meterMachinePo) {
+ @Override
+ public int updateMeterMachine(@RequestBody MeterMachinePo meterMachinePo) {
int saveFlag = meterMachineV1ServiceDaoImpl.updateMeterMachineInfo(BeanConvertUtil.beanCovertMap(meterMachinePo));
return saveFlag;
}
- @Override
- public int deleteMeterMachine(@RequestBody MeterMachinePo meterMachinePo) {
- meterMachinePo.setStatusCd("1");
- int saveFlag = meterMachineV1ServiceDaoImpl.updateMeterMachineInfo(BeanConvertUtil.beanCovertMap(meterMachinePo));
- return saveFlag;
+ @Override
+ public int deleteMeterMachine(@RequestBody MeterMachinePo meterMachinePo) {
+ meterMachinePo.setStatusCd("1");
+ int saveFlag = meterMachineV1ServiceDaoImpl.updateMeterMachineInfo(BeanConvertUtil.beanCovertMap(meterMachinePo));
+ return saveFlag;
}
@Override
- public List<MeterMachineDto> queryMeterMachines(@RequestBody MeterMachineDto meterMachineDto) {
+ public List<MeterMachineDto> queryMeterMachines(@RequestBody MeterMachineDto meterMachineDto) {
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
@@ -94,7 +100,8 @@
@Override
public int queryMeterMachinesCount(@RequestBody MeterMachineDto meterMachineDto) {
- return meterMachineV1ServiceDaoImpl.queryMeterMachinesCount(BeanConvertUtil.beanCovertMap(meterMachineDto)); }
+ return meterMachineV1ServiceDaoImpl.queryMeterMachinesCount(BeanConvertUtil.beanCovertMap(meterMachineDto));
+ }
@Override
public ResultVo reChargeMeterMachines(@RequestBody MeterMachineDto meterMachineDto) {
@@ -102,15 +109,59 @@
MeterMachineFactoryDto meterMachineFactoryDto = new MeterMachineFactoryDto();
meterMachineFactoryDto.setFactoryId(meterMachineDto.getImplBean());
List<MeterMachineFactoryDto> meterMachineFactoryDtos = meterMachineFactoryV1InnerServiceSMOImpl.queryMeterMachineFactorys(meterMachineFactoryDto);
- Assert.listOnlyOne(meterMachineFactoryDtos,"鏅鸿兘姘寸數琛ㄥ巶瀹朵笉瀛樺湪");
+ Assert.listOnlyOne(meterMachineFactoryDtos, "鏅鸿兘姘寸數琛ㄥ巶瀹朵笉瀛樺湪");
ISmartMeterFactoryAdapt smartMeterFactoryAdapt = ApplicationContextFactory.getBean(meterMachineFactoryDtos.get(0).getBeanImpl(), ISmartMeterFactoryAdapt.class);
- if(smartMeterFactoryAdapt == null){
+ if (smartMeterFactoryAdapt == null) {
throw new CmdException("鍘傚鎺ュ彛鏈疄鐜�");
}
// 閫氱煡 鍘傚閫傞厤鍣ㄦ暟鎹�
- ResultVo resultVo = smartMeterFactoryAdapt.requestRecharge(meterMachineDto,meterMachineDto.getRechargeDegree());
+ ResultVo resultVo = smartMeterFactoryAdapt.requestRecharge(meterMachineDto, meterMachineDto.getRechargeDegree(),meterMachineDto.getRechargeMoney());
return resultVo;
}
+ @Override
+ public ResultVo requestReads(@RequestBody List<MeterMachineDto> meterMachineDtos) {
+
+ Map<String, List<MeterMachineDto>> maps = new HashMap<>();
+
+ List<MeterMachineDto> tmpMeterMachineDtos = null;
+
+ for (MeterMachineDto meterMachineDto : meterMachineDtos) {
+ if (StringUtil.isEmpty(meterMachineDto.getImplBean())) {
+ continue;
+ }
+ if (maps.containsKey(meterMachineDto.getImplBean())) {
+ tmpMeterMachineDtos = maps.get(meterMachineDto.getImplBean());
+ tmpMeterMachineDtos.add(meterMachineDto);
+ continue;
+ }
+ tmpMeterMachineDtos = new ArrayList<>();
+ tmpMeterMachineDtos.add(meterMachineDto);
+ maps.put(meterMachineDto.getImplBean(), tmpMeterMachineDtos);
+ }
+
+ for (String implBean : maps.keySet()) {
+ MeterMachineFactoryDto meterMachineFactoryDto = new MeterMachineFactoryDto();
+ meterMachineFactoryDto.setFactoryId(implBean);
+ List<MeterMachineFactoryDto> meterMachineFactoryDtos = meterMachineFactoryV1InnerServiceSMOImpl.queryMeterMachineFactorys(meterMachineFactoryDto);
+ Assert.listOnlyOne(meterMachineFactoryDtos, "鏅鸿兘姘寸數琛ㄥ巶瀹朵笉瀛樺湪");
+ ISmartMeterFactoryAdapt smartMeterFactoryAdapt = ApplicationContextFactory.getBean(meterMachineFactoryDtos.get(0).getBeanImpl(), ISmartMeterFactoryAdapt.class);
+ if (smartMeterFactoryAdapt == null) {
+ continue;
+ }
+ ResultVo resultVo = smartMeterFactoryAdapt.requestReads(maps.get(implBean));
+ logger.debug("鎶勮〃杩斿洖锛寋}", resultVo.toString());
+ }
+
+ return new ResultVo(ResultVo.CODE_OK, ResultVo.MSG_OK);
+ }
+
+ @Override
+ public int settingMeterMachineRead(@RequestBody MeterMachinePo meterMachinePo) {
+ int saveFlag = meterMachineV1ServiceDaoImpl.settingMeterMachineRead(BeanConvertUtil.beanCovertMap(meterMachinePo));
+ return saveFlag;
+ }
+
+
}
--
Gitblit v1.8.0