mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-08-13 17:53:45 +08:00
bugfix
This commit is contained in:
@@ -9,6 +9,7 @@ import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
|
|||||||
import com.jsowell.common.core.page.PageResponse;
|
import com.jsowell.common.core.page.PageResponse;
|
||||||
import com.jsowell.common.response.RestApiResponse;
|
import com.jsowell.common.response.RestApiResponse;
|
||||||
import com.jsowell.common.util.SecurityUtils;
|
import com.jsowell.common.util.SecurityUtils;
|
||||||
|
import com.jsowell.common.util.StringUtils;
|
||||||
import com.jsowell.pile.domain.PileMerchantInfo;
|
import com.jsowell.pile.domain.PileMerchantInfo;
|
||||||
import com.jsowell.pile.dto.business.QueryConnectorInfoDTO;
|
import com.jsowell.pile.dto.business.QueryConnectorInfoDTO;
|
||||||
import com.jsowell.pile.service.OrderBasicInfoService;
|
import com.jsowell.pile.service.OrderBasicInfoService;
|
||||||
@@ -67,6 +68,10 @@ public class BusinessConnectorInfoController extends BaseController {
|
|||||||
return pileStationInfoService.getIdsByDeptId(deptId);
|
return pileStationInfoService.getIdsByDeptId(deptId);
|
||||||
}else {
|
}else {
|
||||||
// 平台管理员或运营商管理员
|
// 平台管理员或运营商管理员
|
||||||
|
if (StringUtils.equals("100", deptId)) {
|
||||||
|
// depid = 100,说明为平台级别账号,可查看所有数据
|
||||||
|
return pileStationInfoService.getAllStationId();
|
||||||
|
}
|
||||||
// 根据部门id查询merchantId
|
// 根据部门id查询merchantId
|
||||||
PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId);
|
PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId);
|
||||||
if (pileMerchantInfo != null) {
|
if (pileMerchantInfo != null) {
|
||||||
|
|||||||
@@ -82,6 +82,10 @@ public class BusinessFinancialController extends BaseController {
|
|||||||
return pileStationInfoService.getIdsByDeptId(deptId);
|
return pileStationInfoService.getIdsByDeptId(deptId);
|
||||||
}else {
|
}else {
|
||||||
// 平台管理员或运营商管理员
|
// 平台管理员或运营商管理员
|
||||||
|
if (com.jsowell.common.util.StringUtils.equals("100", deptId)) {
|
||||||
|
// depid = 100,说明为平台级别账号,可查看所有数据
|
||||||
|
return pileStationInfoService.getAllStationId();
|
||||||
|
}
|
||||||
// 根据部门id查询merchantId
|
// 根据部门id查询merchantId
|
||||||
PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId);
|
PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId);
|
||||||
if (pileMerchantInfo != null) {
|
if (pileMerchantInfo != null) {
|
||||||
|
|||||||
@@ -65,6 +65,10 @@ public class BusinessStationInfoController extends BaseController {
|
|||||||
return pileStationInfoService.getIdsByDeptId(deptId);
|
return pileStationInfoService.getIdsByDeptId(deptId);
|
||||||
}else {
|
}else {
|
||||||
// 平台管理员或运营商管理员
|
// 平台管理员或运营商管理员
|
||||||
|
if (StringUtils.equals("100", deptId)) {
|
||||||
|
// depid = 100,说明为平台级别账号,可查看所有数据
|
||||||
|
return pileStationInfoService.getAllStationId();
|
||||||
|
}
|
||||||
// 根据部门id查询merchantId
|
// 根据部门id查询merchantId
|
||||||
PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId);
|
PileMerchantInfo pileMerchantInfo = pileMerchantInfoService.queryInfoByDeptId(deptId);
|
||||||
if (pileMerchantInfo != null) {
|
if (pileMerchantInfo != null) {
|
||||||
|
|||||||
@@ -163,4 +163,6 @@ public interface PileStationInfoMapper {
|
|||||||
* @return 城市设备数量列表
|
* @return 城市设备数量列表
|
||||||
*/
|
*/
|
||||||
List<CityDeviceCountVO> getCityDeviceCount();
|
List<CityDeviceCountVO> getCityDeviceCount();
|
||||||
|
|
||||||
|
List<String> getAllStationId();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -250,4 +250,10 @@ public interface PileStationInfoService {
|
|||||||
* 按城市统计设备数量
|
* 按城市统计设备数量
|
||||||
*/
|
*/
|
||||||
List<CityDeviceCountVO> getCityDeviceCount();
|
List<CityDeviceCountVO> getCityDeviceCount();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取所有站点id
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
List<String> getAllStationId();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1690,4 +1690,9 @@ public class PileStationInfoServiceImpl implements PileStationInfoService {
|
|||||||
return pileStationInfoMapper.getCityDeviceCount();
|
return pileStationInfoMapper.getCityDeviceCount();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> getAllStationId() {
|
||||||
|
return pileStationInfoMapper.getAllStationId();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -809,4 +809,11 @@
|
|||||||
GROUP BY cityName
|
GROUP BY cityName
|
||||||
ORDER BY deviceCount DESC
|
ORDER BY deviceCount DESC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
<select id="getAllStationId" resultType="java.lang.String">
|
||||||
|
select id
|
||||||
|
from
|
||||||
|
pile_station_info
|
||||||
|
where del_flag = '0'
|
||||||
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
Reference in New Issue
Block a user