From 4f21bd0cbe3bbd23f06c63fc7a175cbc9c77b62c Mon Sep 17 00:00:00 2001
From: xiaoguo <Xiaoguo@123456>
Date: Tue, 11 Jun 2024 09:50:39 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=AE=B0=E5=BD=95=E7=BB=9F=E8=AE=A1=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=20=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2  | Bin 161348 -> 161348 bytes
 PVDEMCS/.vs/PVDEMCS/v17/.suo                  | Bin 235520 -> 257024 bytes
 .../Impl/EquipmentRecordRepository.cs         |   1 +
 PVDEMCSUI/yarn.lock                           |  55 +++++++++++++++++-
 4 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 b/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2
index b1484c1b9a0952b53ca452ec0204fb890cbc599a..5f8acc8d5e64363f4c2bdf931cd8f9a1efc054a3 100644
GIT binary patch
delta 21834
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

delta 21701
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

diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo
index 3685cb2e6ee7fc60819fda40cc0eb47c5ea8ca0f..637e00b1639f4d6b82416c1999dd9d7185a007be 100644
GIT binary patch
delta 19089
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

delta 11550
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
bAjP{n{QbLWUPBqa6Q@j?QCxZVi2VNncc)f}

diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
index dac9fb7..1e8a0fa 100644
--- a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
+++ b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
@@ -572,6 +572,7 @@ namespace PVDEMCS.Services.Repositories.Impl
                         equipment_info.id as EquipmentId,
                         equipment_code as EquipmentCode,
                         equipment_name as EquipmentName,
+                        equipment_type AS EquipmentType,
                         SUM(furnace_num) AS FurnaceNum,
 	                        SUM( total_running_time ) AS TotalRunningTime,
 	                        SUM( total_alarm_time ) AS TotalAlarmTime,
diff --git a/PVDEMCSUI/yarn.lock b/PVDEMCSUI/yarn.lock
index 1320160..5ba5048 100644
--- a/PVDEMCSUI/yarn.lock
+++ b/PVDEMCSUI/yarn.lock
@@ -509,6 +509,11 @@ acorn-jsx@^5.3.2:
   resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.2.tgz"
   integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
 
+adler-32@~1.3.0:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz"
+  integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==
+
 ajv@^6.12.4:
   version "6.12.6"
   resolved "https://registry.npmmirror.com/ajv/-/ajv-6.12.6.tgz"
@@ -780,6 +785,14 @@ caniuse-lite@^1.0.30001538, caniuse-lite@^1.0.30001541:
   resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001555.tgz"
   integrity sha512-NzbUFKUnJ3DTcq6YyZB6+qqhfD112uR3uoEnkmfzm2wVzUNsFkU7AwBjKQ654Sp5cau0JxhFyRSn/tQZ+XfygA==
 
+cfb@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz"
+  integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==
+  dependencies:
+    adler-32 "~1.3.0"
+    crc-32 "~1.2.0"
+
 chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
   version "4.1.2"
   resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
@@ -860,6 +873,11 @@ clone@^1.0.2:
   resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
+codepage@~1.15.0:
+  version "1.15.0"
+  resolved "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz"
+  integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==
+
 color-convert@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
@@ -946,7 +964,7 @@ core-util-is@~1.0.0:
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
-crc-32@^1.2.0:
+crc-32@^1.2.0, crc-32@~1.2.0, crc-32@~1.2.1:
   version "1.2.2"
   resolved "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz"
   integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
@@ -1437,6 +1455,11 @@ forwarded@0.2.0:
   resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
+frac@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz"
+  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
+
 fraction.js@^4.3.6:
   version "4.3.7"
   resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz"
@@ -2593,6 +2616,13 @@ source-map@~0.6.0:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
+ssf@~0.11.2:
+  version "0.11.2"
+  resolved "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz"
+  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
+  dependencies:
+    frac "~1.1.2"
+
 stack-trace@^1.0.0-pre2:
   version "1.0.0-pre2"
   resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-1.0.0-pre2.tgz"
@@ -2915,6 +2945,16 @@ wildcard@^2.0.0:
   resolved "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz"
   integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
 
+wmf@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz"
+  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
+
+word@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/word/-/word-0.3.0.tgz"
+  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
+
 wrap-ansi@^6.0.1:
   version "6.2.0"
   resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
@@ -2938,6 +2978,19 @@ wrappy@1:
   resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
+xlsx@^0.18.5:
+  version "0.18.5"
+  resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz"
+  integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==
+  dependencies:
+    adler-32 "~1.3.0"
+    cfb "~1.2.1"
+    codepage "~1.15.0"
+    crc-32 "~1.2.1"
+    ssf "~0.11.2"
+    wmf "~1.0.1"
+    word "~0.3.0"
+
 xml-name-validator@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"

From cfeb7c1b6f0f561052ea0e090ce3065feffc9273 Mon Sep 17 00:00:00 2001
From: liuhr <liuhr@taisoft.com.cn>
Date: Tue, 11 Jun 2024 10:10:25 +0800
Subject: [PATCH 2/6] =?UTF-8?q?[FEAT]:=201.=E7=A7=BB=E9=99=A4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BA=8C=20=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PVDEMCSUI/src/pages/screen/screen4/index.vue | 139 +++++++++----------
 1 file changed, 69 insertions(+), 70 deletions(-)

diff --git a/PVDEMCSUI/src/pages/screen/screen4/index.vue b/PVDEMCSUI/src/pages/screen/screen4/index.vue
index ff43550..e18631e 100644
--- a/PVDEMCSUI/src/pages/screen/screen4/index.vue
+++ b/PVDEMCSUI/src/pages/screen/screen4/index.vue
@@ -23,9 +23,8 @@
                 </div>
                 <!-- 搜索条件 -->
                 <div class="col-xl-2 col-lg-2 col-sm-3">
-                    <q-input dense label="日期范围" ref="rangDateRef" readonly outlined v-model="rangDateText" :rules="[
-                        (val: string) => (val !== null && val !== '' && val !== undefined) || '请选择日期范围',
-                    ]">
+                    <!-- :rules="[ (val: string) => (val !== null && val !== '' && val !== undefined) || '请选择日期范围']" -->
+                    <q-input dense label="日期范围" ref="rangDateRef" readonly outlined v-model="rangDateText">
                         <template v-slot:append>
                             <q-icon name="event" class="cursor-pointer">
                                 <q-tooltip content-class="bg-amber text-black shadow-4" :offset="[10, 10]"
@@ -169,7 +168,7 @@ const onRequest = (props: any) => {
 
 const pagination = ref(new Pagination(new EquipmentRecord()));
 const getPage = () => {
-    rangDateRef.value.resetValidation();
+    // rangDateRef.value.resetValidation();
     if (rangeDate.value) {
         pagination.value.data.begTime = rangeDate.value.from + ' 00:00:00';
         pagination.value.data.endTime = rangeDate.value.to + ' 23:59:59';
@@ -233,78 +232,78 @@ const rangeDateUpdate = (value: any, reason: any, details) => {
 // 导出Excel
 const equipmentNoTimeRecord = ref();
 const exportTable = () => {
-    rangDateRef.value.validate();
-    if (!rangDateRef.value.hasError) {
+    //rangDateRef.value.validate();
+    //if (!rangDateRef.value.hasError) {
 
-        if (rangeDate.value) {
-            let begTime = rangeDate.value.from + ' 00:00:00';
-            let endTime = rangeDate.value.to + ' 23:59:59';
-            const diff = date.getDateDiff(new Date(endTime), new Date(begTime), 'days') // 计算日期差值
-            // 判断 时间范围是否大于30天
-            if (diff > 30) {
-                Notify.create({
-                    position: 'top',
-                    message: '日期范围不能大于30天！',
-                    icon: 'feedback',
-                    color: 'negative',
-                })
-                return
-            }
-            equipmentNoTimeRecord.value = new EquipmentNoTimeRecord();
-            equipmentNoTimeRecord.value.begTime = begTime;
-            equipmentNoTimeRecord.value.endTime = endTime;
-        }
+    if (rangeDate.value) {
+        let begTime = rangeDate.value.from + ' 00:00:00';
+        let endTime = rangeDate.value.to + ' 23:59:59';
+        // const diff = date.getDateDiff(new Date(endTime), new Date(begTime), 'days') // 计算日期差值
+        // 判断 时间范围是否大于30天
+        // if (diff > 30) {
+        //     Notify.create({
+        //         position: 'top',
+        //         message: '日期范围不能大于30天！',
+        //         icon: 'feedback',
+        //         color: 'negative',
+        //     })
+        //     return
+        // }
+        equipmentNoTimeRecord.value = new EquipmentNoTimeRecord();
+        equipmentNoTimeRecord.value.begTime = begTime;
+        equipmentNoTimeRecord.value.endTime = endTime;
+    }
 
-        Dialog.create({
-            title: '系统提示',
-            message: '是否导出?',
-            class: 'text-h7 text-weight-bold',
-            cancel: true,
-            persistent: true
-        }).onOk(() => {
-            Loading.show({
-                spinner: QSpinnerIos,
-                message: '正在导出，请稍等...',
-                boxClass: 'bg-grey-2 text-grey-9',
-                spinnerColor: 'primary'
-            });
+    Dialog.create({
+        title: '系统提示',
+        message: '是否导出?',
+        class: 'text-h7 text-weight-bold',
+        cancel: true,
+        persistent: true
+    }).onOk(() => {
+        Loading.show({
+            spinner: QSpinnerIos,
+            message: '正在导出，请稍等...',
+            boxClass: 'bg-grey-2 text-grey-9',
+            spinnerColor: 'primary'
+        });
 
-            // var d = new Date(); // 获取当前日期时间
-            // var monthStart = date.formatDate(new Date(d.getFullYear(), d.getMonth(), 1), 'YYYY-MM-DD'); // 获取本月第一天的日期时间
-            // var monthEnd = date.formatDate(new Date(d.getFullYear(), d.getMonth() + 1, 0), 'YYYY-MM-DD'); // 获取本月最后一天的日期时间（时间为23:59:5
+        // var d = new Date(); // 获取当前日期时间
+        // var monthStart = date.formatDate(new Date(d.getFullYear(), d.getMonth(), 1), 'YYYY-MM-DD'); // 获取本月第一天的日期时间
+        // var monthEnd = date.formatDate(new Date(d.getFullYear(), d.getMonth() + 1, 0), 'YYYY-MM-DD'); // 获取本月最后一天的日期时间（时间为23:59:5
 
-            let tableData = [
-                ['序号', '设备编码', '设备名称', '设备类型', '开炉次数', '总运行时长（小时）', '总报警时长（小时）', '总待机时长（小时）']//导出表头
-            ] // 表格表头
+        let tableData = [
+            ['序号', '设备编码', '设备名称', '设备类型', '开炉次数', '总运行时长（小时）', '总报警时长（小时）', '总待机时长（小时）']//导出表头
+        ] // 表格表头
 
-            equipmentRecordApi.getEquipmentRecordTotalList(equipmentNoTimeRecord.value).then((res: any) => {
+        equipmentRecordApi.getEquipmentRecordTotalList(equipmentNoTimeRecord.value).then((res: any) => {
 
-                res.forEach((item: any, index: any) => {
-                    console.log(item, item.name)
-                    let rowData = []
-                    //导出内容的字段
-                    rowData = [
-                        index + 1,
-                        item.equipmentCode,
-                        item.equipmentName,
-                        item.equipmentType,
-                        item.furnaceNum,
-                        item.totalRunningTime,
-                        item.totalAlarmTime,
-                        item.totalStopTime
-                    ]
-                    tableData.push(rowData)
-                })
-                let workSheet = XLSX.utils.aoa_to_sheet(tableData);
-                let bookNew = XLSX.utils.book_new();
-                XLSX.utils.book_append_sheet(bookNew, workSheet, 'Sheet1') // 工作簿名称
-                let name = '导出数据' + '.xlsx'
-                XLSX.writeFile(bookNew, name) // 保存的文件名
-            }).finally(() => {
-                Loading.hide();
-            });
-        }).onCancel(() => { })
-    }
+            res.forEach((item: any, index: any) => {
+                console.log(item, item.name)
+                let rowData = []
+                //导出内容的字段
+                rowData = [
+                    index + 1,
+                    item.equipmentCode,
+                    item.equipmentName,
+                    item.equipmentType,
+                    item.furnaceNum,
+                    item.totalRunningTime,
+                    item.totalAlarmTime,
+                    item.totalStopTime
+                ]
+                tableData.push(rowData)
+            })
+            let workSheet = XLSX.utils.aoa_to_sheet(tableData);
+            let bookNew = XLSX.utils.book_new();
+            XLSX.utils.book_append_sheet(bookNew, workSheet, 'Sheet1') // 工作簿名称
+            let name = '导出数据' + '.xlsx'
+            XLSX.writeFile(bookNew, name) // 保存的文件名
+        }).finally(() => {
+            Loading.hide();
+        });
+    }).onCancel(() => { })
+    // }
 }
 
 </script>

From 77f7161132381cc163374263833d45af44116035 Mon Sep 17 00:00:00 2001
From: liuhr <liuhr@taisoft.com.cn>
Date: Tue, 11 Jun 2024 10:18:39 +0800
Subject: [PATCH 3/6] =?UTF-8?q?[FEAT]:=201.=E8=B0=83=E6=95=B4=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=AE=9E=E4=BD=93=E7=B1=BB=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PVDEMCSUI/src/pages/screen/screen4/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PVDEMCSUI/src/pages/screen/screen4/index.vue b/PVDEMCSUI/src/pages/screen/screen4/index.vue
index e18631e..a813343 100644
--- a/PVDEMCSUI/src/pages/screen/screen4/index.vue
+++ b/PVDEMCSUI/src/pages/screen/screen4/index.vue
@@ -73,7 +73,7 @@
                                     props.row.equipmentName }}</q-td>
                                 <q-td style="font-size: 16px;" key="equipmentType" :props="props">{{
                                     props.row.equipmentType
-                                    }}</q-td>
+                                }}</q-td>
                                 <q-td style="font-size: 16px;" key="furnaceNum" :props="props">{{ props.row.furnaceNum
                                     }}</q-td>
                                 <q-td style="font-size: 16px;" key="totalRunningTime" :props="props">{{
@@ -235,6 +235,7 @@ const exportTable = () => {
     //rangDateRef.value.validate();
     //if (!rangDateRef.value.hasError) {
 
+    equipmentNoTimeRecord.value = new EquipmentNoTimeRecord();
     if (rangeDate.value) {
         let begTime = rangeDate.value.from + ' 00:00:00';
         let endTime = rangeDate.value.to + ' 23:59:59';
@@ -249,7 +250,6 @@ const exportTable = () => {
         //     })
         //     return
         // }
-        equipmentNoTimeRecord.value = new EquipmentNoTimeRecord();
         equipmentNoTimeRecord.value.begTime = begTime;
         equipmentNoTimeRecord.value.endTime = endTime;
     }

From c1a1c72c2047917c63d9033b19e1541bcdffc77c Mon Sep 17 00:00:00 2001
From: xiaoguo <Xiaoguo@123456>
Date: Tue, 18 Jun 2024 14:48:45 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3OEE=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PVDEMCS/.vs/PVDEMCS/v17/.suo                  | Bin 257024 -> 152576 bytes
 .../Impl/EquipmentRecordRepository.cs         |  16 +++++++---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo
index 637e00b1639f4d6b82416c1999dd9d7185a007be..8b90d7431bf359d832129ee263cf677bcf960516 100644
GIT binary patch
delta 10749
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
DH{C2y

delta 25532
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

diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
index 1e8a0fa..281d58a 100644
--- a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
+++ b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
@@ -743,10 +743,9 @@ namespace PVDEMCS.Services.Repositories.Impl
                     if (item.TotalMonth == DateTime.Now.ToString("yyyy-MM"))
                     {
                         //初尝值不包括今天
-                        //days = now.Day - 1;
-                        days = now.Day;
+                        days = now.Day - 1;
                         //获取当月到当前的分钟
-                        minutes = days * 60 * 24 + (now.Hour - 1) * 60 + now.Minute;
+                        minutes = days * 24 * 60  + now.Hour * 60 + now.Minute;
                     }
                     else
                     {
@@ -754,7 +753,7 @@ namespace PVDEMCS.Services.Repositories.Impl
                         if (sptr.Length == 2)
                         {
                             days = DateTime.DaysInMonth(int.Parse(sptr[0]), int.Parse(sptr[1]));
-                            minutes = days * 60 * 24;
+                            minutes = days * 24 * 60;
                         }
 
                     }
@@ -818,7 +817,7 @@ namespace PVDEMCS.Services.Repositories.Impl
                         WHERE
 	                        info.id = '{equipmentId}' 
 	                        AND total_day >= '{beg}' 
-	                        AND total_day <= '{endDate}' 
+	                        AND total_day <= '{end}' 
                         GROUP BY
 	                        EquipmentId,
 	                        EquipmentType";
@@ -860,14 +859,13 @@ namespace PVDEMCS.Services.Repositories.Impl
                     {
                         days = Convert.ToDecimal((endDate - begDate).TotalDays);
                     }
-                    if (end == DateTime.Now.ToString("yyyy-MM-dd"))
+                    if (endDate.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd"))
                     {
-                        //days = days - 1;
-                        minutes = days * 60 * 24 + (now.Hour - 1) * 60 + now.Minute;
+                        minutes = days * 24 * 60 + now.Hour * 60 + now.Minute;
                     }
                     else
                     {
-                        minutes = days * 60 * 24;
+                        minutes = days * 24 * 60;
                     }
 
                     var value = 0m;

From 53eea68392622bb3802a7f10b940e7a3bc26cb7c Mon Sep 17 00:00:00 2001
From: xiaoguo <Xiaoguo@123456>
Date: Wed, 19 Jun 2024 23:11:40 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A5=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=20=E8=B7=A8=E5=A4=A9=E6=95=B0=E6=8D=AE=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2  | Bin 161348 -> 161348 bytes
 PVDEMCS/.vs/PVDEMCS/v17/.suo                  | Bin 152576 -> 152576 bytes
 PVDEMCS/PVDEMCS/Devices/Impl/DeviceRun.cs     |  36 +++++++
 PVDEMCS/PVDEMCS/Nlog.config                   |   2 +-
 PVDEMCS/PVDEMCS/Program.cs                    |   7 +-
 .../Impl/EquipmentRecordRepository.cs         |   5 +-
 PVDEMCS/PVDEMCS/Test.cs                       |  91 +++++++++++++++++-
 7 files changed, 132 insertions(+), 9 deletions(-)

diff --git a/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2 b/PVDEMCS/.vs/PVDEMCS/DesignTimeBuild/.dtbcache.v2
index 5f8acc8d5e64363f4c2bdf931cd8f9a1efc054a3..5f6662fa53d2a96b1b0066923dea8e4c98c58cbe 100644
GIT binary patch
delta 20
ccmX@|hV#f9&Iv0RjT=|Cu4LT0l4*7+0Bj%$r~m)}

delta 20
ccmX@|hV#f9&Iv0R%^Fv>u4LT0l4*7+0Bk`Cs{jB1

diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo
index 8b90d7431bf359d832129ee263cf677bcf960516..f589942513f1a5d82de70366d37e5a6130a23fde 100644
GIT binary patch
delta 12476
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

delta 12629
zcmeI23tW^{`p4hrFbo5Xihu}+a&d%FxnC4DbwJEZW=dvesHosA6-2yY$!OM6TH>6R
zV`--3qLr3OF|~iKLG7cvX63H6=31$_>sqZ_F6L!h`Tw352Gmt^xBS=V^WQU{@4V+d
z=Y7xZIp=wvb7t(DyzQI3%M&|m?%=0s`w;g5m+I^5IhlYFoB-d*$ee)cVLnfhLkuB<
zj1=K5U89~pG`RLK9YDU;S(b>wD(gK;A|byOi;NXQ(>@on#G|Ce3WKIuJoqV1^Os}@
zn1LGV|H)qnzDTu#954y=0fWH>&<5-Qg<u;%E43sL588uRunF`813)wg0S|%u0r&4U
zx!4d8$2I*8cP|4o*aFUgK=3Yj2XqJCpkCG*+R<+LiJ@Jo1@{kw)8J_k1&ToxSOQjn
z$3Z)A9t43YU>Nuo^aI1eNRS4`fgzwbSOmI(XF)P30X+EOxON3&dHiz`xko<a8Iv;|
zG44idTuXr+q=Px22&@5f!F=!{7y~{55*z}V;60EE?gEiu85jzhrMk}NGO5P0RORmM
zB#8V<p_X1QRBjaqf0X1FD|dtg-`_~Y9r4b!M9lBDM_w$rhKQ$KA>%jkkO}00c)-*6
zWxx{Wg3P$yNa8#UZ9z3)2^D}5pa;<BLB<cB2eOA}yUvLy?|UTPEbu8T@aMpfDR3SQ
z7Wg9u%xl16lIEHSGe_LW^qLWL>DBSG$^5;~b>WwOg_5ekMz9II0A2(yfz4nGc-c@L
z?=zT6pK0vXdTs@%1b2g(paQ%OMu7k@0~`TQf(>9LaDZOm2{0Ly12m!jc3i{2MPPyM
zLY3MbU?XsX7|=@7CTJ0eJPM|Q*+78@L4U9ltOXx|&0rT;2krxl!Ixkn;0kMT4Fyku
z<=_qQ0;p$Qxw6nyn!z^+!MMhO(I5f54LJSI#w*7;WaEB6xDC7yeg`=HAg;d$OTppB
zv_IhbF(?Cn1fPM`;8XAlIL4}|10r0&aa?Nvi|U^%$G0oBHD++;*NC?ST>vlEvzO%!
zLj0x1`-QkZ2L1sqHKy_V&m+#Z;+e*@^|*eITuX0Sun{QiYQcIU%`Mp9Al?Z;uzF8#
zPOiNg1p7<8#Dbj$+=AsHs>MAEmV4(GEXV7S_Edv#4L2=ZeMaEj6uf*(h5IThVBu!l
z5Yd~9uOCOa@{)g-YODWuEu<ydV%UcAW$u_znJ8My;^?K~2~C#V7b~M<I#6eIpc5q+
zSv=cFmc$G;@sf<a{EfPp#A-{_5f4XfmfUSjq$lN^*iw2zo{hcB^cOrBaoNMPT+WFr
zHFm^We$k`)VvNz?7*Z_O801`AwgGdlxgB-3VW#d#VD0K|oF}jB7vzHW335|LJGsjv
z$&;7Zdz?~jjX&h!7*R*RlxIiOdoB@B7}Xb2x(cUd5gnn*bd%Z^FRW_Qy);VNe`^~)
zK}*5PPX;{@>#ilj_9nrW_R#W?Iv(j0^lLtv&;zDE3E#<hvLQbQDsCR0nv73Ato1$G
zAhl&QbxuC=Y5V*w=QfrP+<kuAcOA%R>NxpZmr0C!>-F4^&OP0S7gLikIo_3&?HC18
zo?L9nlKcJ?(az7O@6hlz>pkhT$;-C=H|O6>uj{$dc5p)7GLOnk<Bv05L2=d5gAbD<
zw^-PPoSS>6HwB_GA;3M@q7;5#?jqwpq!pV~$t(1zBi-t>7E&0QtVm>a>V8-i&!Xiw
zQ5x-2b6%lkmD$4c=*-{^iK=!ZwUMD8Mbme(cG^_+;=MFdy5`&NnSfDE!N{jVGU=cj
z<dKKFG{nb4GI{v0Bql&^-E}#pA>IvnX?QP38wjVa7;fflIBo^nbl8T8+5%ldLEh@^
zhqHZ)roXVI#ox2Pn)u+E+q>QVyC`+=b&9PVX>x>Hr8POs#0xI%vL4Ff<hyvr`LG1*
z06KqZWfy5pX_$z=Lc$igpafGhCCn6$J5~_x@iA}04Xbeu70=LoDwYcdmQtF$Fz^nF
z(HEI49<<z19%u-})Rn>I>A^vWu=;9?YcL1_p`dz7c{!OjU=4Auw0DiJj?O#m;V|dP
zym!N--E5BCfND6i3Rkw59B0MFZY0N9c3T?b@(uHD@{|v?2>0XVdJ232Sb@sTEk;yM
zGdhO$^QL6nr*c}Orto|TH@}h#CZWee!zjH$QTz#st4LmqiI>*9!c0AI3+3GWQVDKe
zl^53FC1j%|^#d-;_T7P-p6DV%b^WYP=4wl~b!6&^+k1h#Y9p(PLt6F4Qlp7Vuy7`%
z4}%llPs_%Pm<|7VI%FRYiO<${tRI!==#{Gtesbl^eI6Ol+7|BJ@O;_2a~-<2pR{_u
z>6?ZLSpJS56{4IGw++JF$<hXCcVZ^Z)Ymt!?uN2<?JY5U*8gDm-)cU5aaeDwZ^*N8
zcb-btp0t#k=e-o#`T=)YEq!^2xeo}cG>#VQs;Aoe_#sb+71Qgr)!xKiKaG67Pe(oc
zo#(rdi7FlDiX~*DwUYYGkn5&JD0?sRAEb%<z3-?W{p!G~ORknHdM;h~!6VPEdh_lt
z$NYN0$@@P0polBt0y&)Wg7*V!H!Dih@}aEX?%Uwa^vZydWFfVs`RHo4`Z!vQmbnjm
znY-d`-dAv_Txa|t^T@zGm-ZH6*Pcq7%uv42b81M22vp%k6sdM@q(J407on_~gQ>1r
z4cHIa`le$Qb%#*X^@W`Wk*0xEDB?t1dq4@~>-nrG@^P1}tA>eC)@j&#=BWDNG|0fa
z4)@ei#o4r6ty)D^wQd!K$*jojHF@MBIxjOi^_BMfu$F#(*mK)3Y>M^13>&_6+s=N0
zy!5M!KN>*>cI4cpRoDH&EL3H@NUu&WEF&!H#g@L6M}jIZ36<PO1go*V$Xacyb5V;c
z%!RIq?pS-cvvYs$=?@RAf9KKYLC(8oT<rL8-Ct_6&#W2w&-?xV$||EtsvPfxS+9#2
zUj^v?c+B%0Y-{qhRdR7^U#H84nIpHR8dZ6U2$T`unyRDDf9mNdA4c^u$!CB$1}iHK
za3R$j$`i@JF?ncZguW8FzpB<jAy@@jD76sG)Q5N`YFp5_3cmDJ`6q{pxBNp7KmNjV
zyVmx2<=(er9~^W1&6vr*@BCgtq<a<k`1+yEP*NOZ-##%s7^!0PMH%*-MeQl0mT;+!
zyhin;6BVIk*EcPd9t}E5E#FPS&JCfILp9rI@0BC(d)cH_#|~0}Dz{UR(`uwc9u>u8
zmv+lU^<i5P8u9fXBi7!(x^(Q={nn%vnUQ-wj{fz&%pGI@@Qb+Aj(>ji%@n=8E&9Pq
z%)qArJ<d^m=TL2xnT(Dy7ui+DT+Ei4In-7ams1aOT1ss9^apPrKYez7c~hRZ`XrM&
zs{Nfr3>=`0989HT7|TF3=gOU!xoV(3vDBz_wAA2&G@M7*Q3P!u3Q24V4?UQcnjV{+
z+E7hiLp8%zke57q(xm#wh(u+ZOE%@2N4BakGD`b0n;`|$US&zTO>IjMVQS5Mvb1CY
zb6_C|k`Wss;N=;eb@RzgRTjKhJ2pg)J26D<FC&whQANL}!%a)DVkx<l>orvI2vJQu
zm6`OWJC}E(=|qn@FLWm_W5qPu<*iSt11xB_bzs4#IxkEkFOv3l(K6cA!4!uywn*-W
zj0w1@fm`Vs<V`G4-m<teJ=ybnS}q8RlhL*9Wxs@E-Y5JPwk0H1Rw0GmKj<{=w7T#x
z?P+SKsx5;?3CyI;X13qFk>Cx58b6o9eToZ;;wR2-hqD3a*-Y}Ks@ut2kwyK4X437K
zXd|3+v*>a3PG3^C5#;i4L|dGeU<xO-E1QzloDf>3k`qK9XP?oulYE*NrP>}ZI_P>#
z*(TAarq{4wi@Z^H^kh0*<swmYl<Wk92dV3)aXd)ucije?HB);46u_&TsUMjk84}}z
zr;%8V{b7;%!RL$zM&#VDjj7m97G*n5ex9ra=T=Q1p|Vp%AO8vPb})<eH9P?&PuA2k
zPf&D6F7d|oY4X^fwn_XHw~Si}&jVcDhJ2h!<?FfnCRR~~xZ`@&DoX%`s-rfFP*EGm
zKdPZr()*9@Y3Ekw$IKu1;s5x&bL@ambnk(rsWp+pq9Rg-kK=H$k?_!1KUs3Pgr1jY
z50{Gd9&+v<A9q-zozYX^**k@U-l7&cjm_bKCAD}JRx9c>sI`$IxN16%yC}6&b*HiI
zsO6Ov%Aw=7shwpM;0!3Dzfz3@#y~HO+jgzOu3QvNk2iJes=Ax%RhjouAGv7UlByaa
z_1a1DlO4__D%a~27*f=vT{UelN@C5)*8+9GMgcN8)nDeG3&m89gl;q=ldoxdrdqm+
zf<*^XIRh{q9Gyk5T=k(<`u!u=a{y#iEHlmps6I0(wA2b!TMTE0C&y$h0-3WgIi^C*
z&p>=8@&-ZK$08>SrllBZBaq8^5wNQHc*mW7?PnT{h5MP#XeAoi6bMr*oL8`BP%Bqa
zSC&p_Bo8uAFn8d44h`3Tkz^Fl3QLt8Gu@sdqA-9t*Bq3d{C=wsI+wlCIw12G%jUIw
zL~Ra=K$>aB!d-*jl@HJV<*BVlx|<5RoZdfuU6t`@YV~KK)1taPCBAnY{gwS~vR9rF
zRgaRWGLUe*QEXm<<-#k5Lxlk*f72VIsA@S0TLA`=?evv{&jWZjWX=M~#}LOi4Xt~~
z-A_1e2k8VkEfp{j24470>TxhCJmI|X2@Rlj*DnYAcb-8f_W08Yxp<RZid2if44S4R
zl;e-L#1r))(7)W{!B_Socw$_+^m-3OcRt+{b=9nhXxCgw!#ud=eDLEugIgIQu0GyD
z-6~3G?`^#E;;jnne|Bp493j0i&U*>ok?@&ZZ_o$8L)L6ScYq8F$r8b_AxOCs3<Y<A
zVPH7WpBlK3HZ>T-x&veu6^jV!Xbl~v8o}OVv8wf;zG^!5X--oPT_6SHZQ?I4Sa2^D
znl1WMqG}y2I>`slwoxiu<OVmY_#8}$A{_klmX)_N@oHsf5ptbXo&TRstQ$-j^l>T3
z!mltns2{Cy)+-{i@tE?c^SUnIH|(pJZ~j!D+Bz$<`{e2B?gV*;;}>Ukd~?W0$vZiY
z$284e74%(Qzs!@fO3y3X(-i0zaw@1$vzK2e`nq4{=bxC`tGuUaO~qLHSgwC8T-k|y
z*xB+?50q1;XHvJ=wC-w04)&M6<LIo@o(l_FQ%So?Eq$JDOP+-q*h+c;BVb>LgBRi^
z;0=6$FJQsNG#t0AEF9dL-RWpx23GI^p9H>IIE4PIpnsr(R<>ODrhd89O0^0SNlrUl
zRjOcr^{3U^RU7EX(a0`R!^coZ`FUA;r>zVN-f=!yc32zb?D;7fZ(1E^bSkZRoH9wt
zatf7UkLA&3-Z`jk11ZoMxS779Tj?)WJPGH1{WuC%(_@6Ud+h}%zcP4DZHZ2)glOTV
ze27}8z%q)J<&U*i!<SKk(^U>}QjR=uGU&%sWLLQ-Zu@tAHTC^ZunTgPB7@6w9eoi3
z4e)O&jL+Q)L${^Z^M5;{MuZ!=`9C+e+xI4o&s8$}Ik=QJ={)eZAWFGX#fBDUSTpvw
z{csJt%%y%yyMap`uHK8JP_tG4L&E*KfOWr6cY2zA8vL!I%|_dI<WZ4{9Z0nB*Y`o#
z5jF;A>1Ra37oNTza8<36sEyi<-GSP&o&3D6-s>6ly&j?9K(B@!;dFKEB!#Qzc918w
zPK#TKwyM=Zva*d<@1LY3&M`Y($FXK_=&siM8BZwNc0P{#f<mS=oOu?)6)C_EYFHgw
zOA{K%LxmgCT3)#+G+vz$-3P}Ji8zu^g1^-e=X1MWS8XPzG&SGsSd?XY8O6T}+-|Nc
zUZfwp%eqCwOk0sreMM&J@`^90RwW;&4k{O49z}Ut)t5w$B|d7%F*sj-C+IZQoZ+r*
z-OdK+?_~dpe8d_bVJGhy@aks6ubQZm(s61Pfq!B&iF=siS)3Uip+i(t!3SPV=fn76
z&aC_U=sXAY{tmJ^ZDs+>6OLEv@Jf|GHZS&8ICO;g6V<_!6w9LT%0~n(y&9#dY=5T=
zwai!esr{{lk6P_3+NjJx5h~&}<?<CH)yOl{#c2x=m@TVrt;^T!#i?VRM7RpirATED
z6fWud8@%TBVm>L?lVscI>L941o%kxSh{p}v2tMsi#I*;`ek<aHttwJb;#kZ~R<f1}
zdE@ib^Yaqpx=&2bi%U)F)+4URq{Inv`N`wEr%g;r?UA0C<e}|V-&jO{RcIBRQfKEE
z&7C?ie|An$eqq7vsW>E>ikqo33a97f&zdu}a7O;j;-dVC1x0yH4=hl#x{9u}ol6<}
z0}6PfxfzzGW?ZZ0#>|FlH|y2@8!x=pTunrCHCJ`+iYhkgRovXetym$rmDp6<Pd~KB
z!bDKjS6ErKgG3uoZ!I(7Ze`CBHsxc*M0>8kc!z%aM)Cym4C{{xrd*vwu%H}$KggS(
z=F?<f>>}UIq*Ojx_PvQmR8p+y7j()k49(BQ_Ki2ZS^q~<Eku2}f<gohY3fZ|Rkwot
zC_zoifuZ8~jdL6Nu$L8`9%5bmCzv)M>(<U=5jv=`@dKM0ukS-cphoX2r>=solc6`c
zHUGHT5War99FaKnNGw!pL>m5gu&56V>oYYp=|4UCi-H{a=#Q`edh{2pTnWOi)(sJ6
zwLD3TwO)RD*L*U^X8g*NId)d~jJ)amYSjBa@_<Jqdn#edm5iph-i{yUj4C5V^i?}I
zpd0?%$zQcUNTF~z_MfB_wlgi%jxQ)S;2K^-gHN%wm59CP7CR8S3#O8eW0tv{0p0sj
zOJFWH+CL+4L-YH9`eFyoXtJDengsqG!R5u>$bN=R#2-X6amJU2QS9A#=-Ep@fLf@*
zJ;6^XzQR`HC2XR?EP~X#0r;`=>o&q~qupBw1zYQK+Wdq|I9(wkRs{0zo&5Kbskk<r
z%+6*j=lZXOyOF)RwVL5)XW?|?@&C`T@iAUQFt}cakxRtQe+`@NyH35q>bOOQEjdjj
zI}NEKk<`i@iq;R3RKf~seVIe=g667ekDX7mFR$$J(1%gjV#v(>*phV=_*r7dgU;{b
zMAlU$4R@T#fSA>Q&#AYp9TUQTTA8d?j>8Y~n^ut7oEJN#xVW%qLc+Xx^OP+?EKy5R
z#AsE1w<uIwCsC$Tq>4$TiU#BUcsCK|$&Qgh<z$Q1*dyg;;}GETGkG)qJHsJ`&41Yc
E0&!0pTmS$7

diff --git a/PVDEMCS/PVDEMCS/Devices/Impl/DeviceRun.cs b/PVDEMCS/PVDEMCS/Devices/Impl/DeviceRun.cs
index db5590d..102bab8 100644
--- a/PVDEMCS/PVDEMCS/Devices/Impl/DeviceRun.cs
+++ b/PVDEMCS/PVDEMCS/Devices/Impl/DeviceRun.cs
@@ -6,6 +6,7 @@ using PVDEMCS.Devices;
 using PVDEMCS.Services;
 using PVDEMCS.Services.Impl;
 using PVDEMCS.Services.Models;
+using SixLabors.Fonts;
 using System.Linq;
 using System.Threading;
 
@@ -146,6 +147,41 @@ namespace PVDEMCS.Devices.Impl
                 }
             });
 
+            //设备记录日统计（修复统计，解决出现跨天的数据统计不到的情况）
+            Task.Run(() =>
+            {
+                //凌晨1点运行
+                var now = DateTime.Now;
+                var targetTime = new DateTime(now.Year, now.Month, now.Day, 1, 0, 0);
+                if (targetTime <= now)
+                {
+                    // 如果目标时间已经过去，则设置到明天
+                    targetTime = targetTime.AddDays(1);
+                }
+                while (true)
+                {
+                    try
+                    {
+                        Thread.Sleep(TimeSpan.FromMilliseconds(targetTime.Subtract(DateTime.Now).TotalMilliseconds));
+
+                        //这里修复10天前的
+                        for (int i = 10; i > 0; i--)
+                        {
+                            equipmentRecordService.RunEquipmentRecordDayTotal(DateTime.Now.AddDays(-i));
+                        }
+
+                        $" 设备记录日统计（修复统计) ".WriteInfoLog();
+                    }
+                    catch (Exception ex)
+                    {
+                        ex.WriteErrorLog("设备记录日统计（修复统计）异常");
+                    }
+                    
+                    //明天继续
+                    targetTime = targetTime.AddDays(1);
+                }
+            });
+
             //设备记录统计
             Task.Run(() =>
             {
diff --git a/PVDEMCS/PVDEMCS/Nlog.config b/PVDEMCS/PVDEMCS/Nlog.config
index 604058a..566877b 100644
--- a/PVDEMCS/PVDEMCS/Nlog.config
+++ b/PVDEMCS/PVDEMCS/Nlog.config
@@ -16,7 +16,7 @@
 				xsi:type="File"
 				fileName="${basedir}/logs/${appName}-${shortdate}.log"
 				layout="${longdate} [${uppercase:${level}}] ${callsite}(${callsite-filename:includeSourcePath=False}:${callsite-linenumber}) - ${message} ${exception:format=ToString}"
-				maxArchiveFiles="999"
+				maxArchiveFiles="100"
 				archiveFileName="${basedir}/logs/${appName}-${shortdate}-${###}.log"
 				createDirs="true"
 				archiveAboveSize="1048576"
diff --git a/PVDEMCS/PVDEMCS/Program.cs b/PVDEMCS/PVDEMCS/Program.cs
index 52afc5e..9209df5 100644
--- a/PVDEMCS/PVDEMCS/Program.cs
+++ b/PVDEMCS/PVDEMCS/Program.cs
@@ -65,7 +65,7 @@ app.Lifetime.ApplicationStarted.Register(() =>
 
     deviceRun.Run();
 
-   // Test.UpdateEquipmentRecordDayTotal(app.Services.GetService<IEquipmentRecordService>());
+    //Test.UpdateEquipmentRecordDayTotal(app.Services.GetService<IEquipmentRecordService>());
 
     //var equipmentList = app.Services.GetService<IEquipmentService>();
     //var equipmentRecord = app.Services.GetService<IEquipmentRecordService>();
@@ -97,6 +97,11 @@ app.Lifetime.ApplicationStarted.Register(() =>
     //    Thread.Sleep(100);
     //}
 
+   // Test.EqualsRecordAndDayTotal();
+
+
 });
 
 app.Run();
+
+
diff --git a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
index 281d58a..3e31185 100644
--- a/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
+++ b/PVDEMCS/PVDEMCS/Services/Repositories/Impl/EquipmentRecordRepository.cs
@@ -238,7 +238,6 @@ namespace PVDEMCS.Services.Repositories.Impl
             using (var context = new EFContext())
             {
                 var query = context.EquipmentRecords.Where(f =>  (f.StartTime >= begDate && f.StartTime <= endDate)).ToList();
-                //过滤跨天的数据部分
                 
                 //获取状态统计时间
                 var total = query.GroupBy(f => new { f.EquipmentId, f.State })
@@ -587,7 +586,7 @@ namespace PVDEMCS.Services.Repositories.Impl
             }
             if (endTime.HasValue)
             {
-                sql += $" AND total_day <= '{endTime.Value.AddDays(1).ToString("yyyy-MM-dd")}'";
+                sql += $" AND total_day <= '{endTime.Value.ToString("yyyy-MM-dd")}'";
             }
             if (!equipmentName.IsNullOrEmpty())
             {
@@ -602,8 +601,8 @@ namespace PVDEMCS.Services.Repositories.Impl
                 sql += $" AND equipment_info.equipment_type='{equipmentType}'";
             }
             sql += " GROUP BY equipment_info.id,equipment_info.equipment_code,equipment_info.equipment_name";
-            return sql;
 
+            return sql;
 
         }
 
diff --git a/PVDEMCS/PVDEMCS/Test.cs b/PVDEMCS/PVDEMCS/Test.cs
index 0b7ca23..4ca4a5d 100644
--- a/PVDEMCS/PVDEMCS/Test.cs
+++ b/PVDEMCS/PVDEMCS/Test.cs
@@ -1,6 +1,11 @@
 using Masuit.Tools;
+using Masuit.Tools.Models;
 using PVDEMCS.Common.Constant;
 using PVDEMCS.Services;
+using PVDEMCS.Services.Models;
+using PVDEMCS.Services.Repositories.Entities;
+using System.Net;
+using System.Security.Principal;
 
 namespace PVDEMCS
 {
@@ -33,18 +38,96 @@ namespace PVDEMCS
 
         public static void UpdateEquipmentRecordDayTotal(IEquipmentRecordService equipmentRecordService) 
         {
-            var begDate = DateTime.Parse("2023-12-1");
-            var endDate = DateTime.Parse("2024-5-7");
+            var begDate = DateTime.Parse("2024-4-1");
+            var endDate = DateTime.Parse("2024-6-19");
             do
             {
                 equipmentRecordService.RunEquipmentRecordDayTotal(begDate);
 
+                Console.WriteLine(begDate.ToString() + "统计完成!!");
+
                 begDate = begDate.AddDays(1);
 
-                Console.WriteLine(begDate.ToString() + "统计完成!!");
+            } while (begDate <= endDate);
+        }
+
+
+        /// <summary>
+        /// 明细与日汇总数据比较
+        /// </summary>
+        public static void EqualsRecordAndDayTotal()
+        {
+            var dayList = new List<EquipmentRecordDayTotal>();
+
+            using (var context = new EFContext())
+            {
+                var start = DateTime.Parse("2024-05-01");
+                do
+                {
+                    var query = context.EquipmentRecords.Where(f => f.EquipmentId == "1139430645193863168" && f.StartTime >= start && f.StartTime <= start.AddDays(1).AddMinutes(-1)).ToList();
 
-            } while (begDate<=endDate);
+                    //获取状态统计时间
+                    var total = query.GroupBy(f => new { f.EquipmentId, f.State })
+                         .Select(f => new
+                         {
+                             EquipmentId = f.Key.EquipmentId,
+                             State = f.Key.State,
+                             Value = Convert.ToDecimal(f.Sum(ff => (ff.EndTime - ff.StartTime).TotalMinutes)),
+                             Date = DateTime.Parse(f.Min(ff => ff.StartTime).ToString("yyyy-MM-dd")),
+
+                         }).ToList();
+
+                    if (total.Count > 0)
+                    {
+                        var day = new EquipmentRecordDayTotal();
+                        day.TotalDay = start;
+                        var value = total.Where(f => f.State == EquipmentState.Stop).FirstOrDefault();
+                        if (value != null)
+                        {
+                            day.TotalStopTime = Math.Round(value.Value, 2);
+                        }
+                        value = total.Where(f => f.State == EquipmentState.Alarm).FirstOrDefault();
+                        if (value != null)
+                        {
+                            day.TotalAlarmTime = Math.Round(value.Value, 2);
+                        }
+                        value = total.Where(f => f.State == EquipmentState.Run).FirstOrDefault();
+                        if (value != null)
+                        {
+                            day.TotalRunningTime = Math.Round(value.Value, 2);
+                        }
+                        dayList.Add(day);
+
+                    }
+                    start = start.AddDays(1);
+
+                } while (start <= DateTime.Parse("2024-05-31"));
+
+               var days = context.EquipmentRecordDayTotals.Where(f => f.EquipmentId == "1139430645193863168" && f.TotalDay >= DateTime.Parse("2024-05-01") && f.TotalDay <= DateTime.Parse("2024-05-31")).ToList();
+
+                foreach (var item in dayList)
+                {
+                    var val = days.Where(f => f.TotalDay == item.TotalDay).FirstOrDefault();
+                    if (val != null) 
+                    {
+                        if (val.TotalAlarmTime != item.TotalAlarmTime ||
+                            val.TotalStopTime != item.TotalStopTime ||
+                            val.TotalRunningTime != item.TotalRunningTime)
+                        {
+                            Console.WriteLine(item.TotalDay);
+                            Console.WriteLine($"record:Alarm:{item.TotalAlarmTime},Stop:{item.TotalStopTime},Running:{item.TotalRunningTime}");
+                            Console.WriteLine($"total: Alarm:{val.TotalAlarmTime},Stop:{val.TotalStopTime},Running:{val.TotalRunningTime}");
+                        }
+                        else
+                        {
+                            Console.WriteLine(item.TotalDay + " OK!!!");
+                        }
+                        
+                    }
+                }
+            }
 
+            
         }
 
     }

From fd0d88b1b441bc3ba29b08506eb5ee0637f9bc0a Mon Sep 17 00:00:00 2001
From: xiaoguo <Xiaoguo@123456>
Date: Thu, 20 Jun 2024 11:13:15 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=9C=A8=E6=B5=8B=E8=AF=95=E4=B8=AD?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=AE=B0=E5=BD=95=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 PVDEMCS/.vs/PVDEMCS/v17/.suo | Bin 152576 -> 163840 bytes
 PVDEMCS/PVDEMCS/Program.cs   |   6 ++++--
 PVDEMCS/PVDEMCS/Test.cs      |  37 +++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/PVDEMCS/.vs/PVDEMCS/v17/.suo b/PVDEMCS/.vs/PVDEMCS/v17/.suo
index f589942513f1a5d82de70366d37e5a6130a23fde..40846f492576c03fa201f607c1cea1a79d3ce0cc 100644
GIT binary patch
delta 7707
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
B0LTCU

delta 6021
zcmbuD4}4SA702JXP13XtrGG*xr9cX42(+btDFqQzS{*_Kq#z(g$|x2Y2rI=+Q1d{?
z2mh|*L9Qq$Rt?O}O&ZK&_=mu7V{XpkAI7@66{m>XK7g#ER0jK<*QR6+-TdtK^L^+3
zzwe!M&$%~M)p&JRTvNdaq4cCAMR^(71aR@vrAu5J17g9i!6#Z)O{$*s0c|FqsG@u=
zOAJYDT^Np?bFhv6jt**twnj|079wi`TJ8J{tw1DFAMI1&HD_QQuXbn5+CCw)Hupgf
zq$Z6_smq5WhZT*)%ez4hxD{l8$>2QT*LodtCE(6@V}+OF{2<6&-~!`-6X;+7xEt&S
z-0!fq&XhVn9i`ucS-=MV0%Ax}?2sqHYv4zKNBk4?M?Tn7)>=*OyhIf41%yFcA%}t&
zK>(}=KLk8@AY`nTZ5}q7OI0Xc4Soko!FEstxGj=$P`(A!f_JpL<BF$q%W;&-z-rI{
zwt+jqJ>WSoA6x_);QkXKKLaIT8ps0sz%Kxsj|}s9#6wfre7`}hhs}4rR^cinTd&3P
z*<#)oqb$agbLxj7tQk&hKei2*|5y7B!I+5smLWd~e1-jP?lmBr?J%%{IuHlq0l&mN
z$cQ<){5i^O&R0OhoEwqnwum{O(%vxT^xE<)TEEJcGtkDiG_x(smLnIj<+qTJw&epT
zTfi_7ZOastHP!6)E<h$3d>=dn{+n4(p%0t27_eFY0Ip<KGAoJzF~9`aA{NM4U<Gj?
z-i&ukK*kolJN{nUv~s%do(t(=%y<AC1iV2Gf!Ba$_s*0{RtURxm-oJ;==phWEh#=T
zh$w<tX8ICM-dz~61N;CChg(!b-VXd=DVPIN!8-65cmzBHHUT!uRge#Z`krzl<aHnu
zBw)TIa5M5#z)mm<JPA~=0l`JtgUoGU6_DUAa4q1^>I>SyPr!ZP0Qf2R8TdI^1lE8j
zz^fo1c)?yU0VHDaX2=TQ17`3Bm<!6m7DW?%2hV*AS@wb(AX@={*Z3aE`6I}`3toz<
z8yuDAJ}oG}7ghHs<Ui)%yJ=;5`QuRy-1$M2PlGeS19<UHNNyY1BRS8>gm1XNdm^jP
z?+Ut7F80x!bK12z=PI>BbH{77hO7-bhqlM~T3njTG1QcYNg|<KYjjN0DzXZ-PDiWN
zga&r}-p0<Xf}qolk*-QBFUNL^G*VDo?ebEK_9>n(Xsd^NE!!}`b1}iLJd4#g-WhZT
z+Nq_i(Ml$5b!oLWDJwVF>9NJO>^VfVP#(#qeDiutxK+C|EidSr+(y3AO6%LG;Xu;6
zjQR55(h>@~Z`na6cF;%%3rB--BG@&}V)E5i7$4JEtBL_aJ6C(roG#!x!Sl0ngyvlG
zq@b&fg@c_-Y~(9|!ftMh(WoR_&ptr|vF#J()VHaCs-^cMTGu>Nc%R4Y{OLO&*$qmd
z@n|>Twul>Wo>R0N{1IcK-GF0Bv>RA4-yp!_uHXimH!<saZtKFh|7EBD75%t>^iCg$
z`Hh{feVjPP%Nv?|@P=l|5tldgn_ziQ9oO@Q<{gpUQ}<`c-+~1_W$x3C{D`RXG2}l4
z?*q2v3D6gO0FDCq*aE}Jc<^Ra@aFypWC!57NaA`<pZ3(BgJiE_PvZLfA-@0@z(2v`
z;1W<syO{3|y6W0ue6^iDo4{gh0wvgWo5k)cb8GIsnO2VDJXvHL1snH1M9r$TIV5C*
zN4SIT2acJ28|@||E~am+v~eavaLL9;$ybbCzGJDjb=YI;!4{y|nyO5aGc`?jbq{WD
za&~7-n=Ul(viT;tb+?I*kw1l&84Yq}3OP*yC|f>?oPQss%Xd=9Zhr|?FN0UWt6)En
z7gA`m{X^tVfRDgQ@G+3jq*9GPgBoeKT%AEvwO@!rGe^in`uPlsC0`cy`@S}_rVd0P
z$Q^9WMcWHeI?x((TdizP4x<spXpMQ(4d>_B6REV7qrk@H)O^q$Dy73@a-$IGVP*xt
z7d-#_I3dLZYOwq$Mp5R)$u$#bjo20=&rP6vNSCXxp$D7W(*kuQnma{voA7m7f|k#_
zV&%aZVzB0Dv&ugwiJ8GQ;SCfL<P^HIh1yBJf0j~YlS*m2+d{_@LOYBmJGIA1HG`nw
zC#Z@<f1%&;G$m4IGZuduJOiEu0k9LWJ%c-{YRRy<?#?6_{Yt^^MI+b+5$vW}IT$;l
zK9zQJ^h?+d6Fi4Gk@QQ$h%7yZM!dpyxU87x(dRz>d=ACN2X>JNl#wMcl!Od7lB%m7
zQey%?LG^WH^UcMFEX7U<%p?)|DS3!COZoxT%Uy3#dcP87G_EO&m4&!)vMj-~K)$<^
zasqQm_%?X1DZx$T+qhPt9>?KA+^k2VR|#Yhp5I387_^n5$5^9Bozc1w&&4R$$nrw!
zH~d;0`E|IUufR!sJ7U)i<W@s2#?@st>XxB(vC^RJI6P1ueTPPRyMJi>4c{Dxz{BVL
zdPoj@bD@YQ5Cb}K+q)4m53%7a+WfdYWuxtCJMIop<Jtj=Qh@gQA&T-K<lbyWX-AwY
zE5NS?$PdRU$|T5erJ{Tf5>_-)16Er>igsZB0J-&Dst?qVH82CZdyHH{cP*hd^6#O~
zu|Ll5fkOnAQDSHxxk;FX9QhI*_04nXt}wO51XN1#caTbtXf$D#%p4({+Ovn#q<@6S
zm2Ye$>s2LC*&<xv%8chCL;b~2=~(=+DHef3C~-0Ruz8B1{sPpMLapAv&?fWs(8t>D
zquX?&4NB+(o<?O~$nQcXL#BXKU<ds`8t4zwK{m($gF!?AEQg@%-0~EqCcBYyfgfYG
z0gxAWFI+%Azf*Vm;X{F65_#BV(W3AU{bAi3j*3IK{>jm=a^mxu#lh{#qd(z1nv})+
zep#Q{Q(v_Ii*IePS56#Lzf4NcuPE%>Q)z`|j2~(d{|`3qnf~Qter>+)-iGb`^<niZ
z!>MWn%V0;7gF=T1w+iujy6l)CZ1U6zvTNQCx=o`m50J*eb!B&OZA>9YZ*X;UaCPd~
zV|&5R!9MWK<Lvscze%x5qi<3P9B5dNNOJci>ZjXV=@jYWR=P+=$Zok}$PV50<+z$)
z#MSPZ^h-x5fh@<5#JjGZBwOF2f;bCW=J8KQN!4PEJoq{k(_Ax>D&_vSsXTO&!u&JQ
zu7zitL@UXs&XdbOff_9wxT<@i^Y)(T95$k}RO`s0JL;%|IJn93&nQdApQ0q0d6sNa
z?I61p$0=8aJ18uh&XBXW)hSP%p&}ifLnPHpqy`>^FE-<VLS&YR%w6fMmnSgqlVAsU
z3UIL2HdbYJn|oK)911)~CVvaLq-!Y+HJ!q1M7EjUxS3i=x>~5&#NXaq-`Rq&%Z|R6
z^2NXT_p68k@`ckhNWOQPhUuQObb^AeNo_R3g9!vo$0wZylD&zO;i{<Pa25}q?snUP
ztV|TxRUJ{CvydMOhJg`q!~TUMk;?(Opa_ft`Jez4g3+KDu$$&V!cB7w?~Lp9P8s(r
z8pyZruXjXE-G&pR9WE9+htq=1>)EM(Mnd<TL0J!XaqVw5Qau0H=M3(<mXK9=$bXhR
zhOJm7LurHDavq1sVG@3u2+J^L3G@}@caups9VLtTn{2rx%s&AC;8=lQjQBVuak_Go
zQi)%2H{h37wOnKoZn-X5czr|g>Ye=RSK6f5693=UyKM1iJtF2mHDeK~_>vlq8fxfO
zL8!0r2wT*b+`_Yz>{OG5kZKnV%q~ELkN#tOAx(;|E0CTzag$Wzgk3I;6KT4~F2WQ_
z5h}@)<CLDjnySYt3zg+^eizk{F~Vc?!#WsZu7Kvo%KbKxEyHmFmP-{A<-}w$L8_@D
z92&wF9g2F7L*%BFD|yCCmE(zFcwWbzzTP2nVubRj{BEJRRyt;jgupOCfiyv1G3PSE
z;e3_xznOBJZjCtk@4)HC3klrodggn)cfKj1VInN#@?x=_F0Ya;GqOZkXgCH*bvE8n
z9U)X1o-NYkn}s5u&pzU_h|_JJ%d?#%tDKaBFAV2kM}CoqPd}X}Ed7ecjw=|qwy?0Y
zuBd2iQQqR>F?D$*#`*t;T(MK`$`hGV%M*`$`4wJ~7iWo4Qq9LJ<lZE<rgbmb{Tu~R
z4k|CN-w87$=L(nf&Jl6_N2X4{sq)$zDynOyH>{{{Sh#%DqE#a)zqiMN<ZGhlt3ci&
zKPiFP`;NwotE2G=D_4r~`pfe~C25aT6v>A9;&<}EMzZTOOGPe8&t$Q5z$)ms(a`km
z*b=Mo?-AZfP?5ZMvKTH~mWVX%!gf#WoHyfnIk~P{jFsvXIMn;qBHdq(eb7%Hm?Ex`
z9Vf{l9m_;*+$wa$iKjd!4@?#FwZU!U_0}rUh}bYy{FOpZY{ozqHo=bBVi0eOVcoVm
zk}XQ)oy9n74TGgri!#|XRU~18c)7qP(slcd;&!6P<R{a_{W5-xNY=O3i-$=jyTmxT
zzgSGslShhDGFz32`PJQKtjZCd%eJCXVu)c>Q8ZR=$rJfkG~DiPo1L8{-j1@_sBkg9
z2{*xr&2+qa3XZz_GNk7=aagXOCI;)CrGiMVTP7~)>I!_Qe8EBw$k!W0=}vXI5L#_b
zCihN}x7<%N<nb6v)jB?kl{bG!1mx+ZV$6VQ{14j*U!Og`c=-1hy!%r8Ydwc=(h9Ls
Ih8u+XFAmPh7ytkO

diff --git a/PVDEMCS/PVDEMCS/Program.cs b/PVDEMCS/PVDEMCS/Program.cs
index 9209df5..e57b6a0 100644
--- a/PVDEMCS/PVDEMCS/Program.cs
+++ b/PVDEMCS/PVDEMCS/Program.cs
@@ -97,11 +97,13 @@ app.Lifetime.ApplicationStarted.Register(() =>
     //    Thread.Sleep(100);
     //}
 
-   // Test.EqualsRecordAndDayTotal();
-
+    // Test.EqualsRecordAndDayTotal();
+    // Test.QueryRecordFaultInfo();
 
 });
 
 app.Run();
 
 
+
+
diff --git a/PVDEMCS/PVDEMCS/Test.cs b/PVDEMCS/PVDEMCS/Test.cs
index 4ca4a5d..edf5391 100644
--- a/PVDEMCS/PVDEMCS/Test.cs
+++ b/PVDEMCS/PVDEMCS/Test.cs
@@ -130,5 +130,42 @@ namespace PVDEMCS
             
         }
 
+        public static void QueryRecordFaultInfo()
+        {
+            var beg = DateTime.Parse("2024-6-1");
+            var end = beg.AddMonths(1);
+            using (var context = new EFContext())
+            {
+                var equiments = context.EquipmentInfos.Where(f => !f.IsDelete).ToList();
+
+                var records = context.EquipmentRecords.Where(f => f.StartTime >= beg && f.StartTime <= end).ToList();
+
+                foreach (var equipment in equiments) 
+                {
+                    EquipmentRecordEntity er = null;
+                    var list = records.Where(f => f.EquipmentId == equipment.Id).OrderBy(f => f.CreateAt).ToList();
+                    for (int i = 0; i < list.Count; i++)
+                    {
+                        if (i == 0) 
+                        {
+                            er= list[i];
+                            continue;
+                        }
+
+                        if (er.EndTime != list[i].StartTime)
+                        {
+                            Console.WriteLine(er.ToJsonString());
+                            Console.WriteLine(list[i].StartTime.ToJsonString());
+                        }
+                        else 
+                        {
+                           // Console.WriteLine(er.EquipmentId + "OK!!!");
+                        }
+                        er = list[i];
+                    }
+                }
+            }
+        }
+
     }
 }