大屏定时任务

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/BscEnterpriseScreenController.java

@@ -36,8 +36,9 @@ public class BscEnterpriseScreenController {
      */
     @GetMapping("screenDataStatistic")
     public ApiResult<Object> screenDataStatistic(@RequestParam(value = "dataType") String dataType,
-                                                 @RequestParam(value = "moduleType") String moduleType) {
-        return ApiResult.success(bscEnterpriseScreenService.screenDataStatistic(dataType, moduleType));
+                                                 @RequestParam(value = "moduleType") String moduleType,
+                                                 @RequestParam(value = "dataType1", required = false) String dataType1) {
+        return ApiResult.success(bscEnterpriseScreenService.screenDataStatistic(dataType, moduleType, dataType1));
     }
 
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/BscEnterpriseScreenService.java

@@ -23,7 +23,7 @@ public interface BscEnterpriseScreenService extends CrudService<BscEnterpriseScr
      * @param moduleType 模块类型
      * @return
      */
-    Object screenDataStatistic(String dataType, String moduleType);
+    Object screenDataStatistic(String dataType, String moduleType,String dataType1);
 
     /**
      * 定时任务逻辑

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BscEnterpriseScreenServiceImpl.java

@@ -81,7 +81,7 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
     private AlarmVideoService alarmVideoService;
 
     @Override
-    public Object screenDataStatistic(String dataType, String moduleType) {
+    public Object screenDataStatistic(String dataType, String moduleType,String dataType1) {
         String companyId = baseUserCompanyService.companyId();
         if (StringUtils.isBlank(companyId)) {
             throw new BusinessException("用户未绑定联网单位");
@@ -137,7 +137,13 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
             }
         }
         JSONObject jsonObject = JSONObject.parseObject(data.toString());
-        Object disparateData = jsonObject.get(dataType);
+        Object disparateData = new Object();
+        if (moduleType.equals("patrolInspection")){
+            disparateData = jsonObject.get(dataType1);
+        }else {
+            disparateData = jsonObject.get(dataType);
+        }
+
         return disparateData;
     }