From 4d19713a1a4d4e1f078a9574761c7a3d2df74afd Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 07 五月 2024 17:49:00 +0800
Subject: [PATCH] 优化定时任务自动重启问题
---
service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java | 41 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
index 4355d29..be7e7ad 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
@@ -13,6 +13,8 @@
import com.java110.dto.msg.SmsDto;
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.owner.OwnerRoomRelDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.system.SystemInfoDto;
import com.java110.dto.user.LoginOwnerResDto;
import com.java110.dto.user.UserAttrDto;
@@ -20,6 +22,7 @@
import com.java110.intf.common.ISmsInnerServiceSMO;
import com.java110.intf.common.ISystemInfoV1InnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.user.*;
import com.java110.po.owner.OwnerAppUserPo;
import com.java110.po.user.UserAttrPo;
@@ -73,6 +76,12 @@
@Autowired
private ISystemInfoV1InnerServiceSMO systemInfoV1InnerServiceSMOImpl;
+ @Autowired
+ private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
Assert.hasKeyAndValue(reqJson, "username", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛鍚�");
@@ -115,7 +124,7 @@
userDtos = ifOwnerLoginByPhone(reqJson, context);
}
if (ListUtil.isNull(userDtos)) {
- throw new CmdException("鐢ㄦ埛涓嶅瓨鍦紝璇峰厛娉ㄥ唽");
+ throw new CmdException("瀵嗙爜閿欒鎴栬�呯敤鎴蜂笉瀛樺湪");
}
// todo 2.0 鏍￠獙 涓氫富鐢ㄦ埛缁戝畾琛ㄦ槸鍚﹀瓨鍦ㄨ褰�
@@ -129,7 +138,7 @@
if (!ListUtil.isNull(ownerAppUserDtos)) {
// todo 4.0 鏌ヨ灏忓尯鏄惁瀛樺湪
communityId = ownerAppUserDtos.get(0).getCommunityId();
- }else{
+ } else {
SystemInfoDto systemInfoDto = new SystemInfoDto();
List<SystemInfoDto> systemInfoDtos = systemInfoV1InnerServiceSMOImpl.querySystemInfos(systemInfoDto);
communityId = systemInfoDtos.get(0).getDefaultCommunityId();
@@ -150,6 +159,7 @@
loginOwnerResDto.setCommunityId(communityDtos.get(0).getCommunityId());
loginOwnerResDto.setCommunityName(communityDtos.get(0).getName());
loginOwnerResDto.setCommunityTel(communityDtos.get(0).getTel());
+ loginOwnerResDto.setCommunityQrCode(communityDtos.get(0).getQrCode());
loginOwnerResDto.setUserId(tmpUserDto.getUserId());
loginOwnerResDto.setUserName(tmpUserDto.getName());
loginOwnerResDto.setOwnerTel(tmpUserDto.getTel());
@@ -269,6 +279,10 @@
ownerAppUserPo.setLink(ownerDtos.get(0).getLink());
ownerAppUserPo.setUserId(userPo.getUserId());
ownerAppUserPo.setOpenId("-1");
+ ownerAppUserPo.setOwnerTypeCd(ownerDtos.get(0).getOwnerTypeCd());
+
+ queryOwnerRoom(ownerDtos.get(0), ownerAppUserPo);
+
flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
if (flag < 1) {
@@ -281,6 +295,29 @@
return userDtos;
}
+ private void queryOwnerRoom(OwnerDto ownerDto, OwnerAppUserPo ownerAppUserPo) {
+
+
+ OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
+ ownerRoomRelDto.setOwnerId(ownerDto.getOwnerId());
+
+ List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelV1InnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
+
+ if (ListUtil.isNull(ownerRoomRelDtos)) {
+ return;
+ }
+
+ RoomDto roomDto = new RoomDto();
+ roomDto.setRoomId(ownerRoomRelDtos.get(0).getRoomId());
+ List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+ if (ListUtil.isNull(roomDtos)) {
+ return;
+ }
+
+ ownerAppUserPo.setRoomId(roomDtos.get(0).getRoomId());
+ ownerAppUserPo.setRoomName(roomDtos.get(0).getFloorNum() + "-" + roomDtos.get(0).getUnitNum() + "-" + roomDtos.get(0).getRoomNum());
+ }
+
private UserAttrDto getCurrentUserAttrDto(List<UserAttrDto> userAttrDtos, String specCd) {
if (userAttrDtos == null) {
return null;
--
Gitblit v1.8.0