新增大屏服务指导接口

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

@@ -4,6 +4,7 @@ package com.usky.fire.controller.web;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.fire.service.BscEnterpriseScreenService;
 import com.usky.fire.service.vo.DataVo;
+import com.usky.fire.service.vo.ServiceGuidanceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -63,5 +64,14 @@ public class BscEnterpriseScreenController {
         return ApiResult.success(bscEnterpriseScreenService.Alarmlist());
     }
 
+
+    /**
+     * 大屏服务指导数据获取
+     * @return
+     */
+    @GetMapping("serviceGuidance")
+    public ApiResult<ServiceGuidanceVO> serviceGuidance() {
+        return ApiResult.success(bscEnterpriseScreenService.serviceGuidance());
+    }
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemGridMember.java

@@ -55,8 +55,14 @@ public class DemGridMember implements Serializable {
      */
     private String mapGridName;
 
+    /**
+     * 网格人员姓名
+     */
     private String gridPersonnel;
 
+    /**
+     * 网格人员手机号
+     */
     private String gridPhone;
 
     /**

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

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.BscEnterpriseScreen;
 import com.usky.fire.service.vo.DataVo;
+import com.usky.fire.service.vo.ServiceGuidanceVO;
 
 import java.util.List;
 
@@ -92,4 +93,10 @@ public interface BscEnterpriseScreenService extends CrudService<BscEnterpriseScr
      * @return
      */
     Object patrolInspectionStatistics(String companyId);
+
+    /**
+     * 大屏服务指导数据查询
+     * @return ServiceGuidanceVO
+     */
+    ServiceGuidanceVO serviceGuidance();
 }

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

@@ -19,6 +19,7 @@ import com.usky.fire.service.*;
 import com.usky.fire.service.util.OnlineMethod;
 import com.usky.fire.service.vo.DataCountVo;
 import com.usky.fire.service.vo.DataVo;
+import com.usky.fire.service.vo.ServiceGuidanceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -709,4 +710,13 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
         return map;
     }
 
+    @Override
+    public ServiceGuidanceVO serviceGuidance() {
+        ServiceGuidanceVO serviceGuidanceVO = new ServiceGuidanceVO();
+        serviceGuidanceVO.setIotAlarmTips(9527L);
+        serviceGuidanceVO.setTotalPushTips(9527L);
+        serviceGuidanceVO.setRectificationCompletionRate(99.99);
+        serviceGuidanceVO.setReceiveRate(99.99);
+        return serviceGuidanceVO;
+    }
 }

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

@@ -40,6 +40,8 @@ public class DemGridMemberServiceImpl extends AbstractCrudService<DemGridMemberM
     @Autowired
     private DemGridMemderViceService demGridMemderViceService;
 
+    // private static final String MAP_URL = "https://onemap-api.shmh.gov.cn/onemap-services/trans/trans_cgcs2000_sh2000MapServer";
+
     @Override
     public CommonPage<DemGridMember> gridMemberList(String gridArea, String streetTown, String gridPersonnel, Integer id, Integer pageNum, Integer pageSize) {
         IPage<DemGridMember> page = new Page<>(pageNum, pageSize);

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/ServiceGuidanceVO.java

@@ -0,0 +1,33 @@
+package com.usky.fire.service.vo;
+
+import lombok.Data;
+
+/**
+ *
+ * @author fyc
+ * @email yuchuan.fu@chinausky.com
+ * @date 2025/10/14
+ */
+@Data
+public class ServiceGuidanceVO {
+
+    /**
+     * 推送提示总数
+     */
+    private Long totalPushTips;
+
+    /**
+     * 接收率
+     */
+    private double receiveRate;
+
+    /**
+     * 物联网告警提示数
+     */
+    private Long iotAlarmTips;
+
+    /**
+     * 整改完成率
+     */
+    private double rectificationCompletionRate;
+}

service-fire/service-fire-biz/src/main/resources/application.yml

@@ -43,12 +43,12 @@ spring:
     dynamic:
       datasource:
         master:
-          url: jdbc:mysql://192.168.10.165:3306/usky-fire?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&queryTimeout=2400
-          username: root
-          password: yt123456
-      #          driver-class-name: dm.jdbc.driver.DmDriver
-      #          password: Yt#75Usky
-      #          url: jdbc:dm://localhost:5237/SYSDBA?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
+#          url: jdbc:mysql://192.168.10.165:3306/usky-fire?useUnicode=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&queryTimeout=2400
+#          username: root
+#          password: yt123456
+          driver-class-name: dm.jdbc.driver.DmDriver
+          password: Yt#75Usky
+          url: jdbc:dm://localhost:5237/SYSDBA?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
       #          username: SYSDBA
       #        mhsystem:
       #          password: mysql570