更新

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

@@ -274,12 +274,12 @@ public class SupervisionConfigureController extends AbstractBaseController {
     @RequestMapping(value = "/alarmTrend", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "报警类型趋势", produces = "application/json;charset=UTF-8", notes = "报警类型趋势")
-    public ResponseModel alarmTrend(@RequestParam(required = false) String bizOrgCode) {
+    public ResponseModel alarmTrend(@RequestParam(required = false) String bizOrgCode, @RequestParam(required = false) String companyCode) {
         if (StringUtils.isEmpty(bizOrgCode)) {
             ReginParams reginParams = getSelectedOrgInfo();
             bizOrgCode = !ValidationUtil.isEmpty(reginParams.getPersonIdentity()) && StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null;
         }
-        return CommonResponseUtil.success(equipmentSpecificAlarmService.alarmTrend(bizOrgCode));
+        return CommonResponseUtil.success(equipmentSpecificAlarmService.alarmTrend(bizOrgCode, companyCode));
     }
 
     @PersonIdentify

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificAlarmService.java

@@ -100,7 +100,7 @@ public interface IEquipmentSpecificAlarmService extends IService<EquipmentSpecif
     Page<Map<String, Object>> dcFireAlarmLogPage(CommonPageInfoParam param);
 
     List<Map<String, Object>> stationInfo();
-    List<Map<String, Object>> alarmTrend(String bizOrgCode);
+    List<Map<String, Object>> alarmTrend(String bizOrgCode, String companyCode);
 
     List<Map<String, Object>> allList(CommonPageInfoParam param);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -853,9 +853,17 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     }
 
     @Override
-    public List<Map<String, Object>> alarmTrend(String bizOrgCode) {
-        return this.baseMapper.alarmTrend(bizOrgCode);
+    public List<Map<String, Object>> alarmTrend(String bizOrgCode, String companyCode) {
+        if (StringUtils.isNotEmpty(companyCode)) {
+            bizOrgCode = fireFightingSystemMapper.queryByCompanyCode(companyCode);
+            return this.baseMapper.alarmTrend(bizOrgCode);
+        } else if (StringUtils.isNotEmpty(bizOrgCode)) {
+            return this.baseMapper.alarmTrend(bizOrgCode);
+        } else {
+            return new ArrayList<>();
+        }
     }
+
     @Override
     public List<Map<String, Object>> stationInfo() {
         return this.baseMapper.stationInfo();