接口调整---

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeCamera.java

@@ -42,6 +42,13 @@ public class LargeCamera extends CustomBaseEntity {
     private String cameraName;
 
     /**
+     * 摄像头编码
+     */
+    @Excel(name = "摄像头编码")
+    @ApiModelProperty("摄像头编码")
+    private String cameraCode;
+
+    /**
      * 所属项目id
      */
     @Excel(name = "所属项目id")

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargePlan.java

@@ -1,6 +1,8 @@
 package com.project.zcustom.domain.addional;
 
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.project.common.annotation.Excel;
@@ -80,6 +82,7 @@ public class LargePlan extends CustomBaseEntity {
     @ApiModelProperty("结束日期")
     private Date endTime;
 
+    @TableField(exist = false)
     private String projectName;
 
 }

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeProject.java

@@ -66,8 +66,9 @@ public class LargeProject extends CustomBaseEntity {
     @TableField(exist = false)
     private Long cameraNum;
 
-    private String subdivision;
+    private Long subdivision;
 
+    @TableField(exist = false)
     private Long num;
 
 }

project-zcustom/src/main/java/com/project/zcustom/service/basics/impl/PlatBasicsServiceImpl.java

@@ -340,9 +340,13 @@ public class PlatBasicsServiceImpl extends ServiceImpl<PlatBasicsMapper, PlatBas
         if (StringUtils.isNull(platBasics)) {
             StringUtils.getMapData("注册用户数", "registerNum", 0, tempMap);
             StringUtils.getMapData("活跃人数", "orderNum", 0, tempMap);
+            tempMap.put("onlineRate", "0.0");
         }else{
             StringUtils.getMapData("注册用户数", "registerNum", platBasics.getRegisterNum(), tempMap);
             StringUtils.getMapData("活跃人数", "orderNum", platBasics.getOrderNum(), tempMap);
+            double result = (double) platBasics.getOrderNum() / platBasics.getRegisterNum();
+            String formattedResult = String.format("%.1f%%", result * 100);
+            tempMap.put("onlineRate", formattedResult);
         }
         return tempMap;
     }

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeProjectMapper.xml

@@ -85,13 +85,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getProjectNumX" parameterType="String" resultMap="LargeProjectResult">
         select count(*) as num, subdivision from large_project
-        where del_flag = '0' and type = '0'
+        where del_flag = '0' and subdivision &lt;= 10
         group by subdivision
     </select>
 
     <select id="getProjectNumY" parameterType="String" resultMap="LargeProjectResult">
         select count(*) as num, subdivision from large_project
-        where del_flag = '0' and type = '2'
+        where del_flag = '0' and subdivision > 10
         group by subdivision
     </select>
 
@@ -117,7 +117,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             a.del_flag = '0'
           AND b.del_flag = '0'
-          AND a.type = '0'
           AND (
             DATE( a.start_time ) BETWEEN DATE_SUB( CURDATE(), INTERVAL ( DAYOFWEEK( CURDATE()) - 2 ) DAY )
             AND DATE_ADD( CURDATE(), INTERVAL ( 8 - DAYOFWEEK( CURDATE())) DAY )