From a40c2eb885bcdb697c2e16dae4f43cb6cd718973 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 22 一月 2024 11:28:03 +0800
Subject: [PATCH] 优化小区数据
---
service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java
old mode 100644
new mode 100755
index b7e1718..03bd4b8
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java
@@ -17,14 +17,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.attendanceClasses.AttendanceClassesDto;
+import com.java110.dto.attendance.AttendanceClassesDto;
import com.java110.dto.org.OrgStaffRelDto;
-import com.java110.entity.order.Business;
+import com.java110.dto.system.Business;
import com.java110.intf.common.IAttendanceClassesInnerServiceSMO;
import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
-import com.java110.po.attendanceClasses.AttendanceClassesPo;
+import com.java110.po.attendance.AttendanceClassesPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -69,11 +69,10 @@
@Override
public void execute(Business business, List<Business> businesses) {
JSONObject data = business.getData();
+ JSONArray businessOwnerAttendances = new JSONArray();
if (data.containsKey(AttendanceClassesPo.class.getSimpleName())) {
Object bObj = data.get(AttendanceClassesPo.class.getSimpleName());
- JSONArray businessOwnerAttendances = null;
if (bObj instanceof JSONObject) {
- businessOwnerAttendances = new JSONArray();
businessOwnerAttendances.add(bObj);
} else if (bObj instanceof List) {
businessOwnerAttendances = JSONArray.parseArray(JSONObject.toJSONString(bObj));
@@ -81,10 +80,15 @@
businessOwnerAttendances = (JSONArray) bObj;
}
//JSONObject businessOwnerAttendance = data.getJSONObject("businessOwnerAttendance");
- for (int bOwnerAttendanceIndex = 0; bOwnerAttendanceIndex < businessOwnerAttendances.size(); bOwnerAttendanceIndex++) {
- JSONObject businessOwnerAttendance = businessOwnerAttendances.getJSONObject(bOwnerAttendanceIndex);
- doSendOwnerAttendance(business, businessOwnerAttendance);
+ } else {
+ if (data instanceof JSONObject) {
+ businessOwnerAttendances.add(data);
}
+ }
+
+ for (int bOwnerAttendanceIndex = 0; bOwnerAttendanceIndex < businessOwnerAttendances.size(); bOwnerAttendanceIndex++) {
+ JSONObject businessOwnerAttendance = businessOwnerAttendances.getJSONObject(bOwnerAttendanceIndex);
+ doSendOwnerAttendance(business, businessOwnerAttendance);
}
}
@@ -100,15 +104,15 @@
Assert.listOnlyOne(attendanceDtos, "鏈壘鍒拌�冨嫟鐝粍");
//鏌ヨ鑰冨嫟缁勪笅鐨勫憳宸�
- String classObjType = attendanceDtos.get(0).getClassesObjType();
- List<JSONObject> staffs = null;
- switch (classObjType) {
- case AttendanceClassesDto.CLASSES_OBJ_TYPE_PARTMENT:
- staffs = getPartmentStaff(attendanceDtos.get(0));
- break;
- default:
- staffs = new ArrayList<>();
- }
+// String classObjType = attendanceDtos.get(0).getClassesObjType();
+// List<JSONObject> staffs = null;
+// switch (classObjType) {
+// case AttendanceClassesDto.CLASSES_OBJ_TYPE_PARTMENT:
+// staffs = getPartmentStaff(attendanceDtos.get(0));
+// break;
+// default:
+// staffs = new ArrayList<>();
+// }
JSONObject postParameters = new JSONObject();
@@ -122,7 +126,7 @@
postParameters.put("extClassesId", attendanceDtos.get(0).getClassesId());
postParameters.put("extCommunityId", "-1");
postParameters.put("attrs", JSONArray.parseArray(JSONArray.toJSONString(attendanceDtos.get(0).getAttrs())));
- hcOwnerAttendanceAsynImpl.addAttendance(postParameters, staffs);
+ hcOwnerAttendanceAsynImpl.addAttendance(postParameters, null);
}
private List<JSONObject> getPartmentStaff(AttendanceClassesDto attendanceClassesDto) {
@@ -138,8 +142,8 @@
staffObj.put("extClassesId", attendanceClassesDto.getClassesId());
staffObj.put("extStaffId", orgStaffRelDto1.getStaffId());
staffObj.put("staffName", orgStaffRelDto1.getStaffName());
- staffObj.put("departmentId", orgStaffRelDto1.getDepartmentId());
- staffObj.put("departmentName", orgStaffRelDto1.getDepartmentName());
+ staffObj.put("departmentId", attendanceClassesDto.getClassesObjId());
+ staffObj.put("departmentName", attendanceClassesDto.getClassesObjName());
staffObjs.add(staffObj);
}
return staffObjs;
--
Gitblit v1.8.0