Kaynağa Gözat

辉南林业

Wubaozaizhong 2 yıl önce
ebeveyn
işleme
cd8278f51c

+ 3 - 1
mybusiness/src/main/java/com/business/slfh/visualization/event/controller/Visualization_Event_Controller.java

@@ -139,7 +139,9 @@ public class Visualization_Event_Controller extends AppBaseController {
         //瞭望塔总数
         int Visualization_Tower_Count = visualization_event_service.Visualization_Tower_Count();
         //摄像头总数
-        int Visualization_Camera_Count = visualization_event_service.Visualization_Camera_Count();
+        Visualization_Camera visualization_camera = new Visualization_Camera();
+        visualization_camera.setDEPTID(userInfoUtil.getLoginUserInfo().getDeptId().toString());
+        int Visualization_Camera_Count = visualization_event_service.Visualization_Camera_Count(visualization_camera);
         //待处理列表
         Visualization_Event event = new Visualization_Event();
         event.setNAME(EVENTNAME);

+ 1 - 1
mybusiness/src/main/java/com/business/slfh/visualization/event/mapper/Visualization_Event_Mapper.java

@@ -14,7 +14,7 @@ public interface Visualization_Event_Mapper {
     int Visualization_User_Count(@Param("DEPT_ID") String DEPT_ID);
     int Visualization_Car_Count(@Param("DEPT_ID") String DEPT_ID);
     int Visualization_Tower_Count(@Param("DEPT_ID") String DEPT_ID);
-    int Visualization_Camera_Count(@Param("DEPT_ID") String DEPT_ID);
+    int Visualization_Camera_Count(Visualization_Camera camera);
     Visualization_Camera getNearestCamera();
     List<Visualization_Event> Visualization_Pending_List(@Param("eventName") String eventName,@Param("startTime") String startTime,@Param("endTime") String endTime,@Param("DEPT_ID") String DEPT_ID);
     List<Visualization_Event> Visualization_Pending_List(Visualization_Event event);

+ 1 - 1
mybusiness/src/main/java/com/business/slfh/visualization/event/service/Visualization_Event_Service.java

@@ -12,7 +12,7 @@ public interface Visualization_Event_Service {
     int Visualization_User_Count();
     int Visualization_Car_Count();
     int Visualization_Tower_Count();
-    int Visualization_Camera_Count();
+    int Visualization_Camera_Count(Visualization_Camera camera);
     List<Visualization_Event> Visualization_Pending_List(String eventName, String startTime, String endTime, String DEPT_ID);
     List<Visualization_Event> Visualization_Pending_List(Visualization_Event event);
     Visualization_Camera getNearestCamera();

+ 3 - 3
mybusiness/src/main/java/com/business/slfh/visualization/event/service/impl/Visualization_Event_Service_Impl.java

@@ -50,9 +50,9 @@ public class Visualization_Event_Service_Impl extends BaseService implements Vis
     }
 
     @Override
-    public int Visualization_Camera_Count() {
-        String dept_id = userInfoUtil.getLoginUserInfo().getDeptId().toString();
-        return Visualization_Event_Mapper.Visualization_Camera_Count(dept_id);
+    @DataScope(deptAlias = "m")
+    public int Visualization_Camera_Count(Visualization_Camera camera) {
+        return Visualization_Event_Mapper.Visualization_Camera_Count(camera);
     }
 
     @Override

+ 3 - 6
mybusiness/src/main/resources/mapper/grid/visualization/Visualization_Event_Mapper.xml

@@ -503,14 +503,11 @@
                 SELECT
                     *
                 FROM
-                    t_res_camera
+                    t_res_camera m
                 WHERE
                     1 = 1
-                AND DEPT_ID IN (
-                <include refid="Depts">
-                    <property name="dept_id" value="#{DEPT_ID}"/>
-                </include>
-                )
+                <!-- 数据范围过滤 -->
+                ${params.dataScope}
             ) t
     </select>