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/SaveMaintainancePlanCmd.java | 91 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 88 insertions(+), 3 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/maintainancePlan/SaveMaintainancePlanCmd.java b/service-community/src/main/java/com/java110/community/cmd/maintainancePlan/SaveMaintainancePlanCmd.java
index c3d4232..acf0317 100644
--- a/service-community/src/main/java/com/java110/community/cmd/maintainancePlan/SaveMaintainancePlanCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/maintainancePlan/SaveMaintainancePlanCmd.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,8 +23,16 @@
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.user.UserDto;
+import com.java110.intf.common.IEquipmentAccountV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainancePlanMachineV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainancePlanStaffV1InnerServiceSMO;
import com.java110.intf.community.IMaintainancePlanV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.maintainancePlan.MaintainancePlanPo;
+import com.java110.po.maintainancePlanMachine.MaintainancePlanMachinePo;
+import com.java110.po.maintainancePlanStaff.MaintainancePlanStaffPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -31,6 +40,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.util.List;
/**
* 绫昏〃杩帮細淇濆瓨
@@ -52,6 +63,18 @@
@Autowired
private IMaintainancePlanV1InnerServiceSMO maintainancePlanV1InnerServiceSMOImpl;
+ @Autowired
+ private IMaintainancePlanMachineV1InnerServiceSMO maintainancePlanMachineV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IMaintainancePlanStaffV1InnerServiceSMO maintainancePlanStaffV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IEquipmentAccountV1InnerServiceSMO equipmentAccountV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "planName", "璇锋眰鎶ユ枃涓湭鍖呭惈planName");
@@ -60,9 +83,27 @@
Assert.hasKeyAndValue(reqJson, "startDate", "璇锋眰鎶ユ枃涓湭鍖呭惈startDate");
Assert.hasKeyAndValue(reqJson, "endDate", "璇锋眰鎶ユ枃涓湭鍖呭惈endDate");
Assert.hasKeyAndValue(reqJson, "planPeriod", "璇锋眰鎶ユ枃涓湭鍖呭惈planPeriod");
- Assert.hasKeyAndValue(reqJson, "maintainanceMonth", "璇锋眰鎶ユ枃涓湭鍖呭惈maintainanceMonth");
- Assert.hasKeyAndValue(reqJson, "maintainanceDay", "璇锋眰鎶ユ枃涓湭鍖呭惈maintainanceDay");
- Assert.hasKeyAndValue(reqJson, "maintainanceEveryday", "璇锋眰鎶ユ枃涓湭鍖呭惈maintainanceEveryday");
+
+ if (!reqJson.containsKey("staffs")) {
+ throw new CmdException("鏈寘鍚憳宸�");
+ }
+
+ JSONArray staffs = reqJson.getJSONArray("staffs");
+
+ if (staffs.size() < 1) {
+ throw new CmdException("鏈寘鍚憳宸�");
+ }
+
+ if (!reqJson.containsKey("machineIds")) {
+ throw new CmdException("鏈寘鍚澶�");
+ }
+
+ JSONArray machineIds = reqJson.getJSONArray("machineIds");
+
+ if (machineIds.size() < 1) {
+ throw new CmdException("鏈寘鍚澶�");
+ }
+
}
@@ -70,7 +111,18 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+ String userId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ userDto.setRow(1);
+ userDto.setPage(1);
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+ Assert.listOnlyOne(userDtos,"鍛樺伐涓嶅瓨鍦�");
+
MaintainancePlanPo maintainancePlanPo = BeanConvertUtil.covertBean(reqJson, MaintainancePlanPo.class);
+ maintainancePlanPo.setCreateUserId(userId);
+ maintainancePlanPo.setCreateUserName(userDtos.get(0).getName());
maintainancePlanPo.setPlanId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
int flag = maintainancePlanV1InnerServiceSMOImpl.saveMaintainancePlan(maintainancePlanPo);
@@ -78,6 +130,39 @@
throw new CmdException("淇濆瓨鏁版嵁澶辫触");
}
+ JSONArray staffs = reqJson.getJSONArray("staffs");
+ MaintainancePlanStaffPo maintainancePlanStaffPo = null;
+ for (int staffIndex = 0; staffIndex < staffs.size(); staffIndex++) {
+ maintainancePlanStaffPo = new MaintainancePlanStaffPo();
+ maintainancePlanStaffPo.setCommunityId(reqJson.getString("communityId"));
+ maintainancePlanStaffPo.setPlanId(maintainancePlanPo.getPlanId());
+ maintainancePlanStaffPo.setMpsId(GenerateCodeFactory.getGeneratorId("11"));
+ maintainancePlanStaffPo.setStaffId(staffs.getJSONObject(staffIndex).getString("userId"));
+ maintainancePlanStaffPo.setStaffName(staffs.getJSONObject(staffIndex).getString("name"));
+ maintainancePlanStaffV1InnerServiceSMOImpl.saveMaintainancePlanStaff(maintainancePlanStaffPo);
+ }
+
+ JSONArray machineIds = reqJson.getJSONArray("machineIds");
+ MaintainancePlanMachinePo maintainancePlanMachinePo = null;
+ 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(maintainancePlanPo.getPlanId());
+ 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());
+ maintainancePlanMachineV1InnerServiceSMOImpl.saveMaintainancePlanMachine(maintainancePlanMachinePo);
+ }
+
+
cmdDataFlowContext.setResponseEntity(ResultVo.success());
}
}
--
Gitblit v1.8.0