From 6e5c80e48f244d966e1764743442961868399a81 Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Tue, 24 May 2022 21:08:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E7=BB=9F=E8=AE=A1-=E8=B5=84?= =?UTF-8?q?=E6=BA=90=E5=9B=BE=E8=B0=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/controller/CensusController.java | 14 ++++++++++++++ .../resource/service/ResourceService.java | 3 +++ .../service/impl/ResourceServiceImpl.java | 19 +++++++++++++++++++ .../impl/ResourceBrowseServiceImpl.java | 8 ++++---- .../resourceBrowse/ResourceBrowseDao.xml | 2 +- 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java index 1176baa6..35ce4d79 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java @@ -296,4 +296,18 @@ public class CensusController { return new Result().ok(resourceService.capabilityTypeCapabilitySet()); } + @GetMapping("/applicationAreaCapabilitySet") + @ApiOperation("资源图谱-应用领域-能力集") + @LogOperation("资源图谱-应用领域-能力集") + public Result applicationAreaCapabilitySet() { + return new Result().ok(resourceService.applicationAreaCapabilitySet()); + } + + @GetMapping("/selectResourceListByType") + @ApiOperation("资源图谱-能力类型-能力集-根据类型查能力") + @LogOperation("资源图谱-能力类型-能力集-根据类型查能力") + public Result selectResourceListByType(String type) { + return new Result().ok(resourceService.selectResourceListByType(type)); + } + } diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java index beeb112e..2d089eb8 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java @@ -69,4 +69,7 @@ public interface ResourceService extends CrudService resultMap = new HashMap<>(); + //List types = resourceDao.selectMaxAppArea(); + //List resourceList = resourceDao.selectByApparea(types.get(0)); + //HashMap maxdeptMap = new HashMap<>(); + //maxdeptMap.put("resourceList", resourceList); + //maxdeptMap.put("typeName", types.get(0)); + //resultMap.put("maxDept", maxdeptMap); + //List deptList = resourceDao.selectTypeCountList(); + //resultMap.put("typeList", deptList); + return resultMap; + } + + @Override + public Object selectResourceListByType(String type) { + return resourceDao.selectByType(type); + } + } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resourceBrowse/service/impl/ResourceBrowseServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resourceBrowse/service/impl/ResourceBrowseServiceImpl.java index 59ea8be6..ee63b8ab 100644 --- a/renren-admin/src/main/java/io/renren/modules/resourceBrowse/service/impl/ResourceBrowseServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resourceBrowse/service/impl/ResourceBrowseServiceImpl.java @@ -59,17 +59,17 @@ public class ResourceBrowseServiceImpl extends CrudServiceImpl dayList = new ArrayList<>(); - while (startDay.before(endDay)) { + while (startDay.before(endDay) || startDay.compareTo(endDay) == 0) { dayList.add(DateUtils.format(startDay, DateUtils.DATE_PATTERN)); startDay = DateUtils.addDateDays(startDay, 1); } - ArrayList> resultMap = new ArrayList<>(); + ArrayList> resultMap = new ArrayList<>(); for (int i = 0; i < dayList.size(); i++) { - HashMap dayMap = new HashMap<>(); + HashMap dayMap = new HashMap<>(); dayMap.put(dayList.get(i), 0); for (Map map : maps) { if (dayList.get(i).equals(map.get("date"))) { - dayMap.put(dayList.get(i), (Integer) map.get("count")); + dayMap.put(dayList.get(i), map.get("count")); } } resultMap.add(dayMap); diff --git a/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml b/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml index 46410412..508b30c8 100644 --- a/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml +++ b/renren-admin/src/main/resources/mapper/resourceBrowse/ResourceBrowseDao.xml @@ -47,7 +47,7 @@ WHERE 1 = 1 AND state = 0 - AND SUBSTR(create_date, 1, 10) BETWEEN ${startDate} AND ${endDate} + AND SUBSTR(create_date, 1, 10) BETWEEN #{startDate} AND #{endDate} GROUP BY SUBSTR(create_date, 1, 10)