From e23023b93f34286f5a807b0b85e9a0619a297ed7 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 二月 2023 23:25:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairForceFinishCmd.java | 41 +++++++++++++++++++----------------------
1 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairForceFinishCmd.java b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairForceFinishCmd.java
index d8b3b7d..f205e8c 100644
--- a/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairForceFinishCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/ownerRepair/RepairForceFinishCmd.java
@@ -3,27 +3,24 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
-import com.java110.core.context.DataFlowContext;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
-import com.java110.intf.common.IFileInnerServiceSMO;
+import com.java110.dto.user.UserDto;
import com.java110.intf.community.IRepairInnerServiceSMO;
import com.java110.intf.community.IRepairPoolV1InnerServiceSMO;
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.community.IRepairUserV1InnerServiceSMO;
-import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
-import com.java110.intf.user.IOwnerInnerServiceSMO;
-import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
-import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -41,22 +38,13 @@
private IRepairInnerServiceSMO repairInnerServiceSMOImpl;
@Autowired
- private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
-
- @Autowired
- private IFileInnerServiceSMO fileInnerServiceSMOImpl;
-
- @Autowired
- private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMO;
-
- @Autowired
- private IOwnerInnerServiceSMO ownerInnerServiceSMO;
-
- @Autowired
private IRepairPoolV1InnerServiceSMO repairPoolV1InnerServiceSMOImpl;
@Autowired
private IRepairUserV1InnerServiceSMO repairUserV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
@@ -69,7 +57,16 @@
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
String userId = context.getReqHeaders().get("user-id");
- String userName = context.getReqHeaders().get("user-name");
+ String userName = "";
+ if (!StringUtil.isEmpty(context.getReqHeaders().get("user-name"))) {
+ userName = context.getReqHeaders().get("user-name");
+ } else {
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ List<UserDto> users = userInnerServiceSMOImpl.getUsers(userDto);
+ Assert.listOnlyOne(users, "鏌ヨ鐢ㄦ埛閿欒锛�");
+ userName = users.get(0).getName();
+ }
int flag = 0;
@@ -100,7 +97,7 @@
repairUserPo.setContext(userName + " 寮哄埗鍥炲崟");
repairUserPo.setCommunityId(reqJson.getString("communityId"));
flag = repairUserV1InnerServiceSMOImpl.updateRepairUserNew(repairUserPo);
- if(flag < 1){
+ if (flag < 1) {
throw new CmdException("淇敼宸ュ崟澶辫触");
}
@@ -119,7 +116,7 @@
repairUserPo.setContext(reqJson.getString("context"));
repairUserPo.setCommunityId(reqJson.getString("communityId"));
flag = repairUserV1InnerServiceSMOImpl.saveRepairUserNew(repairUserPo);
- if(flag < 1){
+ if (flag < 1) {
throw new CmdException("淇敼宸ュ崟澶辫触");
}
}
@@ -143,7 +140,7 @@
//璁＄畻 搴旀敹閲戦
RepairPoolPo repairPoolPo = BeanConvertUtil.covertBean(businessOwnerRepair, RepairPoolPo.class);
int flag = repairPoolV1InnerServiceSMOImpl.updateRepairPoolNew(repairPoolPo);
- if(flag < 1){
+ if (flag < 1) {
throw new CmdException("淇敼宸ュ崟澶辫触");
}
}
--
Gitblit v1.8.0