diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java index 1b8c212d..a513a628 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysSourceController.java @@ -227,7 +227,7 @@ public class SysSourceController extends BaseController { List seUserWorkCount = dailySysService.getSourceUserCount(startDate, endDate); // 还要计数资源位数量--未使用资源位数量=资源位总数-已使用数量. - int sourceCount = sysSourceService.selectSysSourceList(new SysSource()).size(); + Long sourceCount = sysSourceService.getSourceCountByCity(city); for(SourceUseCountDto sourceUseCountDto : seUserWorkCount){ sourceUseCountDto.setUnUseCount(sourceCount-sourceUseCountDto.getUseCount()); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java index 661c33e9..a9ebd112 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java @@ -88,4 +88,9 @@ public interface SysSourceMapper * 按xy坐标返回AR资源位图片 * */ public List getARSource(@Param("city") String city, @Param("scenic") String scenic, @Param("coordinates") List coordinates); + + /** + * 根据城市获取资源位数量 + * */ + public Long getSourceCountByCity(@Param("city") String city); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java index 477ce399..45692357 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java @@ -99,4 +99,10 @@ public interface ISysSourceService * 按xy坐标返回AR资源位图片 * */ public List getARSource(String city, String scenic, List coordinates); + + + /** + * 根据城市获取资源位数量 + * */ + public Long getSourceCountByCity(String city); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java index 3d81dead..494b61a5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java @@ -143,4 +143,12 @@ public class SysSourceServiceImpl implements ISysSourceService public List getARSource(String city, String scenic, List coordinates){ return sysSourceMapper.getARSource(city, scenic, coordinates); } + + /** + * 根据城市获取资源位数量 + * */ + @Override + public Long getSourceCountByCity(String city){ + return sysSourceMapper.getSourceCountByCity(city); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml index 40a08b62..718bd310 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml @@ -206,7 +206,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - +