From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/maintainancePlan/SaveMaintainancePlanMachineCmd.java | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/maintainancePlan/SaveMaintainancePlanMachineCmd.java b/service-community/src/main/java/com/java110/community/cmd/maintainancePlan/SaveMaintainancePlanMachineCmd.java
index c2e552e..4b3fcb9 100644
--- a/service-community/src/main/java/com/java110/community/cmd/maintainancePlan/SaveMaintainancePlanMachineCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/maintainancePlan/SaveMaintainancePlanMachineCmd.java
@@ -15,6 +15,7 @@
*/
package com.java110.community.cmd.maintainancePlan;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
@@ -22,6 +23,10 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.equipmentAccount.EquipmentAccountDto;
+import com.java110.dto.maintainancePlanMachine.MaintainancePlanMachineDto;
+import com.java110.dto.maintainanceStandardItem.MaintainanceStandardItemDto;
+import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
import com.java110.intf.community.IMaintainancePlanMachineV1InnerServiceSMO;
import com.java110.po.maintainancePlanMachine.MaintainancePlanMachinePo;
import com.java110.utils.exception.CmdException;
@@ -31,6 +36,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.util.List;
/**
* 绫昏〃杩帮細淇濆瓨
@@ -52,25 +59,65 @@
@Autowired
private IMaintainancePlanMachineV1InnerServiceSMO maintainancePlanMachineV1InnerServiceSMOImpl;
+ @Autowired
+ private IEquipmentAccountV1InnerServiceSMO equipmentAccountV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "planId", "璇锋眰鎶ユ枃涓湭鍖呭惈planId");
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
- Assert.hasKeyAndValue(reqJson, "machineId", "璇锋眰鎶ユ枃涓湭鍖呭惈machineId");
- Assert.hasKeyAndValue(reqJson, "machineName", "璇锋眰鎶ユ枃涓湭鍖呭惈machineName");
+ if(!reqJson.containsKey("machines")){
+ throw new CmdException("鏈寘鍚繚鍏昏澶�");
+ }
+
+ JSONArray items = reqJson.getJSONArray("machines");
+
+ if(items.size() < 1){
+ throw new CmdException("鏈寘鍚繚鍏昏澶�");
+ }
+ String machineId = "";
+ MaintainancePlanMachineDto maintainancePlanMachineDto = new MaintainancePlanMachineDto();
+ maintainancePlanMachineDto.setPlanId(reqJson.getString("planId"));
+ List<MaintainancePlanMachineDto> maintainancePlanMachineDtos = null;
+ for(int itemIndex = 0; itemIndex < items.size(); itemIndex++) {
+ machineId = items.getString(itemIndex);
+ maintainancePlanMachineDto.setMachineId(machineId);
+ maintainancePlanMachineDtos = maintainancePlanMachineV1InnerServiceSMOImpl.queryMaintainancePlanMachines(maintainancePlanMachineDto);
+
+ if (maintainancePlanMachineDtos != null && maintainancePlanMachineDtos.size() >0) {
+ throw new CmdException(maintainancePlanMachineDtos.get(0).getMachineName()+"宸茬粡娣诲姞");
+ }
+ }
}
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- MaintainancePlanMachinePo maintainancePlanMachinePo = BeanConvertUtil.covertBean(reqJson, MaintainancePlanMachinePo.class);
- maintainancePlanMachinePo.setMpmId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
- int flag = maintainancePlanMachineV1InnerServiceSMOImpl.saveMaintainancePlanMachine(maintainancePlanMachinePo);
+ MaintainancePlanMachinePo maintainancePlanMachinePo = null;
- if (flag < 1) {
- throw new CmdException("淇濆瓨鏁版嵁澶辫触");
+ int flag = 0;
+ JSONArray machineIds = reqJson.getJSONArray("machines");
+ EquipmentAccountDto equipmentAccountDto = null;
+ List<EquipmentAccountDto> accountDtos = null;
+ for (int machineIndex = 0; machineIndex < machineIds.size(); machineIndex++) {
+ maintainancePlanMachinePo = new MaintainancePlanMachinePo();
+ maintainancePlanMachinePo.setCommunityId(reqJson.getString("communityId"));
+ maintainancePlanMachinePo.setPlanId(reqJson.getString("planId"));
+ maintainancePlanMachinePo.setMpmId(GenerateCodeFactory.getGeneratorId("11"));
+ maintainancePlanMachinePo.setMachineId(machineIds.getString(machineIndex));
+
+ equipmentAccountDto = new EquipmentAccountDto();
+ equipmentAccountDto.setMachineId(machineIds.getString(machineIndex));
+ accountDtos = equipmentAccountV1InnerServiceSMOImpl.queryEquipmentAccounts(equipmentAccountDto);
+ Assert.listOnlyOne(accountDtos, "璁惧涓嶅瓨鍦�");
+
+ maintainancePlanMachinePo.setMachineName(accountDtos.get(0).getMachineName());
+ flag = maintainancePlanMachineV1InnerServiceSMOImpl.saveMaintainancePlanMachine(maintainancePlanMachinePo);
+ if(flag < 1){
+ throw new CmdException("鏈寘鍚繚鍏昏澶�");
+ }
}
cmdDataFlowContext.setResponseEntity(ResultVo.success());
--
Gitblit v1.8.0