Merge branch 'refactor' into 'master'

路由代码重构

See merge request !10

src/biz/getData.ts

@@ -7,16 +7,14 @@
 import { strategyFactory } from "./strategies/strategyFactory";
 
 /**
- * 处理获取数据的主要请求。
- * @param req - 请求对象，包含查询参数。
- * @param res - 响应对象，用于将结果发送回客户端。
+ * Handles the main data retrieval request.
+ * @param req - The request object containing query parameters.
+ * @param res - The response object used to send results back to the client.
+ * @param strategyType - The type of strategy to be used.
  */
-export function getData(req, res) {
-    // 根据请求查询内容创建策略。
-    const strategy = strategyFactory.createStrategy(req.query.content);
-    // 使用请求参数执行策略并获取结果。
+export function getData(req, res, strategyType: string) {
+    const strategy = strategyFactory.createStrategy(strategyType);
     let ret = strategy.execute(req);
-    // 将结果发送回客户端。
     res.send(ret);
 }
 

src/biz/strategies/right/getEventCountByYearStrategy.ts

@@ -37,7 +37,6 @@ export class getEventCountByYearStrategy extends abstractDataStrategyRight {
         const eventCount = this.registerItems(eventList);
 
         let finishedEventCount = 0;
-
         data.forEach(row => {
             const rowDate = excelSerialToJSDate(row['创建时间']);
             let rowYear;
@@ -46,6 +45,7 @@ export class getEventCountByYearStrategy extends abstractDataStrategyRight {
             } catch (e) {
                 rowYear = 0;
             }
+            console.log("rowy", rowYear);
             if (rowYear == year) {
                 eventCount.set('事件总数', eventCount.get('事件总数') + 1);
                 if (row['处置状态'] == '已办结') {

src/routers/router.ts

-/**
- * 总路由入口
- */
-
-import * as asyncHandler from 'express-async-handler';
+import { setLeftRoutes } from './routerLeft';
+import { setMiddleRoutes } from './routerMid';
+import { setRightRoutes } from './routerRight';
 import * as szgcBiz from '../biz/getData';
+import * as asyncHandler from 'express-async-handler';
 
 
-export function setRouter(httpServer){
-    httpServer.get('/szgc/getdata', asyncHandler(szgcBiz.getData));
+export function setRouter(httpServer) {
+    setLeftRoutes(httpServer);
+    setMiddleRoutes(httpServer);
+    setRightRoutes(httpServer);
     httpServer.get('/test', szgcBiz.test);
 }
-

src/routers/routerLeft.ts

+import * as asyncHandler from 'express-async-handler';
+import * as szgcBiz from '../biz/getData';
+
+export function setLeftRoutes(httpServer) {
+    httpServer.get('/szgc/getdata/sightVisitorFlowByDay', asyncHandler((req, res) => szgcBiz.getData(req, res, 'sightVisitorFlowByDay')));
+    httpServer.get('/szgc/getdata/gateStatus', asyncHandler((req, res) => szgcBiz.getData(req, res, 'gateStatus')));
+    httpServer.get('/szgc/getdata/sightVisitorFlowPerHour', asyncHandler((req, res) => szgcBiz.getData(req, res, 'sightVisitorFlowPerHour')));
+    httpServer.get('/szgc/getdata/guchengLoad', asyncHandler((req, res) => szgcBiz.getData(req, res, 'guchengLoad')));
+    httpServer.get('/szgc/getdata/totalVisitorFlow', asyncHandler((req, res) => szgcBiz.getData(req, res, 'totalVisitorFlow')));
+    httpServer.get('/szgc/getdata/totalVisitorFlowByDay', asyncHandler((req, res) => szgcBiz.getData(req, res, 'totalVisitorFlowByHour')));
+}
\ No newline at end of file

src/routers/routerMid.ts

+import * as asyncHandler from 'express-async-handler';
+import * as szgcBiz from '../biz/getData';
+
+export function setMiddleRoutes(httpServer) {
+    httpServer.get('/szgc/getdata/getCurrentEventCount', asyncHandler((req, res) => szgcBiz.getData(req, res, 'getCurrentEventCount')));
+    httpServer.get('/szgc/getdata/totalEventCount', asyncHandler((req, res) => szgcBiz.getData(req, res, 'totalEventCount')));
+    httpServer.get('/szgc/getdata/allEvents', asyncHandler((req, res) => szgcBiz.getData(req, res, 'allEvents')));
+}

src/routers/routerRight.ts

+import * as asyncHandler from 'express-async-handler';
+import * as szgcBiz from '../biz/getData';
+
+export function setRightRoutes(httpServer) {
+    httpServer.get('/szgc/getdata/getEventCountByYear', asyncHandler((req, res) => szgcBiz.getData(req, res, 'getEventCountByYear')));
+    httpServer.get('/szgc/getdata/getEventTimeDistribution', asyncHandler((req, res) => szgcBiz.getData(req, res, 'getEventTimeDistribution')));
+    httpServer.get('/szgc/getdata/getEventMonthDistribution', asyncHandler((req, res) => szgcBiz.getData(req, res, 'getEventMonthDistribution')));
+    httpServer.get('/szgc/getdata/getEventCategoryCount', asyncHandler((req, res) => szgcBiz.getData(req, res, 'getEventCategoryCount')));
+    httpServer.get('/szgc/getdata/getEventSubCategoryCount', asyncHandler((req, res) => szgcBiz.getData(req, res, 'getEventSubCategoryCount')));
+    httpServer.get('/szgc/getdata/getEventSourceCount', asyncHandler((req, res) => szgcBiz.getData(req, res, 'getEventSourceCount')));
+    httpServer.get('/szgc/getdata/getGridEventCount', asyncHandler((req, res) => szgcBiz.getData(req, res, 'getGridEventCount')));
+    httpServer.get('/szgc/getdata/getEventProcessingTime', asyncHandler((req, res) => szgcBiz.getData(req, res, 'getEventProcessingTime')));
+}