修改数据推送导致预案无法启动

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/dao/mapper/ImpEquipMapper.java

@@ -22,5 +22,5 @@ public interface ImpEquipMapper extends BaseMapper {
 
     Long reservePageCount();
 
-    List<EquipmentDTO> reservePage(long start, int length);
+    List<EquipmentDTO> reservePage(@Param("start") long start,@Param("length")  int length);
 }

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/HandlerMqttMessageImpl.java

@@ -159,7 +159,7 @@ public class HandlerMqttMessageImpl implements IEquipmentHandlerService {
         String nameKey = equipmentSpecificIndex.getNameKey();
         EquipmentSpecificForRiskVo equipmentSpecific = equipmentSpecificMapper.getOneById(eqSpecId);
         //  三维屏指标状态推送
-        if (nameKeys.contains(nameKey)) {
+        if (nameKey !=null && nameKeys.contains(nameKey)) {
             if (equipmentSpecific != null) {
                 equipmentSpecificIndex.setId(equipmentSpecific.getId());
                 equipmentSpecificIndex.setName(equipmentSpecific.getName());

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/config/PermissionAspect.java

@@ -83,10 +83,6 @@ public class PermissionAspect {
 		try {
 			feignClientResult = Privilege.agencyUserClient.getme();
 			userModel = (AgencyUserModel) feignClientResult.getResult();
-
-		} catch (InnerInvokException e) {
-			e.printStackTrace();
-		}
 			String userId = null;
 			ReginParams regionParam = new ReginParams();
 			if(userModel != null){
@@ -115,6 +111,11 @@ public class PermissionAspect {
 					redisTemplate.opsForValue().set(buildKey(userId, token), JSONObject.toJSONString(regionParam));
 				}
 			}
+		} catch (InnerInvokException e) {
+			logger.error(e.getMessage());
+			e.printStackTrace();
+		}
+		
 	}
 
 	private DepartmentBo convertDepartmentModelToBo(DepartmentModel departmentModel){

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_impt_equip.xml

@@ -62,7 +62,7 @@
 		</trim>
 	</select>
 
-	<select id="reservePage" resultMap="resultMap">
+	<select id="reservePage" resultType="com.yeejoin.amos.fas.dao.dto.EquipmentDTO">
 		SELECT
 			a.id,
 			a.`name`,