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

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/KeySiteExcleDto.java

@@ -51,7 +51,8 @@ public class KeySiteExcleDto implements Serializable {
 	@ExcelProperty(value = "建筑面积(㎡)", index = 4)
 	@ApiModelProperty(value = "建筑面积(㎡)")
 	private String buildingArea;
-    
+	
+	@ExcelIgnore
 	@ExcelProperty(value = "建筑高度(m)", index = 5)
 	@ApiModelProperty(value = "建筑高度(m)")
 	private String buildingHeight;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/enums/ExcelEnums.java

@@ -17,7 +17,7 @@ public  enum ExcelEnums {
         WXXFZ("微型消防站", "微型消防站", "com.yeejoin.amos.boot.module.common.api.dto.FireStationDto","WXXFZ"),//("WXXFZ","微型消防站")
         XFRY ("消防人员", "消防人员", "com.yeejoin.amos.boot.module.common.api.dto.FirefightersExcelDto","XFRY"),//("XFRY","消防人员")
         WBRY ("维保人员", "维保人员", "com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonExcleDto","WBRY"),//("WBRY",维保人员)
-        KEYSITE ("重點部位", "重點部位", "com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto","KEYSITE"),//{"KEYSITE":重點部位}
+        KEYSITE ("重点部位", "重点部位", "com.yeejoin.amos.boot.module.common.api.dto.KeySiteExcleDto","KEYSITE"),//{"KEYSITE":重點部位}
         CLZQ ("车辆执勤", "车辆执勤", "com.yeejoin.amos.boot.module.common.api.dto.DutyCarExcelDto","CLZQ"),//("CLZQ","车辆执勤")
         JCDWRY ("机场单位人员", "机场单位人员", "com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto","JCDWRY"),//("JCDW","机场单位")
         LDDW ("联动单位", "联动单位", "com.yeejoin.amos.boot.module.common.api.dto.LinkageUnitDto","LDDW"),//("JCDW","机场单位")

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

@@ -341,7 +341,7 @@ public class OrgUsrController extends BaseController {
      * @param
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyTreeByUser", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位部门树", notes = "根据登陆人获取单位部门树")
     public ResponseModel<List<OrgMenuDto>> selectCompanyTreeByUser() throws Exception {
@@ -357,7 +357,7 @@ public class OrgUsrController extends BaseController {
      * @param
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyUserTreeByUser", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位部门用户树", notes = "根据登陆人获取单位部门用户树")
     public ResponseModel<List<OrgMenuDto>> companyUserTreeByUser() {
@@ -373,7 +373,7 @@ public class OrgUsrController extends BaseController {
      * @param
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyListByUser", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位列表", notes = "根据登陆人获取单位列表")
     public ResponseModel<List<CheckObjectDto>> companyListByUser() {
@@ -403,7 +403,7 @@ public class OrgUsrController extends BaseController {
      * @param
      * @return
      */
-    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getLoginUserDetails", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取登陆人绑定的人员关系", notes = "获取登陆人绑定的人员关系")
     public ResponseModel<List<Map<String, Object>>> getLoginUserDetails(@RequestParam(value = "userId", required = false) String userId) {

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

@@ -14,8 +14,10 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.DataValidationConstraint;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -535,8 +537,18 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         // 动态表单数据
         List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listByCalledId(id);
         Map<String, Object> result = new HashMap<>();
+
+        // 机场人员AMOS角色丢失修正, by litw start 2021年9月10日
+        if(null != orgUsr.getAmosOrgId()) {
+             FeignClientResult<AgencyUserModel> result1 = Privilege.agencyUserClient.queryByUserId(orgUsr.getAmosOrgId());
+             if(null !=result1.getResult()) {
+                 orgUsr.setAmosOrgCode(result1.getResult().getRealName());
+             }
+        }
+        // 机场人员AMOS角色丢失修正, by litw end  2021年9月10日
         result = Bean.BeantoMap(orgUsr);
         result.put("parenName", getById(orgUsr.getParentId()).getBizOrgName());
+
         // 放入所有动态表单数据
         for (DynamicFormColumn alertForm : alertForms) {
             result.put(alertForm.getFieldCode(), null);
@@ -605,11 +617,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             orgUsr.setBizOrgCode(getOrgCodeStr());
         }
 
-        if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
-            AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
-            OrgPersonVo.setAmosOrgCode(user.getRealName());
-        }
-
         saveOrgUsrDynamicFormInstance(orgUsr, OrgPersonVo.getDynamicFormValue());
     }
 
@@ -673,9 +680,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         orgUsr.setSequenceNbr(id);
         if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
             AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
-            oriOrgUsr.setAmosOrgCode(user.getRealName());
+           // oriOrgUsr.setAmosOrgCode(user.getRealName());  去掉AmosOrgCode by litw 2021年9月10日
             oriOrgUsr.setAmosOrgId(user.getUserId());
-            orgUsr.setAmosOrgCode(user.getRealName());
+            //orgUsr.setAmosOrgCode(user.getRealName()); 去掉AmosOrgCode by litw 2021年9月10日
             orgUsr.setAmosOrgId(user.getUserId());
         }
 
@@ -1215,7 +1222,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                 if (orgUsr.getBizOrgType().equals(OrgPersonEnum.公司.getKey()) && ObjectUtils.isEmpty(orgUsr.getParentId())) {
                     return orgUsr.getSequenceNbr();
                 } else {
-                    pid = getCompanyIdByDto(Long.parseLong(orgUsr.getParentId()), companyDepartmentMsgList);
+                    if (!StringUtils.isEmpty(orgUsr.getParentId())) {
+                        pid = getCompanyIdByDto(Long.parseLong(orgUsr.getParentId()), companyDepartmentMsgList);
+                    }
                 }
             }
         }
@@ -1318,8 +1327,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<OrgMenuDto> treeList = buildTreeParallel(companyDepartmentMsgList);
         Set<Long> set = new HashSet<>();
         orgUsrList.forEach(orgUsr -> {
-            Long parentId = Long.parseLong(orgUsr.getParentId());
-            getTreeChildre(list, treeList, parentId, set, companyDepartmentMsgList);
+            if (!StringUtils.isEmpty(orgUsr.getParentId())) {
+                Long parentId = Long.parseLong(orgUsr.getParentId());
+                getTreeChildre(list, treeList, parentId, set, companyDepartmentMsgList);
+            }
         });
         return list;
     }
@@ -1348,7 +1359,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         // 获取登陆人所在公司
         Long pid = getCompanyId(parentId, companyDepartmentMsgList);
         if (set.add(pid)) {
-            List<OrgMenuDto> list1 = treeList.stream().filter(orgMenuDto -> orgMenuDto.getKey().equals(pid)).collect(Collectors.toList());
+            List<OrgMenuDto> list1 = treeList.stream().filter(orgMenuDto -> !ObjectUtils.isEmpty(orgMenuDto) && pid.equals(orgMenuDto.getKey())).collect(Collectors.toList());
             list.addAll(list1);
         }
     }
@@ -1363,7 +1374,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                 if (orgUsr.getBizOrgType().equals(OrgPersonEnum.公司.getKey()) && ObjectUtils.isEmpty(orgUsr.getParentId())) {
                     return orgUsr.getSequenceNbr();
                 } else {
-                    pid = getCompanyId(Long.parseLong(orgUsr.getParentId()), companyDepartmentMsgList);
+                    if (!StringUtils.isEmpty(orgUsr.getParentId())) {
+                        pid = getCompanyId(Long.parseLong(orgUsr.getParentId()), companyDepartmentMsgList);
+                    }
                 }
             }
         }

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

@@ -1133,7 +1133,6 @@ public class ExcelServiceImpl {
 		userModel.setRecUserId("3141675");		
 		userModel.setRecUserName("admin_jcs");
 		userModel.setRecDate( new Date());
-		userModel.setIsDelete(false);
 		return userModel;
 	}
 }