diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessConnectorInfoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessConnectorInfoController.java index 84c1e0dfe..a222f3867 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessConnectorInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessConnectorInfoController.java @@ -9,6 +9,7 @@ import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.SecurityUtils; +import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.PileMerchantInfo; import com.jsowell.pile.dto.business.QueryConnectorInfoDTO; import com.jsowell.pile.service.OrderBasicInfoService; @@ -67,6 +68,10 @@ public class BusinessConnectorInfoController extends BaseController { return pileStationInfoService.getIdsByDeptId(deptId); }else { // 平台管理员或运营商管理员 + if (StringUtils.equals("100", deptId)) { + // depid = 100,说明为平台级别账号,可查看所有数据 + return pileStationInfoService.getAllStationId(); + } // 根据部门id查询merchantId PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId); if (pileMerchantInfo != null) { diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessFinancialController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessFinancialController.java index 1d631d3f9..b69fe388a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessFinancialController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessFinancialController.java @@ -82,6 +82,10 @@ public class BusinessFinancialController extends BaseController { return pileStationInfoService.getIdsByDeptId(deptId); }else { // 平台管理员或运营商管理员 + if (com.jsowell.common.util.StringUtils.equals("100", deptId)) { + // depid = 100,说明为平台级别账号,可查看所有数据 + return pileStationInfoService.getAllStationId(); + } // 根据部门id查询merchantId PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId); if (pileMerchantInfo != null) { diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java index 0d9faff2f..ee9520d5d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/BusinessStationInfoController.java @@ -65,6 +65,10 @@ public class BusinessStationInfoController extends BaseController { return pileStationInfoService.getIdsByDeptId(deptId); }else { // 平台管理员或运营商管理员 + if (StringUtils.equals("100", deptId)) { + // depid = 100,说明为平台级别账号,可查看所有数据 + return pileStationInfoService.getAllStationId(); + } // 根据部门id查询merchantId PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId); if (pileMerchantInfo != null) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java index a1543bf7f..457fc9067 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileStationInfoMapper.java @@ -163,4 +163,6 @@ public interface PileStationInfoMapper { * @return 城市设备数量列表 */ List getCityDeviceCount(); + + List getAllStationId(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java index 9d85b68e5..61da87117 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java @@ -250,4 +250,10 @@ public interface PileStationInfoService { * 按城市统计设备数量 */ List getCityDeviceCount(); + + /** + * 获取所有站点id + * @return + */ + List getAllStationId(); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index fc9a8db39..7201f6195 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -1690,4 +1690,9 @@ public class PileStationInfoServiceImpl implements PileStationInfoService { return pileStationInfoMapper.getCityDeviceCount(); } + @Override + public List getAllStationId() { + return pileStationInfoMapper.getAllStationId(); + } + } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml index be826b584..9593c6b3a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml @@ -809,4 +809,11 @@ GROUP BY cityName ORDER BY deviceCount DESC + +