优化小区数据

wuxw

2024-01-22 a40c2eb885bcdb697c2e16dae4f43cb6cd718973

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

@@ -17,24 +17,24 @@

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.attendanceClasses.AttendanceClassesDto;
import com.java110.dto.attendanceClassesStaff.AttendanceClassesStaffDto;
import com.java110.dto.file.FileDto;
import com.java110.dto.attendance.AttendanceClassesDto;
import com.java110.dto.attendance.AttendanceClassesStaffDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.machine.MachineDto;
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.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.common.IMachineV1InnerServiceSMO;
import com.java110.intf.user.IAttendanceClassesStaffV1InnerServiceSMO;
import com.java110.intf.user.IOrgStaffRelInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
import com.java110.po.attendanceClassesStaff.AttendanceClassesStaffPo;
import com.java110.po.store.StoreUserPo;
import com.java110.po.attendance.AttendanceClassesStaffPo;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.MappingConstant;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.ImageUtils;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

@@ -151,8 +151,8 @@
            storeUserObj.put("extClassesId", attendanceClassesDtos.get(0).getClassesId());
            storeUserObj.put("extStaffId", attendanceClassesStaffs.get(0).getStaffId());
            storeUserObj.put("staffName", attendanceClassesStaffs.get(0).getStaffName());
            storeUserObj.put("departmentId", "-1");
            storeUserObj.put("departmentName", "未知");
            storeUserObj.put("departmentId", attendanceClassesDtos.get(0).getClassesId());
            storeUserObj.put("departmentName", attendanceClassesDtos.get(0).getClassesName());
            storeUserObj.put("machineCode", tmpMachineDto.getMachineCode());
            storeUserObj.put("extMachineId", tmpMachineDto.getMachineId());
            storeUserObj.put("extCommunityId", tmpMachineDto.getCommunityId());
@@ -175,14 +175,19 @@
        if (fileRelDtos == null || fileRelDtos.size() != 1) {
            return "";
        }
        FileDto fileDto = new FileDto();
        fileDto.setFileId(fileRelDtos.get(0).getFileSaveName());
        fileDto.setFileSaveName(fileRelDtos.get(0).getFileSaveName());
        List<FileDto> fileDtos = fileInnerServiceSMOImpl.queryFiles(fileDto);
        if (fileDtos == null || fileDtos.size() != 1) {
            return "";
        String fileName = fileRelDtos.get(0).getFileSaveName();


        if(StringUtil.isEmpty(fileName)){
            return fileName;
        }
        String imgUrl = MappingCache.getValue(MappingConstant.FILE_DOMAIN,"IMG_PATH");
        if(!fileName.startsWith("http")){
            fileName = imgUrl +fileName;
        }

        return fileDtos.get(0).getContext();
        String faceBase64 = ImageUtils.getBase64ByImgUrl(fileName);

        return faceBase64;
    }
}