fix(jg):密评完整性测试代码修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgVehicleInformationMapper.xml

@@ -109,7 +109,8 @@
                tjvi.cancel_reason as cancelReason,
                tjvi.reg_type        as regType,
                tjvi.org_branch_code as orgBranchCode,
-               tjvi.org_branch_name as orgBranchName
+               tjvi.org_branch_name as orgBranchName,
+               tjvi.identification_code as identificationCode
         from tzs_jg_vehicle_information tjvi
     </sql>
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgVehicleInformationServiceImpl.java

@@ -1098,8 +1098,20 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
     }
 
     public Page<Map<String, Object>> getPageList(JgVehicleInformationDto dto, String sort, Page<Map<String, Object>> page, List<String> roleIds, String client) {
-        SortVo sortMap = commonService.sortFieldConversion(sort);
-        return this.baseMapper.getListPage(page, sortMap, dto, roleIds, client);
+        try {
+            SortVo sortMap = commonService.sortFieldConversion(sort);
+            return this.baseMapper.getListPage(page, sortMap, dto, roleIds, client);
+        } catch (Exception ex) {
+            String msg = ex.getMessage() == null ? "" : ex.getMessage();
+            if (msg.contains("eyibc decrypt error")
+                    || msg.contains("EYIBCException")
+                    || msg.contains("olym jdbc error")
+                    || msg.contains("数据非法")
+                    || msg.contains("decrypt error, code: -65")) {
+                throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");
+            }
+            throw new BadRequest("系统内部错误，请联系管理员。");
+        }
     }
 
     private void updateEquipMessage(JgVehicleInformation jgVehicleInformation, JSONObject map, IdxBizJgRegisterInfo registerInfo, IdxBizJgOtherInfo otherInfo) {

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -204,26 +204,38 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	@Override
 	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto, String sort) {
-		List<String> orgCodeList = new ArrayList<>();
-		if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
-			FeignClientResult<CompanyModel> result = Privilege.companyClient
-					.seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
-			if (result.getResult() != null) {
-				tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
+		try {
+			List<String> orgCodeList = new ArrayList<>();
+			if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
+				FeignClientResult<CompanyModel> result = Privilege.companyClient
+						.seleteOne(Long.valueOf(tzBaseEnterpriseInfoDto.getSuperviseKey()));
+				if (result.getResult() != null) {
+					tzBaseEnterpriseInfoDto.setSuperviseOrgCode(result.getResult().getOrgCode());
+				}
 			}
-		}
-		Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
-		List<JSONObject> companyType1 = equipmentCategoryService.getCompanyType();
-		if (!ValidationUtil.isEmpty(companyType1)) {
-			for (JSONObject jsonObject : companyType1) {
-				String orgCode = jsonObject.getString("orgCode");
-				if (!ValidationUtil.isEmpty(orgCode)) {
-					orgCodeList.add(orgCode);
+			Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+			List<JSONObject> companyType1 = equipmentCategoryService.getCompanyType();
+			if (!ValidationUtil.isEmpty(companyType1)) {
+				for (JSONObject jsonObject : companyType1) {
+					String orgCode = jsonObject.getString("orgCode");
+					if (!ValidationUtil.isEmpty(orgCode)) {
+						orgCodeList.add(orgCode);
+					}
 				}
 			}
+			SortVo sortMap = userInfoService.sortFieldConversion(sort);
+			return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCodeList, sortMap);
+		} catch (Exception ex) {
+			String msg = ex.getMessage() == null ? "" : ex.getMessage();
+			if (msg.contains("eyibc decrypt error")
+					|| msg.contains("EYIBCException")
+					|| msg.contains("olym jdbc error")
+					|| msg.contains("数据非法")
+					|| msg.contains("decrypt error, code: -65")) {
+				throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");
+			}
+			throw new BadRequest("系统内部错误，请联系管理员。");
 		}
-		SortVo sortMap = userInfoService.sortFieldConversion(sort);
-		return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCodeList, sortMap);
 	}
 
 	@Override
@@ -1032,20 +1044,32 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	@Override
 	public IPage<TzBaseEnterpriseInfoDto> getInfoById(Long sequenceNbr, String companyCode) {
-		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(sequenceNbr);
+		try {
+			TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(sequenceNbr);
 
-		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detailById(tzBaseEnterpriseInfo);
-		convertDto(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+			TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detailById(tzBaseEnterpriseInfo);
+			convertDto(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
 
-		LambdaQueryWrapper<TzsBaseInstitution> lambda = new QueryWrapper<TzsBaseInstitution>().lambda();
-		lambda.eq(TzsBaseInstitution::getEnterpriseId, tzBaseEnterpriseInfo.getSequenceNbr());
-		TzsBaseInstitution tzsBaseInstitution = tzsBaseInstitutionService.getBaseMapper().selectOne(lambda);
-		tzBaseEnterpriseInfoDto.setRegUnitMessage(tzsBaseInstitution);
-		tzBaseEnterpriseInfoDto.setUserPermissionList(userInfoService.getUserPermissionOfCurrentLogin(UserPermissionDto.builder().cityCode(companyCode).build()));
-
-		Page<TzBaseEnterpriseInfoDto> page = new Page<>(1, 10);
-		page.setRecords(Arrays.asList(tzBaseEnterpriseInfoDto));
-		return page;
+			LambdaQueryWrapper<TzsBaseInstitution> lambda = new QueryWrapper<TzsBaseInstitution>().lambda();
+			lambda.eq(TzsBaseInstitution::getEnterpriseId, tzBaseEnterpriseInfo.getSequenceNbr());
+			TzsBaseInstitution tzsBaseInstitution = tzsBaseInstitutionService.getBaseMapper().selectOne(lambda);
+			tzBaseEnterpriseInfoDto.setRegUnitMessage(tzsBaseInstitution);
+			tzBaseEnterpriseInfoDto.setUserPermissionList(userInfoService.getUserPermissionOfCurrentLogin(UserPermissionDto.builder().cityCode(companyCode).build()));
+
+			Page<TzBaseEnterpriseInfoDto> page = new Page<>(1, 10);
+			page.setRecords(Arrays.asList(tzBaseEnterpriseInfoDto));
+			return page;
+		} catch (Exception ex) {
+			String msg = ex.getMessage() == null ? "" : ex.getMessage();
+			if (msg.contains("eyibc decrypt error")
+					|| msg.contains("EYIBCException")
+					|| msg.contains("olym jdbc error")
+					|| msg.contains("数据非法")
+					|| msg.contains("decrypt error, code: -65")) {
+				throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");
+			}
+			throw new BadRequest("系统内部错误，请联系管理员。");
+		}
 	}
 
 	private TzBaseEnterpriseInfoDto detailById(TzBaseEnterpriseInfo tzBaseEnterpriseInfo) {

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -1085,24 +1085,36 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     }
 
     public Page<UserPermissionDto> getUserByPermission(long current, long size, String type, UserPermissionDto filter, String sort) {
-        Page<UserPermissionDto> permissionDtoPage = new Page<>(current, size);
-        List<String> post = this.getPostByType(type);
-        SortVo sortMap = this.sortFieldConversion(sort);
-        Page<UserPermissionDto> result = this.getBaseMapper().queryUserByPermissionPage(permissionDtoPage, post, filter, sortMap);
-        result.getRecords().forEach(d -> {
-            if (StringUtils.isNotEmpty(d.getIdentificationStr())) {
-                // 照片赋值
-                List<CommonFile> commonFiles = JSON.parseArray(d.getIdentificationStr(), CommonFile.class);
-                if (!ObjectUtils.isEmpty(commonFiles)) {
-                    d.setPhotoUrl(commonFiles.get(0).getUrl());
+        try {
+            Page<UserPermissionDto> permissionDtoPage = new Page<>(current, size);
+            List<String> post = this.getPostByType(type);
+            SortVo sortMap = this.sortFieldConversion(sort);
+            Page<UserPermissionDto> result = this.getBaseMapper().queryUserByPermissionPage(permissionDtoPage, post, filter, sortMap);
+            result.getRecords().forEach(d -> {
+                if (StringUtils.isNotEmpty(d.getIdentificationStr())) {
+                    // 照片赋值
+                    List<CommonFile> commonFiles = JSON.parseArray(d.getIdentificationStr(), CommonFile.class);
+                    if (!ObjectUtils.isEmpty(commonFiles)) {
+                        d.setPhotoUrl(commonFiles.get(0).getUrl());
+                    }
                 }
+                // 人员类型枚举转name
+                d.setPost(this.isJSONValid(d.getPost()) ? d.getPost() : "[\"" + d.getPost() + "\"]");
+                d.setPostName(this.setPostName(d.getPost()));
+                d.setPermissionStatus(this.castNoPermissionData(type, d.getPermissionStatus()));
+            });
+            return result;
+        } catch (Exception ex) {
+            String msg = ex.getMessage() == null ? "" : ex.getMessage();
+            if (msg.contains("eyibc decrypt error")
+                    || msg.contains("EYIBCException")
+                    || msg.contains("olym jdbc error")
+                    || msg.contains("数据非法")
+                    || msg.contains("decrypt error, code: -65")) {
+                throw new BadRequest("数据完整性被破坏（解密失败），请联系管理员。");
             }
-            // 人员类型枚举转name
-            d.setPost(this.isJSONValid(d.getPost()) ? d.getPost() : "[\"" + d.getPost() + "\"]");
-            d.setPostName(this.setPostName(d.getPost()));
-            d.setPermissionStatus(this.castNoPermissionData(type, d.getPermissionStatus()));
-        });
-        return result;
+            throw new BadRequest("系统内部错误，请联系管理员。");
+        }
     }
 
     private String castNoPermissionData(String type, String permissionStatus) {