From 7a0a3d837365330be38699894ce0167bade1de58 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 07 十二月 2022 15:00:26 +0800
Subject: [PATCH] 1、优化报修通知信息2、优化缴费审核3、优化发布公告信息4、优化页面显示性问题
---
service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java b/service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java
index 8cac6dc..eec3989 100755
--- a/service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/Repair/MachineAddOwnerRepairAdapt.java
@@ -23,7 +23,6 @@
import com.java110.intf.store.ISmallWechatAttrInnerServiceSMO;
import com.java110.intf.user.IStaffAppAuthInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
-import com.java110.po.car.OwnerCarPo;
import com.java110.po.owner.RepairPoolPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.util.Assert;
@@ -35,6 +34,7 @@
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestTemplate;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -74,13 +74,11 @@
@Override
public void execute(Business business, List<Business> businesses) {
-
JSONObject data = business.getData();
JSONArray businessOwnerRepairs = new JSONArray();
- System.out.println("鏀跺埌鏃ュ織锛�>>>>>>>>>>>>>"+data.toJSONString());
+ System.out.println("鏀跺埌鏃ュ織锛�>>>>>>>>>>>>>" + data.toJSONString());
if (data.containsKey(RepairPoolPo.class.getSimpleName())) {
Object bObj = data.get(RepairPoolPo.class.getSimpleName());
-
if (bObj instanceof JSONObject) {
businessOwnerRepairs.add(bObj);
} else if (bObj instanceof List) {
@@ -88,27 +86,22 @@
} else {
businessOwnerRepairs = (JSONArray) bObj;
}
-
} else {
if (data instanceof JSONObject) {
businessOwnerRepairs.add(data);
}
}
-
//JSONObject businessOwnerCar = data.getJSONObject("businessOwnerCar");
for (int bOwnerRepairIndex = 0; bOwnerRepairIndex < businessOwnerRepairs.size(); bOwnerRepairIndex++) {
JSONObject businessOwnerRepair = businessOwnerRepairs.getJSONObject(bOwnerRepairIndex);
doDealOwnerRepair(business, businessOwnerRepair);
}
-
-
}
private void doDealOwnerRepair(Business business, JSONObject businessOwnerRepair) {
-
RepairDto repairDto = new RepairDto();
repairDto.setRepairId(businessOwnerRepair.getString("repairId"));
- repairDto.setStatusCd("0");
+// repairDto.setStatusCd("0");
List<RepairDto> repairDtos = repairInnerServiceSMO.queryRepairs(repairDto);
//鑾峰彇鎶ヤ慨绫诲瀷
String repairTypeName = repairDtos.get(0).getRepairTypeName();
@@ -180,7 +173,12 @@
basePrivilegeDto.setCommunityId(communityMemberDtos.get(0).getCommunityId());
List<UserDto> userDtos = privilegeInnerServiceSMO.queryPrivilegeUsers(basePrivilegeDto);
String url = sendMsgUrl + accessToken;
+ List<String> userIds = new ArrayList<>();
for (UserDto userDto : userDtos) {
+ if (userIds.contains(userDto.getUserId())) {
+ continue;
+ }
+ userIds.add(userDto.getUserId());
//鏍规嵁 userId 鏌ヨ鍒皁penId
StaffAppAuthDto staffAppAuthDto = new StaffAppAuthDto();
staffAppAuthDto.setStaffId(userDto.getUserId());
--
Gitblit v1.8.0