获取当前登陆人信息修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/PersonIdentify.java

+package com.yeejoin.equipmanage.config;
+
+import java.lang.annotation.*;
+
+/**
+ * @author DELL
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface PersonIdentify {
+	/**
+	 * 是否进行人员校验
+	 * @return boolean
+	 */
+	boolean isNeedIdentity() default true;
+}
+

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/config/PersonIdentifyAspect.java

@@ -40,14 +40,14 @@ public class PersonIdentifyAspect {
 
 //    package com.yeejoin.equipmanage.controller;
 //    com.yeejoin.amos.boot.biz.common.controller.BaseController
-    @Pointcut("execution(public * com.*.equipmanage.controller..*(..))")
-    public void userDate() {
-
-    }
+//    @Pointcut("execution(public * com.*.equipmanage.controller..*(..))")
+//    public void userDate() {
+//
+//    }
 
 
-    @Before("userDate()")
-    public void personIdentity(JoinPoint joinPoint) {
+    @Before(value = "@annotation(com.yeejoin.equipmanage.config.PersonIdentify) && @annotation(permission)")
+    public void personIdentity(JoinPoint joinPoint, PersonIdentify permission) {
         if(RequestContext.getToken() != null && RequestContext.getExeUserId() != null){
             ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/ConfigureController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.equipmanage.common.utils.*;
+import com.yeejoin.equipmanage.config.PersonIdentify;
 import com.yeejoin.equipmanage.fegin.IotFeign;
 import com.yeejoin.equipmanage.mapper.FireFightingSystemMapper;
 import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
@@ -46,6 +47,7 @@ public class ConfigureController extends AbstractBaseController {
     @Autowired
     private IotFeign iotFeign;
 
+    @PersonIdentify
     @RequestMapping(value = "/alarmLogPage", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "列表分页查询", produces = "application/json;charset=UTF-8", notes = "列表分页查询")
@@ -69,6 +71,7 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(equipmentSpecificAlarmService.pageQuery(param));
     }
 
+    @PersonIdentify
     @RequestMapping(value = "/equipStatusCount", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "系统设备状态统计", produces = "application/json;charset=UTF-8", notes = "系统设备状态统计")
@@ -88,6 +91,7 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(equipmentSpecificAlarmService.equipStatusCount(hashMap));
     }
 
+    @PersonIdentify
     @RequestMapping(value = "/equipAlarmLine", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "系统近一周告警趋势图", produces = "application/json;charset=UTF-8", notes = "系统近一周告警趋势图")
@@ -110,6 +114,7 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(equipmentSpecificAlarmService.equipAlarmLine(hashMap));
     }
 
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取系统告警信息")
     @GetMapping("/getSystemAlarmInfo")
@@ -127,6 +132,7 @@ public class ConfigureController extends AbstractBaseController {
     }
 
 
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取设备告警待确认和未处理信息（根据系统编码查询）")
     @GetMapping("/getEquipAlarmInfoNum")
@@ -136,6 +142,7 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(fireFightingSystemMapper.getEquipAlarmInfoNum(systemCode, bizOrgCode));
     }
 
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取消防力量信息（队伍值班等(专职)）")
     @GetMapping("/getFireTeamInfoBy116")
@@ -145,6 +152,7 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(fireFightingSystemMapper.getFireTeamInfoBy116(bizOrgCode));
     }
 
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取消防力量信息（队伍值班等(志愿消防队)）")
     @GetMapping("/getFireTeamInfoBy117")
@@ -153,7 +161,7 @@ public class ConfigureController extends AbstractBaseController {
         String bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
         return CommonResponseUtil.success(fireFightingSystemMapper.getFireTeamInfoBy117(bizOrgCode));
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "消防车辆信息")
     @GetMapping("/getFireCarInfo")
@@ -162,7 +170,7 @@ public class ConfigureController extends AbstractBaseController {
         String bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
         return CommonResponseUtil.success(fireFightingSystemMapper.getFireCarInfo(bizOrgCode));
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "物联监控页面消防车辆信息")
     @GetMapping("/getFireCarInfoByWL")
@@ -193,7 +201,7 @@ public class ConfigureController extends AbstractBaseController {
         }
         return CommonResponseUtil.success(fireCarInfoByWL);
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "概览水源信息")
     @GetMapping("/getWaterInfo")
@@ -206,7 +214,7 @@ public class ConfigureController extends AbstractBaseController {
         Page page = new Page<>(commonPageable.getPageNumber(), commonPageable.getPageSize());
         return CommonResponseUtil.success(fireFightingSystemMapper.getWaterInfo(page, bizOrgCode, null));
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "概览稳压泵信息")
     @GetMapping("/getPressurePumpInfo")
@@ -267,7 +275,7 @@ public class ConfigureController extends AbstractBaseController {
         }).collect(Collectors.toList());
         return CommonResponseUtil.success(pressurePumpInfo);
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "消防给水3小稳压泵信息")
     @GetMapping("/getPressurePumpInfo3Small")
@@ -328,7 +336,7 @@ public class ConfigureController extends AbstractBaseController {
         }).collect(Collectors.toList());
         return CommonResponseUtil.success(resultMap);
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "3小水源信息")
     @GetMapping("/getSmallWaterInfo")
@@ -356,7 +364,7 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(iFireFightingSystemService.getSmallWaterInfo(page, hashMap));
     }
 
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "获取系统名称（根据系统编码查询）")
     @GetMapping("/getSystemName")
@@ -378,7 +386,7 @@ public class ConfigureController extends AbstractBaseController {
         }
         return CommonResponseUtil.success(iFireFightingSystemService.getSystemName(hashMap));
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @ApiOperation(value = "获取系统工作状态（根据系统编码查询）")
     @GetMapping("/getSystemStatus")
@@ -400,7 +408,7 @@ public class ConfigureController extends AbstractBaseController {
         }
         return CommonResponseUtil.success(iFireFightingSystemService.getSystemStatus(hashMap));
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取系统近一月告警设备top5（根据系统编码查询）")
     @GetMapping("/getAlarmOneMonth")
@@ -423,7 +431,7 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(iFireFightingSystemService.equipAlarmTOP(hashMap));
     }
 
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "获取系统设备状态（根据系统编码查询）")
     @GetMapping("/getEquipmentState")
@@ -449,7 +457,7 @@ public class ConfigureController extends AbstractBaseController {
         }
         return CommonResponseUtil.success(iFireFightingSystemService.equipmentState(result, hashMap));
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "物联监控大屏3大-获取某站下装备数量、摄像头数量")
     @GetMapping("/statisticsByStation")
@@ -465,7 +473,7 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(iFireFightingSystemService.statisticsByStation(bizOrgCode));
     }
 
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "物联监控大屏3大-获取某站下今日告警设备")
     @GetMapping("/todayAlarmEquipment")
@@ -479,7 +487,7 @@ public class ConfigureController extends AbstractBaseController {
         }
         return CommonResponseUtil.success(iFireFightingSystemService.todayAlarmEquipment(bizOrgCode));
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "物联监控大屏3大-获取某站下今日告警信息")
     @GetMapping("/todayAlarmMessage")
@@ -494,7 +502,7 @@ public class ConfigureController extends AbstractBaseController {
         }
         return CommonResponseUtil.success(iFireFightingSystemService.todayAlarmMessage(bizOrgCode));
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "物联监控大屏3大-获取某站下未消除的告警设备")
     @GetMapping("/todayAlarmUnEliminateEquipment")
@@ -509,7 +517,7 @@ public class ConfigureController extends AbstractBaseController {
         }
         return CommonResponseUtil.success(iFireFightingSystemService.todayAlarmUnEliminateEquipment(bizOrgCode));
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "物联监控大屏3大-获取某站下未消除的告警信息")
     @GetMapping("/todayAlarmUnEliminateMessage")
@@ -525,7 +533,7 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(iFireFightingSystemService.todayAlarmUnEliminateMessage(bizOrgCode));
     }
 
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "物联监控大屏3大-获取某站下近一月的告警信息")
     @GetMapping("/monthAlarm")
@@ -540,7 +548,7 @@ public class ConfigureController extends AbstractBaseController {
         }
         return CommonResponseUtil.success(iFireFightingSystemService.monthAlarm(bizOrgCode));
     }
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "物联监控大屏3大-获取某站下近一年告警统计")
     @GetMapping("/yearsAlarm")
@@ -556,7 +564,7 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(iFireFightingSystemService.yearsAlarm(bizOrgCode));
     }
 
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "物联监控大屏3大-检测告警记录")
     @GetMapping("/alarmList")
@@ -575,7 +583,7 @@ public class ConfigureController extends AbstractBaseController {
         return CommonResponseUtil.success(iFireFightingSystemService.alarmList(page, bizOrgCode));
     }
 
-
+    @PersonIdentify
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/equipList")
     @ApiOperation(httpMethod = "GET", value = "装备列表-用于站端查看信息卡", notes = "装备列表-用于站端查看信息卡")