1

src/main/java/com/sooka/sponest/data/digitalemergency/controller/EmergencyBigDataController.java

@@ -10,6 +10,7 @@ import com.sooka.sponest.data.digitalemergency.domain.bo.VisuEmergencyCenterData
 import com.sooka.sponest.data.digitalemergency.domain.dto.TBusEnterpriseDto;
 import com.sooka.sponest.data.digitalemergency.domain.vo.CenterdataTEmergencyEnterpriseMessageBody;
 import com.sooka.sponest.data.digitalemergency.domain.vo.DayBody;
+import com.sooka.sponest.data.digitalemergency.domain.vo.TBasicEnterindesmapCount;
 import com.sooka.sponest.data.digitalemergency.service.IEmergencyBigDataService;
 import com.sooka.sponest.data.digitalfirecontrol.service.IFireControlBigDataService;
 import io.swagger.annotations.Api;
@@ -67,8 +68,8 @@ public class EmergencyBigDataController extends BaseController {
      */
     @ApiOperation(value = "",notes = "")
     @GetMapping("/selectIndustryHighList")
-    public AjaxResult selectIndustryHighList( ) {
-        return AjaxResult.success(emergencyBigDataService.selectIndustryHighList());
+    public AjaxResult selectIndustryHighList(TBasicEnterindesmapCount tBasicEnterindesmapCount) {
+        return AjaxResult.success(emergencyBigDataService.selectIndustryHighList(tBasicEnterindesmapCount));
     }
 
     /**

src/main/java/com/sooka/sponest/data/digitalemergency/service/IEmergencyBigDataService.java

@@ -6,6 +6,7 @@ import com.sooka.sponest.data.digitalemergency.domain.dto.TBusEnterpriseDto;
 import com.sooka.sponest.data.digitalemergency.domain.vo.CenterdataTEmergencyEnterpriseMessageBody;
 import com.sooka.sponest.data.digitalemergency.domain.vo.CenterdataTEmergencyPatrolpointBody;
 import com.sooka.sponest.data.digitalemergency.domain.vo.DayBody;
+import com.sooka.sponest.data.digitalemergency.domain.vo.TBasicEnterindesmapCount;
 
 import java.util.List;
 import java.util.Map;
@@ -22,7 +23,7 @@ public interface IEmergencyBigDataService {
      *
      * @return
      */
-    List selectIndustryHighList( );
+    List selectIndustryHighList(TBasicEnterindesmapCount tBasicEnterindesmapCount);
 
     /**
      * 获取企业分布

src/main/java/com/sooka/sponest/data/digitalemergency/service/impl/EmergencyBigDataServiceImpl.java

@@ -59,8 +59,8 @@ public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEme
      * @return
      */
     @Override
-    public List<Map<String, Object>> selectIndustryHighList() {
-        TBasicEnterindesmapCount tBasicEnterindesmapCount = new TBasicEnterindesmapCount();
+    @DataScopeMutiDept(deptAlias = "d")
+    public List<Map<String, Object>> selectIndustryHighList(TBasicEnterindesmapCount tBasicEnterindesmapCount) {
         setSookaDataBase(tBasicEnterindesmapCount);
         return emergencyBigDataMapper.selectIndustryHighList(tBasicEnterindesmapCount);
     }

src/main/resources/mapper/digitalemergency/CentereventTEmergencyInspectionrecordMapper.xml

@@ -162,11 +162,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectEmergencyList" parameterType="EmergencyInspectionrecordSelectBody" resultType="java.util.Map">
         SELECT
             count(*) value,
-	        sd.dept_name name
+	        d.dept_name name
         FROM
             t_bus_log g
             LEFT JOIN t_bus_enterprise e ON g.bus_enterprise_id = e.bus_enterprise_id
-            left join onest_system.sys_dept sd on e.dept_id = sd.dept_id
+            left join onest_system.sys_dept d on e.dept_id = d.dept_id
+        <where>
+            ${params.dataScope}
+        </where>
         GROUP BY e.dept_id
     </select>
 </mapper>

src/main/resources/mapper/digitalemergency/EmergencyBigDataMapper.xml

@@ -15,11 +15,12 @@
     </select>
 
     <select id="selectIndustryHighList" parameterType="TBasicEnterindesmapCount" resultType="java.util.Map">
-        SELECT dept.dept_name AS `name`,COUNT(ente.dept_id) AS `value` FROM `t_bus_inspection` insp
+        SELECT d.dept_name AS `name`,COUNT(ente.dept_id) AS `value` FROM `t_bus_inspection` insp
         LEFT JOIN t_bus_log log on insp.bus_log_id = log.bus_log_id
         LEFT JOIN centerdata_t_emergency_enterprise ente ON log.bus_enterprise_id = ente.id
-        LEFT JOIN ${database_system}.sys_dept dept ON dept.dept_id = ente.dept_id
-        WHERE insp.is_pass = 'N' AND ente.dept_id is not null GROUP BY ente.dept_id
+        LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = ente.dept_id
+        WHERE insp.is_pass = 'N' AND ente.dept_id is not null ${params.dataScope}
+        GROUP BY ente.dept_id
     </select>
 
     <select id="selectPersonnelList" resultType="java.util.Map">