1

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

@@ -7,10 +7,9 @@ import com.sooka.sponest.data.app.domain.VisuForestCloudMapVO;
 import com.sooka.sponest.data.digitalemergency.domain.CenterdataTEmergencyEnterprises;
 import com.sooka.sponest.data.digitalemergency.domain.CenterdataTEmergencyTeam;
 import com.sooka.sponest.data.digitalemergency.domain.bo.VisuEmergencyCenterDataCountBO;
+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.domain.CentereventTEmergencyInspectionrecord;
 import com.sooka.sponest.data.digitalemergency.service.IEmergencyBigDataService;
 import com.sooka.sponest.data.digitalfirecontrol.service.IFireControlBigDataService;
 import io.swagger.annotations.Api;
@@ -57,8 +56,8 @@ public class EmergencyBigDataController extends BaseController {
      * */
     @ApiOperation(value = "企业信息",notes = "企业信息")
     @GetMapping("/selectEnterpriseList")
-    public AjaxResult selectEnterpriseList() {
-        return AjaxResult.success(emergencyBigDataService.selectEnterpriseList());
+    public AjaxResult selectEnterpriseList(TBusEnterpriseDto vo) {
+        return AjaxResult.success(emergencyBigDataService.selectEnterpriseList(vo));
     }
 
     /**

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

@@ -2,11 +2,10 @@ package com.sooka.sponest.data.digitalemergency.service;
 
 import com.sooka.sponest.data.digitalemergency.domain.CenterdataTEmergencyEnterprises;
 import com.sooka.sponest.data.digitalemergency.domain.CenterdataTEmergencyTeam;
+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 com.sooka.sponest.data.digitalemergency.domain.CentereventTEmergencyInspectionrecord;
 
 import java.util.List;
 import java.util.Map;
@@ -30,7 +29,7 @@ public interface IEmergencyBigDataService {
      *
      * @return
      */
-    List selectEnterpriseList();
+    List selectEnterpriseList(TBusEnterpriseDto vo);
     // 物资分析
     List getBigDataMaterial();
     List selectCentereventTEmergencyDangerList();

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

@@ -47,10 +47,10 @@ public class EmergencyBigDataServiceImpl extends BaseServiceImpl implements IEme
 
     // 企业列表
     @Override
-    public List selectEnterpriseList() {
-        TBusEnterpriseDto dto=new TBusEnterpriseDto();
-        setSookaDataBase(dto);
-        return emergencyBigDataMapper.selectEnterpriseList(dto);
+    @DataScopeMutiDept(deptAlias = "d")
+    public List selectEnterpriseList(TBusEnterpriseDto vo) {
+        setSookaDataBase(vo);
+        return emergencyBigDataMapper.selectEnterpriseList(vo);
     }
 
     /**

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

@@ -8,9 +8,9 @@
         SELECT material_type AS `name`, sum(num) AS `value` FROM `t_bus_material` group by material_type DESC LIMIT 0,10
     </select>
     <select id="selectEnterpriseList" resultType="java.util.Map">
-        SELECT dept.dept_name AS `name`,count(ent.dept_id) AS `value` FROM `centerdata_t_emergency_enterprise` ent
-              LEFT JOIN ${database_system}.sys_dept dept ON dept.dept_id = ent.dept_id
-        WHERE dept.dept_name is not NULL
+        SELECT d.dept_name AS `name`,count(ent.dept_id) AS `value` FROM `centerdata_t_emergency_enterprise` ent
+              LEFT JOIN ${database_system}.sys_dept d ON d.dept_id = ent.dept_id
+        WHERE d.dept_name is not NULL  ${params.dataScope}
         GROUP BY ent.dept_id ORDER BY count(ent.dept_id) desc LIMIT 10
     </select>