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) {
+        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,6 +204,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	@Override
 	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto, String sort) {
+		try {
 			List<String> orgCodeList = new ArrayList<>();
 			if (tzBaseEnterpriseInfoDto.getSuperviseKey() != null) {
 				FeignClientResult<CompanyModel> result = Privilege.companyClient
@@ -224,6 +225,17 @@ public class TzBaseEnterpriseInfoServiceImpl
 			}
 			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("系统内部错误，请联系管理员。");
+		}
 	}
 
 	@Override
@@ -1032,6 +1044,7 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	@Override
 	public IPage<TzBaseEnterpriseInfoDto> getInfoById(Long sequenceNbr, String companyCode) {
+		try {
 			TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(sequenceNbr);
 
 			TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detailById(tzBaseEnterpriseInfo);
@@ -1046,6 +1059,17 @@ public class TzBaseEnterpriseInfoServiceImpl
 			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,6 +1085,7 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     }
 
     public Page<UserPermissionDto> getUserByPermission(long current, long size, String type, UserPermissionDto filter, String sort) {
+        try {
             Page<UserPermissionDto> permissionDtoPage = new Page<>(current, size);
             List<String> post = this.getPostByType(type);
             SortVo sortMap = this.sortFieldConversion(sort);
@@ -1103,6 +1104,17 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                 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("数据完整性被破坏（解密失败），请联系管理员。");
+            }
+            throw new BadRequest("系统内部错误，请联系管理员。");
+        }
     }
 
     private String castNoPermissionData(String type, String permissionStatus) {