Debug和名称修改

serverConfig.xml

 <config>
-    <port>30016</port>
+    <port>30017</port>
     <host>192.168.0.132</host>
 </config>
  
\ No newline at end of file

src/biz/getData.ts

@@ -15,6 +15,7 @@ import { strategyFactory } from "./strategies/strategyFactory";
 export function getData(req, res, strategyType: string) {
     const strategy = strategyFactory.createStrategy(strategyType);
     let ret = strategy.execute(req);
+    res.setHeader('Content-Type', 'application/json; charset=utf-8');
     res.send(ret);
 }
 

src/biz/strategies/left/gateStatusStrategy.ts

@@ -16,10 +16,10 @@ export class gateStatusStrategy extends abstractDataStrategyLeft {
     constructor() {
         super();
         // 初始化门状态映射
-        this.gateStatusMap.set('south', '');
-        this.gateStatusMap.set('east', '');
-        this.gateStatusMap.set('west', '');
-        this.gateStatusMap.set('north', '');
+        this.gateStatusMap.set('通淝门(南门)', '');
+        this.gateStatusMap.set('宾阳门(东门)', '');
+        this.gateStatusMap.set('定湖门(西门)', '');
+        this.gateStatusMap.set('靖淮门(北门)', '');
     }
 
     /**

src/biz/strategies/left/guchengLoadStrategy.ts

@@ -3,7 +3,6 @@
  * 该文件定义了古城负载状态策略的具体实现。
  */
 
-import { randomStatusGenerator } from "../../../util/randomStatusGenerator";
 import { abstractDataStrategyLeft } from "./abstractDataStrategyLeft";
 
 /**
@@ -18,6 +17,6 @@ export class guchengLoadStrategy extends abstractDataStrategyLeft {
         if (!params || !params.query || !params.query.date) {
             throw new Error("Date parameter is required.")
         }
-        return randomStatusGenerator.getRandomStatus();
+        return "正常";
     }
 }

src/biz/strategies/left/sightVisitorFlowByDayStrategy.ts

@@ -5,7 +5,8 @@
 
 import { randomStatusGenerator } from "../../../util/randomStatusGenerator";
 import excelSerialToJSDate from "../../../util/excelDateToJSDate";
-import {abstractDataStrategyLeft} from "./abstractDataStrategyLeft";
+import { abstractDataStrategyLeft } from "./abstractDataStrategyLeft";
+import mapToObj from "../../../util/mapToObj";
 
 /**
  * 按天计算的游客流量策略类，继承自 abstractDataStrategyLeft。
@@ -30,8 +31,8 @@ export class sightVisitorFlowByDayStrategy extends abstractDataStrategyLeft {
      * @param date - 指定日期。
      * @returns 每小时的游客流量映射。
      */
-    private getVisitorFlowByDay(data: any, date: string) {
-        const visitorCount: { [sight: string]: { count: number, status: string } } = {};
+    private getVisitorFlowByDay(data: any, date: string): any {
+        const visitorCount: Map<string, { count: number, status: string }> = new Map();
         data.forEach(row => {
             const rowDate = excelSerialToJSDate(row['游玩时间']);
             let rowDateString;
@@ -39,20 +40,19 @@ export class sightVisitorFlowByDayStrategy extends abstractDataStrategyLeft {
                 rowDateString = rowDate.toISOString().split('T')[0];
             }
             catch (e) {
-                rowDateString = 'invalid time'
+                rowDateString = 'invalid time';
             }
             const sight = row['景点名称'];
 
             if (rowDateString == date) {
-                if (!visitorCount[sight]) {
-                    visitorCount[sight] = {count: 0, status: randomStatusGenerator.getRandomStatus()};
+                if (!visitorCount.has(sight)) {
+                    visitorCount.set(sight, { count: 0, status: randomStatusGenerator.getRandomStatus() });
                 }
-                visitorCount[sight].count++;
+                const sightData = visitorCount.get(sight)!;
+                sightData.count++;
+                visitorCount.set(sight, sightData);
             }
         });
-        return visitorCount;
-
+        return mapToObj(visitorCount);
     }
-
 }
-

src/biz/strategies/left/totalVisitorFlowByHourStrategy.ts

@@ -61,7 +61,11 @@ export class totalVisitorFlowByHourStrategy extends abstractDataStrategyLeft {
                 visitorCount.set(row['订单游客类型'],visitorCount.get(row['订单游客类型']).set(rowHour, (visitorCount.get(row['订单游客类型']).get(rowHour) || 0) + 1));
             }
         });
-        return visitorCount;
+        const ret: Map<string, object> = new Map();
+        visitorCount.forEach((value, key) => {
+            ret.set(key, mapToObj(value, "hour", "count"));
+        })
+        return ret;
     }
 
 }
\ No newline at end of file

src/biz/strategies/middle/currentEventStrategy.ts

@@ -22,7 +22,7 @@ export class currentEventStrategy extends abstractDataStrategyMid {
             throw new Error("Date parameter is required.")
         }
         let dayData = this.extractor.getData(currentEventStrategy.fileName, currentEventStrategy.sheetName);
-        return mapToObj(this.getCurrentDayEventDate(dayData, params.query.date));
+        return mapToObj(this.getCurrentDayEventDate(dayData, params.query.date), "event type", "count");
     }
 
     /**

src/biz/strategies/middle/eventDataStrategy.ts

@@ -10,8 +10,7 @@ import excelSerialToJSDate from "../../../util/excelDateToJSDate";
  * 事件数据策略类，继承自 abstractDataStrategyMid。
  */
 export class allEventDataStrategy extends abstractDataStrategyMid {
-    static readonly RELEVANTINFO = ['事件标题', '处置状态', '数据更新时间', '事件类型', '事件子类型', '事件来源'];
-
+    static readonly RELEVANTINFO = ['事件标题', '处置状态', '事件类型', '事件子类型', '事件来源', '创建时间', '处置时间', '处置完成时间', '办结时间'];
     /**
      * 执行所有事件数据策略。
      * @returns 事件的数据。
@@ -28,11 +27,18 @@ export class allEventDataStrategy extends abstractDataStrategyMid {
      */
     private removeUnusedColumns(data: any) {
         data.forEach(row => {
+            // Initialize missing relevant columns with a default value
+            allEventDataStrategy.RELEVANTINFO.forEach(key => {
+                if (!(key in row)) {
+                    row[key] = null; // You can set this to any default value you prefer
+                }
+            });
+
             Object.keys(row).forEach(key => {
                 if (!allEventDataStrategy.RELEVANTINFO.includes(key)) {
                     delete row[key];
                 }
-                if (key === '数据更新时间') {
+                if (typeof row[key] === 'number') {
                     row[key] = excelSerialToJSDate(row[key]);
                 }
             });

src/biz/strategies/middle/totalEventCountStrategy.ts

@@ -17,7 +17,7 @@ export class totalEventCountStrategy extends abstractDataStrategyMid {
      */
     execute(): any {
         let eventData = this.extractor.getData(totalEventCountStrategy.fileName, totalEventCountStrategy.sheetName);
-        return mapToObj(this.getEventCount(eventData));
+        return mapToObj(this.getEventCount(eventData), "status", "count");
     }
 
     /**

src/biz/strategies/right/eventCategoryCountStrategy.ts

@@ -26,6 +26,6 @@ export class eventCategoryCountStrategy extends abstractDataStrategyRight {
         const target = '事件类型';
 
         // 获取指定年份的网格事件数量统计，并转换为对象
-        return mapToObj(this.getListCount(eventList, target, this.eventData, params.query.year));
+        return mapToObj(this.getListCount(eventList, target, this.eventData, params.query.year), "category", "count");
     }
 }
\ No newline at end of file

src/biz/strategies/right/eventMonthDistributionStrategy.ts

@@ -21,7 +21,7 @@ export class eventMonthDistributionStrategy extends abstractDataStrategyRight {
         this.paramsCheck(params);
 
         // 获取指定年份的事件按月分布计数，并转换为对象
-        return mapToObj(this.getEventMonthDistribution(this.eventData, params.query.year));
+        return mapToObj(this.getEventMonthDistribution(this.eventData, params.query.year), "month", "count");
     }
 
     /**

src/biz/strategies/right/eventProcessingTimeStrategy.ts

@@ -22,7 +22,7 @@ export class eventProcessingTimeStrategy extends abstractDataStrategyRight {
         this.paramsCheck(params);
 
         // 获取指定年份的事件处理时间，并转换为对象
-        return mapToObj(this.getEventProcessingTime(this.eventData, params.query.year));
+        return mapToObj(this.getEventProcessingTime(this.eventData, params.query.year), "type", "duration");
     }
 
     /**

src/biz/strategies/right/eventSrcStrategy.ts

@@ -27,6 +27,6 @@ export class eventSrcStrategy extends abstractDataStrategyRight {
         const target = '事件来源';
 
         // 获取指定年份的事件来源统计，并转换为对象
-        return mapToObj(this.getListCount(sourceList, target, this.eventData, params.query.year));
+        return mapToObj(this.getListCount(sourceList, target, this.eventData, params.query.year), "source", "count");
     }
 }
\ No newline at end of file

src/biz/strategies/right/eventSubCategoryCountStrategy.ts

@@ -27,6 +27,6 @@ export class eventSubCategoryCountStrategy extends abstractDataStrategyRight {
         const target = '事件子类型';
 
         // 获取指定年份的事件子类别计数，并转换为对象
-        return mapToObj(this.getListCount(eventList, target, this.eventData, params.query.year));
+        return mapToObj(this.getListCount(eventList, target, this.eventData, params.query.year), "category", "count");
     }
 }
\ No newline at end of file

src/biz/strategies/right/eventTimeDistributionStrategy.ts

@@ -22,7 +22,7 @@ export class eventTimeDistributionStrategy extends abstractDataStrategyRight {
         this.paramsCheck(params);
 
         // 获取指定年份的事件时间分布，并转换为对象
-        return mapToObj(this.getEventTimeDistribution(this.eventData, params.query.year));
+        return mapToObj(this.getEventTimeDistribution(this.eventData, params.query.year), "hour", "count");
     }
 
     /**

src/biz/strategies/right/getEventCountByYearStrategy.ts

@@ -44,8 +44,8 @@ export class getEventCountByYearStrategy extends abstractDataStrategyRight {
                 rowYear = rowDate.getFullYear();
             } catch (e) {
                 rowYear = 0;
+                console.log(e);
             }
-            console.log("rowy", rowYear);
             if (rowYear == year) {
                 eventCount.set('事件总数', eventCount.get('事件总数') + 1);
                 if (row['处置状态'] == '已办结') {

src/biz/strategies/right/gridEventCountStrategy.ts

@@ -27,6 +27,6 @@ export class gridEventCountStrategy extends abstractDataStrategyRight {
         const target = '网格名称';
 
         // 获取指定年份的网格事件数量统计，并转换为对象
-        return mapToObj(this.getListCount(gridList, target, this.eventData, params.query.year));
+        return mapToObj(this.getListCount(gridList, target, this.eventData, params.query.year), "grid name", "count");
     }
 }
\ No newline at end of file

src/biz/strategies/strategyFactory.ts

@@ -40,7 +40,7 @@ export class strategyFactory {
         'sightVisitorFlowPerHour': sightVisitorFlowByHourStrategy,
         'guchengLoad': guchengLoadStrategy,
         'totalVisitorFlow': totalVisitorFlowStrategy,
-        'totalVisitorFlowByDay': totalVisitorFlowByHourStrategy,
+        'totalVisitorFlowByHour': totalVisitorFlowByHourStrategy,
         'getCurrentEventCount': currentEventStrategy,
         'totalEventCount': totalEventCountStrategy,
         'getEventCountByYear': getEventCountByYearStrategy,

src/util/mapToObj.ts

 /**
  * mapToObj.ts
- * 该文件定义了一个函数，用于将 Map 对象转换为普通的 JavaScript 对象。
+ * 该文件定义了一个函数，用于将 Map 对象转换为包含 key 和 value 的对象数组。
  */
 
 /**
- * 将 Map 对象转换为普通的 JavaScript 对象。
+ * 将 Map 对象转换为包含 key 和 value 的对象数组。
  * @param map - 要转换的 Map 对象。
- * @returns 转换后的 JavaScript 对象。
+ * @param keyName - key 属性的名称 (默认为 'key')。
+ * @param valueName - value 属性的名称 (默认为 'value')。
+ * @returns 转换后的包含自定义 key 和 value 名称的对象数组。
  */
-export default function mapToObj(map) {
-    let Obj: { [key: string]: string } = {};
+export default function mapToObj(
+    map: Map<any, any>, 
+    keyName: string = 'key', 
+    valueName: string = 'value'
+): Array<{ [key: string]: any }> {
+    let result: Array<{ [key: string]: any }> = [];
     map.forEach((value, key) => {
-        Obj[key] = value;
+        result.push({ [keyName]: key, [valueName]: value });
     });
-    return Obj;
-}
+    return result;
+}
\ No newline at end of file