From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/StaffMachineTranslateBMOImpl.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/StaffMachineTranslateBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/StaffMachineTranslateBMOImpl.java
old mode 100644
new mode 100755
index 713c3c8..f77842d
--- a/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/StaffMachineTranslateBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/machineTranslate/impl/StaffMachineTranslateBMOImpl.java
@@ -2,17 +2,16 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.machineTranslate.IStaffMachineTranslateBMO;
-import com.java110.api.listener.machineTranslate.MachineQueryUserInfoListener;
-import com.java110.core.smo.common.IFileInnerServiceSMO;
-import com.java110.core.smo.common.IFileRelInnerServiceSMO;
-import com.java110.core.smo.common.IMachineTranslateInnerServiceSMO;
-import com.java110.core.smo.community.ICommunityInnerServiceSMO;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
import com.java110.dto.file.FileDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.machine.MachineTranslateDto;
import com.java110.dto.machine.MachineUserResultDto;
import com.java110.dto.user.UserDto;
+import com.java110.intf.common.IFileInnerServiceSMO;
+import com.java110.intf.common.IFileRelInnerServiceSMO;
+import com.java110.intf.common.IMachineTranslateInnerServiceSMO;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.utils.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -56,7 +55,6 @@
List<UserDto> userDtos = userInnerServiceSMOImpl.getStaffs(userDto);
if (userDtos == null || userDtos.size() != 1) {
-
return null;
}
@@ -64,24 +62,28 @@
fileRelDto.setObjId(reqJson.getString("faceid"));
fileRelDto.setRelTypeCd("12000");
List<FileRelDto> fileRelDtos = fileRelInnerServiceSMOImpl.queryFileRels(fileRelDto);
+ String tmpImg = "";
if (fileRelDtos == null || fileRelDtos.size() != 1) {
- return null;
- }
- FileDto fileDto = new FileDto();
- fileDto.setFileId(fileRelDtos.get(0).getFileSaveName());
- fileDto.setCommunityId(communityId);
- List<FileDto> fileDtos = fileInnerServiceSMOImpl.queryFiles(fileDto);
- if (fileDtos == null || fileDtos.size() != 1) {
- return null;
+ tmpImg = "";
+ } else {
+ FileDto fileDto = new FileDto();
+ fileDto.setFileSaveName(fileRelDtos.get(0).getFileSaveName());
+ fileDto.setCommunityId(communityId);
+ List<FileDto> fileDtos = fileInnerServiceSMOImpl.queryFiles(fileDto);
+ if (fileDtos == null || fileDtos.size() != 1) {
+ tmpImg = "";
+ } else {
+ tmpImg = fileDtos.get(0).getContext();
+ }
}
userDto = userDtos.get(0);
-
MachineUserResultDto machineUserResultDto = new MachineUserResultDto();
machineUserResultDto.setUserid(userDto.getUserId());
+ machineUserResultDto.setDepartmentId(userDto.getParentOrgId());
+ machineUserResultDto.setDepartmentName(userDto.getParentOrgName());
machineUserResultDto.setGroupid(communityId);
machineUserResultDto.setGroup(reqJson.getString("communityName"));
machineUserResultDto.setName(userDto.getName());
- String tmpImg = fileDtos.get(0).getContext();
machineUserResultDto.setFaceBase64(tmpImg);
machineUserResultDto.setIdNumber(userDto.getTel());
try {
@@ -92,7 +94,7 @@
}
machineUserResultDto.setRemarks("HC灏忓尯绠＄悊绯荤粺");
machineUserResultDto.setReserved(userDto.getUserId());
- machineUserResultDto.setUserType(MachineQueryUserInfoListener.TYPE_STAFF);
+ machineUserResultDto.setUserType("MachineQueryUserInfoListener.TYPE_STAFF");
//灏� 璁惧 寰呭悓姝� 鏀逛负鍚屾涓�
MachineTranslateDto tmpMtDto = new MachineTranslateDto();
--
Gitblit v1.8.0