Merge branch 'develop_ccs' of http://172.16.10.76/moa/amos-boot-biz into develop_ccs

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -750,4 +750,27 @@ public class OrgUsrController extends BaseController {
         }
         return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByBizOrgCodeList(bizOrgCode));
     }
+    
+    
+    /**
+     * 查询多个组织机构下面的所有人员列表信息
+     *
+     * @param
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询当前人员所属的第一级公司", notes = "查询当前人员所属的第一级公司")
+    @GetMapping(value = "find/getCompanyByUserId")
+    public ResponseModel<Object> getCompanyByUserId(@RequestParam Long userId) {
+        return ResponseHelper.buildResponse(iOrgUsrService.getCompanyByUserId(userId));
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -31,6 +31,8 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+
+import freemarker.core.ReturnInstruction.Return;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -50,6 +52,9 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import javax.annotation.Resource;
+
+import static org.hamcrest.CoreMatchers.nullValue;
+
 import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.text.SimpleDateFormat;
@@ -115,10 +120,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 	public static List<OrgMenuDto> buildTreeParallel(List<OrgUsr> list) {
 
-        List<OrgMenuDto> menuList = list.stream().map(o ->
-                new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
-                        ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.parseLong(o.getParentId()), o.getBizOrgType(), false,
-                        o.getBizOrgCode()).setTotal(o.getTotal())).collect(Collectors.toList());
+		List<OrgMenuDto> menuList = list.stream()
+				.map(o -> new OrgMenuDto(o.getSequenceNbr(), o.getBizOrgName(),
+						ObjectUtils.isEmpty(o.getParentId()) ? 0L : Long.parseLong(o.getParentId()), o.getBizOrgType(),
+						false, o.getBizOrgCode()).setTotal(o.getTotal()))
+				.collect(Collectors.toList());
 		List<OrgMenuDto> result = new ArrayList<>();
 		Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
 		menuList.forEach(e -> map.put(e.getKey(), e));
@@ -402,7 +408,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			OrgUsr parent = this.getById(req.get("parentId").toString());
 			map.put("bizOrgCode", ObjectUtils.isEmpty(parent) ? null : parent.getBizOrgCode());
 		}
-         //新加
+		// 新加
 		if (req.get("OrgCode") != null && req.get("OrgCode") != "") {
 
 			map.put("bizOrgCode", req.get("OrgCode"));
@@ -411,7 +417,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 		/* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
 		if (req.containsKey("amosOrgId") && !ObjectUtils.isEmpty(req.get("amosOrgId"))) {
-            map.put("amosOrgCode", req.get("amosOrgId"));//当时给前端给的key名字错了，以为是传Id过来，现在传名字，那就将错就错吧
+			map.put("amosOrgCode", req.get("amosOrgId"));// 当时给前端给的key名字错了，以为是传Id过来，现在传名字，那就将错就错吧
 		}
 
 		req.remove("bizOrgName");
@@ -627,7 +633,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return result;
 	}
 
-
 	@Override
 	public Map<String, Object> selectForShowByIduser(OrgUsr orgUsr, Long id) throws Exception {
 		QueryWrapper<DynamicFormColumn> queryWrapper = new QueryWrapper<DynamicFormColumn>();
@@ -652,7 +657,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return result;
 	}
 
-
 	@Override
 	public List<OrgUsr> selectCompanyDepartmentMsg() {
 		List<OrgUsr> list = this.baseMapper.selectCompanyDepartmentMsg();
@@ -841,8 +845,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	public OrgUsrFormDto selectCompanyById(Long id) throws Exception {
 		OrgUsr orgUsr = getById(id);
 
-
-
 		// 动态表单数据
 		List<FormValue> formValue = getFormValue(id);
 		// bug 2580 返回值改为具体名称 chenzhao 2021-09-27 start
@@ -856,13 +858,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		OrgUsrFormDto orgUsrFormVo = new OrgUsrFormDto();
 		orgUsrFormVo.setDynamicFormAlert(formValue);
 		BeanUtils.copyProperties(orgUsr, orgUsrFormVo);
-        Map<String,String> Xfaq=orgUsrMapper.selectPersonone("消防安全负责人",id);
-        Map<String,String> Xfgl=orgUsrMapper.selectPersonone("消防安全管理人",id);
-        Map<String,String> Dwfz= orgUsrMapper.selectPersonone("法定代表人",id);
-        orgUsrFormVo.setXfaq(Xfaq!=null?Xfaq.get("name"):"");
-        orgUsrFormVo.setXfgl(Xfgl!=null?Xfgl.get("name"):"");
-        orgUsrFormVo.setDwfz(Dwfz!=null?Dwfz.get("name"):"");
-        orgUsrFormVo.setParentName( getById(orgUsr.getParentId()).getBizOrgName());
+		Map<String, String> Xfaq = orgUsrMapper.selectPersonone("消防安全负责人", id);
+		Map<String, String> Xfgl = orgUsrMapper.selectPersonone("消防安全管理人", id);
+		Map<String, String> Dwfz = orgUsrMapper.selectPersonone("法定代表人", id);
+		orgUsrFormVo.setXfaq(Xfaq != null ? Xfaq.get("name") : "");
+		orgUsrFormVo.setXfgl(Xfgl != null ? Xfgl.get("name") : "");
+		orgUsrFormVo.setDwfz(Dwfz != null ? Dwfz.get("name") : "");
+		orgUsrFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName());
 		return orgUsrFormVo;
 	}
 
@@ -1312,7 +1314,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		// 业主单位人员
 		List<UserUnitDto> list = orgUsrMapper.getUserUnit(userId, typeArr[0], null);
 		// 维保单位人员
-        List<MaintenanceCompany> maintenancePersons = maintenanceCompanyService.findPersonByAmosOrgId(typeArr[0], userId);
+		List<MaintenanceCompany> maintenancePersons = maintenanceCompanyService.findPersonByAmosOrgId(typeArr[0],
+				userId);
 		if (!CollectionUtils.isEmpty(list) && !CollectionUtils.isEmpty(maintenancePersons)) {
 			throw new RuntimeException("人员绑定单位重复！");
 		}
@@ -1417,7 +1420,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return list;
 	}
 
-
 	@Override
 	public List<CheckObjectDto> companyListByUser(AgencyUserModel user) {
 		List<CheckObjectDto> list = new ArrayList<>();
@@ -1498,7 +1500,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 					orgUsrTreeDto.setNum(num);
 				}
 				// 只查出一级单位，顶级为西部机场集团
-                if (value.getBizOrgType().equals(OrgPersonEnum.公司.getKey()) && value.getBizOrgCode().length() == TreeParser.CODE_LENGTH * 2) {
+				if (value.getBizOrgType().equals(OrgPersonEnum.公司.getKey())
+						&& value.getBizOrgCode().length() == TreeParser.CODE_LENGTH * 2) {
 					list.add(value);
 				}
 			}
@@ -1727,7 +1730,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUser;
 	}
 
-
 	public OrgUsr getByIduser(Serializable id) {
 		OrgUsr orgUser = this.baseMapper.selectById(id);
 		return orgUser;
@@ -1917,7 +1919,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return orgUsrMapper.queryCompanyIdNew(bizOrgName);
 	}
 
-
 	public List<Map<String, Object>> getuserDetail(Long departmentId, List<Map<String, Object>> resulLists) {
 		OrgUsr resulList = this.baseMapper.selectById(departmentId);
 		if (resulList.getParentId() != null) {
@@ -1930,7 +1931,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 	}
 
-
 	public List<AgencyUserModel> getAmosUserByOrgUser(String orgUserIds) throws Exception {
 		if (ValidationUtil.isEmpty(orgUserIds)) {
 			throw new Exception("账号不存在");
@@ -2040,29 +2040,129 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
 		// orgCode 前端调用接口生成 不再后台生成orgCode
 		/*
-		if (OrgPersonVo.getParentId() != null) {OrgUsrMapper
-			OrgUsr parent = getById(OrgPersonVo.getParentId());
-			if (parent != null && ObjectUtils.isEmpty(OrgPersonVo.getBizOrgCode())) {
-				orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr());
-			}
-		} else {
-			orgUsr.setBizOrgCode(getOrgCodeStr());
-		}*/
+		 * if (OrgPersonVo.getParentId() != null) {OrgUsrMapper OrgUsr parent =
+		 * getById(OrgPersonVo.getParentId()); if (parent != null &&
+		 * ObjectUtils.isEmpty(OrgPersonVo.getBizOrgCode())) {
+		 * orgUsr.setBizOrgCode(parent.getBizOrgCode() + getOrgCodeStr()); } } else {
+		 * orgUsr.setBizOrgCode(getOrgCodeStr()); }
+		 */
 		OrgUsrDto result = new OrgUsrDto();
 		if (orgUsr.getSequenceNbr() != null) { // 走更新方法
 			this.updateById(orgUsr);
 			BeanUtils.copyProperties(orgUsr, result);
 		} else {
-            if(OrgPersonVo.getDynamicFormValue() == null || OrgPersonVo.getDynamicFormValue().size() == 0) {
-                throw new BadRequest("人员动态表单信息未填写");
-            }
 			result = saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
 		}
+//	}*/
+//    OrgUsrDto result = new OrgUsrDto();
+//    if (orgUsr.getSequenceNbr() != null) { // 走更新方法
+//        this.updateById(orgUsr);
+//        BeanUtils.copyProperties(orgUsr, result);
+//    } else {
+//        if(OrgPersonVo.getDynamicFormValue() == null || OrgPersonVo.getDynamicFormValue().size() == 0) {
+//            throw new BadRequest("人员动态表单信息未填写");
+//        }
+//        result = saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
+//    }
+		return result;
+	}
 
+	/**
+	 * 同步单位信息到防火监督point表
+	 *
+	 * @param companyIdList
+	 */
+	protected void syncCompany2Supervision(List<Long> companyIdList) {
+		if (ValidationUtil.isEmpty(companyIdList)) {
+			return;
+		}
+		String token = RequestContext.getToken();
+		String appKey = RequestContext.getAppKey();
+		String product = RequestContext.getProduct();
+		new Thread(() -> companyIdList.forEach(id -> {
+			try {
+				RequestContext.setAppKey(appKey);
+				RequestContext.setToken(token);
+				RequestContext.setProduct(product);
+				OrgUsrFormDto formDto = this.selectCompanyById(id);
+				if (!ValidationUtil.isEmpty(formDto) && OrgPersonEnum.公司.getKey().equals(formDto.getBizOrgType())) {
+					emqKeeper.getMqttClient().publish(airportAddTopic, JSON.toJSONString(formDto).getBytes(), 2, false);
+				}
+			} catch (Exception e) {
+				logger.debug("syncCompany2Supervision error:", e.getMessage());
+				e.printStackTrace();
+			}
+		})).start();
+	}
 
-        return result;
+	/**
+	 * 查询多个组织机构下面的所有人员列表信息
+	 *
+	 * @param companyIdList
+	 * @return
+	 */
+	public List<OrgUsr> getPersonListByCompanyIdList(List<String> companyIdList) {
+		if (ValidationUtil.isEmpty(companyIdList)) {
+			return Lists.newArrayList();
 		}
 
+		return this.baseMapper.selectPersonListByCompanyIdList(companyIdList);
+	}
+
+	/**
+	 * 根据bizOrgCode查询详情
+	 *
+	 * @param bizOrgCode
+	 * @return
+	 */
+	public OrgUsrDto getCompanyByBizOrgCodeList(String bizOrgCode) {
+
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(OrgUsr::getBizOrgCode, bizOrgCode);
+		wrapper.eq(BaseEntity::getIsDelete, false);
+		OrgUsr orgUsr = baseMapper.selectOne(wrapper);
+		OrgUsrDto orgUsrDto = new OrgUsrDto();
+		if (!orgUsr.getBizOrgType().equals(COMPANY_VALUE)) {
+			for (int i = 0; i < 10; i++) {
+				OrgUsr result = baseMapper.selectById(orgUsr.getParentId());
+				if (result.getBizOrgType().equals(COMPANY_VALUE)) {
+					BeanUtils.copyProperties(result, orgUsrDto);
+					break;
+				}
+			}
+		} else {
+			BeanUtils.copyProperties(orgUsr, orgUsrDto);
+		}
+		return orgUsrDto;
+	}
+
+	public OrgUsr getCompanyByUserId(Long userId) {
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		wrapper.eq(OrgUsr::getSequenceNbr, userId);
+		wrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_PERSON);
+		OrgUsr orgUsr = baseMapper.selectOne(wrapper);
+		return getCompanyByParentId(orgUsr.getParentId());
+	}
+
+	public OrgUsr getCompanyByParentId(String parentId) {
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+		wrapper.eq(OrgUsr::getIsDelete, false);
+		wrapper.eq(OrgUsr::getSequenceNbr, parentId);
+		OrgUsr orgUsr1 = baseMapper.selectOne(wrapper);
+		if (!orgUsr1.getBizOrgType().equals(CommonConstant.BIZ_ORG_TYPE_COMPANY)) {
+			return getCompanyByParentId(orgUsr1.getParentId());
+		}
+		return orgUsr1;
+	}
+
+//			orgUsr.setBizOrgCode(getOrgCodeStr());
+//		
+//
+//
+//        return result;
+//    }
+
     @Override
     public void updateByIdOrgPersonFlc(OrgPersonDto OrgPersonVo, Long id) throws Exception {
         // 修改人员信息
@@ -2154,72 +2254,32 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<OrgUsr> list = orgUsrMapper.companyTreeByUser(reginParams.getPersonIdentity().getBizOrgCode());
         return buildTreeParallel(list);
     }
-    /**
-     * 同步单位信息到防火监督point表
-     *
-     * @param companyIdList
-     */
-    protected void syncCompany2Supervision(List<Long> companyIdList) {
-        if (ValidationUtil.isEmpty(companyIdList)) {
-            return;
-        }
-        String token = RequestContext.getToken();
-        String appKey = RequestContext.getAppKey();
-        String product = RequestContext.getProduct();
-        new Thread(() -> companyIdList.forEach(id -> {
-            try {
-                RequestContext.setAppKey(appKey);
-                RequestContext.setToken(token);
-                RequestContext.setProduct(product);
-                OrgUsrFormDto formDto = this.selectCompanyById(id);
-                if (!ValidationUtil.isEmpty(formDto) && OrgPersonEnum.公司.getKey().equals(formDto.getBizOrgType())) {
-                    emqKeeper.getMqttClient().publish(airportAddTopic, JSON.toJSONString(formDto).getBytes(), 2, false);
-                }
-            } catch (Exception e) {
-                logger.debug("syncCompany2Supervision error:", e.getMessage());
-                e.printStackTrace();
-            }
-        })).start();
-    }
-
-    /**
-     * 查询多个组织机构下面的所有人员列表信息
-     *
-     * @param companyIdList
-     * @return
-     */
-    public List<OrgUsr> getPersonListByCompanyIdList(List<String> companyIdList) {
-        if (ValidationUtil.isEmpty(companyIdList)) {
-            return Lists.newArrayList();
-        }
-
-        return this.baseMapper.selectPersonListByCompanyIdList(companyIdList);
-    }
-
-    /**
-     * 根据bizOrgCode查询详情
-     *
-     * @param bizOrgCode
-     * @return
-     */
-    public OrgUsrDto getCompanyByBizOrgCodeList(String bizOrgCode) {
+//    /**
+//     * 同步单位信息到防火监督point表
+//     *
+//     * @param companyIdList
+//     */
+//    protected void syncCompany2Supervision(List<Long> companyIdList) {
+//        if (ValidationUtil.isEmpty(companyIdList)) {
+//            return;
+//        }
+//        String token = RequestContext.getToken();
+//        String appKey = RequestContext.getAppKey();
+//        String product = RequestContext.getProduct();
+//        new Thread(() -> companyIdList.forEach(id -> {
+//            try {
+//                RequestContext.setAppKey(appKey);
+//                RequestContext.setToken(token);
+//                RequestContext.setProduct(product);
+//                OrgUsrFormDto formDto = this.selectCompanyById(id);
+//                if (!ValidationUtil.isEmpty(formDto) && OrgPersonEnum.公司.getKey().equals(formDto.getBizOrgType())) {
+//                    emqKeeper.getMqttClient().publish(airportAddTopic, JSON.toJSONString(formDto).getBytes(), 2, false);
+//                }
+//            } catch (Exception e) {
+//                logger.debug("syncCompany2Supervision error:", e.getMessage());
+//                e.printStackTrace();
+//            }
+//        })).start();
+//    }
 
-        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(OrgUsr::getBizOrgCode,bizOrgCode);
-        wrapper.eq(BaseEntity::getIsDelete,false);
-        OrgUsr orgUsr = baseMapper.selectOne(wrapper);
-        OrgUsrDto orgUsrDto = new OrgUsrDto();
-        if (!orgUsr.getBizOrgType().equals(COMPANY_VALUE)){
-            for (int i = 0; i < 10; i++) {
-                OrgUsr result = baseMapper.selectById(orgUsr.getParentId());
-                if (result.getBizOrgType().equals(COMPANY_VALUE)){
-                    BeanUtils.copyProperties(result,orgUsrDto);
-                    break;
-                }
-            }
-        }else {
-            BeanUtils.copyProperties(orgUsr,orgUsrDto);
-        }
-       return  orgUsrDto;
-    }
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -746,9 +746,11 @@ public class ExcelServiceImpl {
 			if (firefighters.getCompanyName() != null) {
 				String[] tempCompany = firefighters.getCompanyName().split("@");
 				firefighters.setCompanyName(tempCompany[0]);
+				firefighters.setCompanyCode(tempCompany[1]);
 				firefighters.setCompany(tempCompany[1]);
+				OrgUsr result = orgUsrService.getById(Long.valueOf(tempCompany[1]));
 				firefighters.setBizOrgName(tempCompany[0]);
-				firefighters.setBizOrgCode(tempCompany[2]);
+				firefighters.setBizOrgCode(result.getBizOrgCode());
 			}
 			if (firefighters.getNativePlaceValue() != null) {
 				String[] tempCity = firefighters.getNativePlaceValue().split("@");