优化代码加入消息同步工鞥呢

service-job/src/main/java/com/java110/job/adapt/hcIot/asyn/impl/IotSendAsynImpl.java

@@ -35,11 +35,7 @@ import com.java110.vo.ResultVo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -1086,6 +1082,10 @@ public class IotSendAsynImpl implements IIotSendAsyn {
                 return;
             }
 
+            if (staffs == null || staffs.size() < 1) {
+                return;
+            }
+
             url = IotConstant.getUrl(IotConstant.ADD_ATTENDANCE_CLASSES_STAFFS);
             for (JSONObject staff : staffs) {
                 staff.put("taskId", machineTranslateDto.getMachineTranslateId());

service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/AddAttendanceToIotAdapt.java

@@ -138,8 +138,8 @@ public class AddAttendanceToIotAdapt extends DatabusAdaptImpl {
             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;

service-job/src/main/java/com/java110/job/adapt/hcIot/attendance/DeleteAttendanceToIotAdapt.java

@@ -24,6 +24,7 @@ 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.utils.constant.StatusConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -93,6 +94,7 @@ public class DeleteAttendanceToIotAdapt extends DatabusAdaptImpl {
         AttendanceClassesDto ownerAttendanceDto = new AttendanceClassesDto();
         ownerAttendanceDto.setClassesId(ownerAttendancePo.getClassesId());
         ownerAttendanceDto.setStoreId(ownerAttendancePo.getStoreId());
+        ownerAttendanceDto.setStatusCd(StatusConstant.STATUS_CD_INVALID);
         List<AttendanceClassesDto> attendanceDtos = attendanceClassesInnerServiceSMOImpl.queryAttendanceClassess(ownerAttendanceDto);
 
         Assert.listOnlyOne(attendanceDtos, "未找到考勤班组");