优化代码

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtCampusController.java

@@ -63,7 +63,7 @@ public class StmtCampusController
     }
 
     /**
-     * 查询已开通校区报表
+     * 已开通校区报表导出
      *
      * @param user            the user info
      * @param campusSearchDTO the campus search
@@ -147,7 +147,7 @@ public class StmtCampusController
         }
         catch (Exception ex)
         {
-
+            ex.printStackTrace();
         }
 
         return null;

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtStatsController.java

@@ -41,19 +41,12 @@ public class StmtStatsController
     private TerminalUserService terminalUserService;
 
     @Autowired
-    private ProductService productService;
-
-    @Autowired
-    private CampusService campusService;
-
-    @Autowired
     private StmtCampusService stmtService;
 
     /**
-     * 查询已开通校区报表
-     *
-     * @param user      the user info
-     * @param searchDTO the campus search
+     * 获取终端明细
+     * @param user the user details
+     * @param searchDTO the search Dto
      * @return
      */
     @RequestMapping(value = {"/page", "/"}, method = RequestMethod.GET)
@@ -64,20 +57,19 @@ public class StmtStatsController
             String merchantId = user.getMerchantId();
             searchDTO.setMerchantId(merchantId);
         }
-        APIResult<Page<TerminalUserVo>> page= terminalUserService.search(BeanUtil.convertToMap(searchDTO));
+        APIResult<Page<TerminalUserVo>> page = terminalUserService.search(BeanUtil.convertToMap(searchDTO));
 
         return page;
     }
 
     /**
-     * 查询已开通校区报表
-     *
-     * @param user            the user info
-     * @param campusSearchDTO the campus search
+     * 获取校区总数
+     * @param user the user details
+     * @param campusSearchDTO the search Dto
      * @return
      */
     @RequestMapping(value = {"/campus/totalsize", "/"}, method = RequestMethod.GET)
-    public APIResult<Page<CampusVo>> campusList(@NeedUser UserDetails user, CampusSearchDTO campusSearchDTO)
+    public APIResult<Page<CampusVo>> getCampusTotalSize(@NeedUser UserDetails user, CampusSearchDTO campusSearchDTO)
     {
         if (!user.isPlatForm())
         {
@@ -88,36 +80,4 @@ public class StmtStatsController
 
         return APIResult.ok(pageData.getData().getTotalSize());
     }
-
-
-    private void setProductInfo(List<TerminalUserAuthVo> terminalUserAuthVos)
-    {
-        if (CollectionUtils.isEmpty(terminalUserAuthVos))
-        {
-            return;
-        }
-
-        List<ProductVo> productVos = productService.productList();
-        if (CollectionUtils.isEmpty(productVos))
-        {
-            return;
-        }
-
-        Map<String, ProductVo> productVoMap = ListUtil.convert(productVos, "pid", ProductVo.class);
-
-        terminalUserAuthVos.forEach(vo ->
-        {
-            ProductVo productVo = productVoMap.get(vo.getPid());
-            if (null != productVo)
-            {
-                vo.setPCode(productVo.getCode());
-                vo.setPName(productVo.getName());
-            }
-            else
-            {
-                log.info("not found product by pid ,pid={}", vo.getPid());
-            }
-        });
-
-    }
 }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtTerminalUserController.java

@@ -150,7 +150,7 @@ public class StmtTerminalUserController
             //输出Excel文件
             OutputStream output = res.getOutputStream();
             res.reset();
-            res.setHeader("Content-disposition", "attachment; filename=lingjiao_campus_" + currentTime + ".xls");
+            res.setHeader("Content-disposition", "attachment; filename=lingjiao_terminal_user_" + currentTime + ".xls");
             res.setContentType("application/msexcel");
             wb.write(output);
             output.close();
@@ -222,8 +222,6 @@ public class StmtTerminalUserController
                 }
             }
         }
-
-
     }
 
 }