fix:增加资源排名统计搜索框

src/main/java/com/lightinit/hsdataplatform/controller/admin/ResourceNumStatisitcController.java

@@ -1,14 +1,8 @@
 package com.lightinit.hsdataplatform.controller.admin;
 
-import com.lightinit.hsdataplatform.dictionary.DicResourceType;
-import com.lightinit.hsdataplatform.dictionary.DicRoadShowAudit;
-import com.lightinit.hsdataplatform.dictionary.DicRoadShowStage;
-import com.lightinit.hsdataplatform.model.admin.RoadShowSearchModel;
 import com.lightinit.hsdataplatform.model.admin.StatisiticSearchModel;
 import com.lightinit.hsdataplatform.model.admin.StatisticModel;
 import com.lightinit.hsdataplatform.service.admin.IResourceService;
-import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
-import org.aspectj.weaver.patterns.HasMemberTypePattern;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,7 +30,7 @@ public class ResourceNumStatisitcController {
     @RequestMapping(value = "themelist.action")
     public ModelAndView themelist(StatisiticSearchModel inputModel){
         ModelAndView modelAndView = new ModelAndView("admin/resource_num_statisitic/themelist");
-        List<String> list=resourceService.getCatelogTypeIsTheme();
+        List<String> list=resourceService.getCatelogTypeIsTheme(inputModel);
         List<Map<String, Object>> listMap=resourceService.getEveryThemeTotal(inputModel);
         HashMap<String,Long> map = new HashMap<>();
         for (Map<String, Object> stringIntegerMap : listMap) {
@@ -78,7 +72,7 @@ public class ResourceNumStatisitcController {
     @RequestMapping(value = "themeSortList.action")
     public ModelAndView themeSortList(StatisiticSearchModel inputModel){
         ModelAndView modelAndView = new ModelAndView("admin/resource_num_statisitic/themeSortList");
-        List<String> list=resourceService.getCatelogTypeIsTheme();
+        List<String> list=resourceService.getCatelogTypeIsTheme(inputModel);
         List<StatisticModel> statisticModelList=resourceService.getThemeSortTotal(inputModel);
         for (StatisticModel statisticModel : statisticModelList) {
             list.remove(statisticModel.getName());

src/main/java/com/lightinit/hsdataplatform/impl/admin/ResourceServiceImpl.java

@@ -23,9 +23,9 @@ public class ResourceServiceImpl implements IResourceService {
     private ResourceCatelogMapper resourceCatelogMapper;
 
     @Override
-    public List<String> getCatelogTypeIsTheme() {
+    public List<String> getCatelogTypeIsTheme(StatisiticSearchModel inputModel) {
         DynamicDataContextHolder.setCustomerType(DynamicDataContextHolder.DEFAULT);
-        return resourceCatelogMapper.getCatelogTypeIsTheme();
+        return resourceCatelogMapper.getCatelogTypeIsTheme(inputModel);
     }
 
     @Override
@@ -48,11 +48,11 @@ public class ResourceServiceImpl implements IResourceService {
 
     @Override
     public List<StatisticModel> getThemeSortTotal(StatisiticSearchModel inputModel) {
-        return resourceCatelogMapper.getThemeSortTotal();
+        return resourceCatelogMapper.getThemeSortTotal(inputModel);
     }
 
     @Override
     public List<StatisticModel> getSectorSortList(StatisiticSearchModel inputModel) {
-        return resourceCatelogMapper.getSectorSortList();
+        return resourceCatelogMapper.getSectorSortList(inputModel);
     }
 }

src/main/java/com/lightinit/hsdataplatform/mapper/ResourceCatelogMapper.java

@@ -37,7 +37,7 @@ public interface ResourceCatelogMapper {
 
     List<Map<String,Integer>> getIndex();
 
-    List<String> getCatelogTypeIsTheme();
+    List<String> getCatelogTypeIsTheme(StatisiticSearchModel inputModel);
 
     List<Map<String, Object>> getEveryThemeTotal(StatisiticSearchModel inputModel);
 
@@ -86,7 +86,7 @@ public interface ResourceCatelogMapper {
     long getPagerTotalByUser(RankSearchModel inputModel);
 
 
-    List<StatisticModel> getThemeSortTotal();
+    List<StatisticModel> getThemeSortTotal(StatisiticSearchModel inputModel);
 
-    List<StatisticModel> getSectorSortList();
+    List<StatisticModel> getSectorSortList(StatisiticSearchModel inputModel);
 }

src/main/java/com/lightinit/hsdataplatform/service/admin/IResourceService.java

@@ -8,7 +8,7 @@ import java.util.Map;
 
 public interface IResourceService {
 
-    List<String> getCatelogTypeIsTheme();
+    List<String> getCatelogTypeIsTheme(StatisiticSearchModel inputModel);
 
     List<Map<String, Object>> getEveryThemeTotal(StatisiticSearchModel inputModel);
 

src/main/resources/sqlmaps/ResourceCatelogMapper.xml

@@ -1281,6 +1281,12 @@
     INNER JOIN resource r ON r.id=rd.id
     INNER JOIN resource_catelog rc ON r.catelog_theme=rc.id
     WHERE rc.catelog_code LIKE '001%'
+    <if test="registerFrom !=null">
+      AND Date(r.`created_at`)>= Date(#{registerFrom})
+    </if>
+    <if test="registerTo !=null">
+      AND Date(r.`created_at`) &lt;= Date(#{registerTo})
+    </if>
     ) AS A
     GROUP BY A.catelog_name
 
@@ -1292,6 +1298,12 @@
     INNER JOIN resource r ON r.id=sa.id
     INNER JOIN resource_catelog rc ON rc.id=r.catelog_theme
     WHERE rc.catelog_code LIKE '001%'
+    <if test="registerFrom !=null">
+      AND Date(r.`created_at`)>= Date(#{registerFrom})
+    </if>
+    <if test="registerTo !=null">
+      AND Date(r.`created_at`) &lt;= Date(#{registerTo})
+    </if>
     ) AS B
     GROUP BY B.catelog_name
 
@@ -1303,6 +1315,12 @@
     INNER JOIN resource r ON r.id=sa.id
     INNER JOIN resource_catelog rc ON rc.id=r.catelog_theme
     WHERE rc.catelog_code LIKE '001%'
+    <if test="registerFrom !=null">
+      AND Date(r.`created_at`)>= Date(#{registerFrom})
+    </if>
+    <if test="registerTo !=null">
+      AND Date(r.`created_at`) &lt;= Date(#{registerTo})
+    </if>
      ) AS C
       GROUP BY C.catelog_name
  ) AS D
@@ -1319,7 +1337,14 @@
     FROM sector s
     INNER JOIN resource_data rd ON rd.belong_to=s.id
     INNER JOIN resource r ON r.id=rd.id
-    GROUP BY s.sector_name
+   WHERE 1=1
+   <if test="registerFrom !=null">
+     AND Date(r.`created_at`)>= Date(#{registerFrom})
+   </if>
+   <if test="registerTo !=null">
+     AND Date(r.`created_at`) &lt;= Date(#{registerTo})
+   </if>
+   GROUP BY s.sector_name
 
     UNION ALL
 
@@ -1329,6 +1354,13 @@
     FROM sector s
     INNER JOIN resource_api ra ON ra.provider=s.id
     INNER JOIN resource r ON r.id=ra.id
+    WHERE 1=1
+    <if test="registerFrom !=null">
+       AND Date(r.`created_at`)>= Date(#{registerFrom})
+    </if>
+     <if test="registerTo !=null">
+       AND Date(r.`created_at`) &lt;= Date(#{registerTo})
+    </if>
     ) AS A
     GROUP BY A.sector_name,A.service_type
 
@@ -1338,6 +1370,13 @@
    FROM sector s
    INNER JOIN resource_microapp rm ON rm.provider=s.id
    INNER JOIN resource r ON r.id=rm.id
+   WHERE 1=1
+   <if test="registerFrom !=null">
+     AND Date(r.`created_at`)>= Date(#{registerFrom})
+   </if>
+   <if test="registerTo !=null">
+     AND Date(r.`created_at`) &lt;= Date(#{registerTo})
+   </if>
    GROUP BY s.sector_name
    ) AS D
     GROUP BY `name`

src/main/webapp/pages/admin/resource_num_statisitic/sectorSortIndex.jsp

@@ -20,10 +20,10 @@
                 <h2>运维管理</h2>
                 <ol class="breadcrumb">
                     <li>
-                        <a href="javascript:void(0);" >资源数量统计</a>
+                        <a href="javascript:void(0);" >资源排名统计</a>
                     </li>
                     <li class="active">
-                        <strong>主题统计排名</strong>
+                        <strong>部门统计排名</strong>
                     </li>
                 </ol>
             </div>
@@ -32,6 +32,30 @@
 </div>
 <jsp:include page="../../../common/admin/search_pre.jsp"></jsp:include>
 <input type="hidden" name="formSerialize" />
+<form id="formSearch" action="<%=basePath%>/admin/notification_mgr/list.action" method="get" class="form-inline">
+    <div class="form-group">
+        <label for="registerFrom">起止日期</label>
+        <div class="input-group date">
+            <input type="text" id="registerFrom" name="registerFrom" class="form-control" />
+            <span class="input-group-addon">
+                    <span class="glyphicon glyphicon-calendar"></span>
+                </span>
+        </div>
+        -
+        <div class="input-group date">
+            <input type="text" id="registerTo" name="registerTo" class="form-control" />
+            <span class="input-group-addon">
+                    <span class="glyphicon glyphicon-calendar"></span>
+                </span>
+        </div>
+    </div>
+    <div class="form-group ">
+        <button id="btnSearch" type="button" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>查询</button>
+    </div>
+    <div class="form-group">
+        <button id="btnReset" type="button" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>重置</button>
+    </div>
+</form>
 <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_middle.jsp"></jsp:include>

src/main/webapp/pages/admin/resource_num_statisitic/themeSortIndex.jsp

@@ -20,7 +20,7 @@
                 <h2>运维管理</h2>
                 <ol class="breadcrumb">
                     <li>
-                        <a href="javascript:void(0);" >资源数量统计</a>
+                        <a href="javascript:void(0);" >资源排名统计</a>
                     </li>
                     <li class="active">
                         <strong>主题统计排名</strong>
@@ -32,6 +32,30 @@
 </div>
 <jsp:include page="../../../common/admin/search_pre.jsp"></jsp:include>
 <input type="hidden" name="formSerialize" />
+<form id="formSearch"  method="get" class="form-inline">
+    <div class="form-group">
+        <label for="registerFrom">起止日期</label>
+        <div class="input-group date">
+            <input type="text" id="registerFrom" name="registerFrom" class="form-control" />
+            <span class="input-group-addon">
+                    <span class="glyphicon glyphicon-calendar"></span>
+                </span>
+        </div>
+        -
+        <div class="input-group date">
+            <input type="text" id="registerTo" name="registerTo" class="form-control" />
+            <span class="input-group-addon">
+                    <span class="glyphicon glyphicon-calendar"></span>
+                </span>
+        </div>
+    </div>
+    <div class="form-group ">
+        <button id="btnSearch" type="button" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>查询</button>
+    </div>
+    <div class="form-group">
+        <button id="btnReset" type="button" class="btn btn-sm btn-primary"><i class="fa fa-search"></i>重置</button>
+    </div>
+</form>
 <jsp:include page="../../../common/admin/search_post.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_pre.jsp"></jsp:include>
 <jsp:include page="../../../common/admin/grid_middle.jsp"></jsp:include>