From a43faafe0e6b95aa067292851e1db47d0935ba39 Mon Sep 17 00:00:00 2001
From: Zhanpeng Yang <zhpyang@outlook.com>
Date: Sat, 12 Oct 2024 13:32:47 +0800
Subject: [PATCH] =?UTF-8?q?[Fixed]=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E5=9C=A8=E5=89=8D=E7=AB=AF=E6=98=BE=E7=A4=BA=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/api/upload/route.js | 22 +++++------
 src/app/upload/page.js      | 73 ++++++++++++++++++++++++-------------
 2 files changed, 59 insertions(+), 36 deletions(-)

diff --git a/src/app/api/upload/route.js b/src/app/api/upload/route.js
index 26d2315..ee45567 100644
--- a/src/app/api/upload/route.js
+++ b/src/app/api/upload/route.js
@@ -207,7 +207,7 @@ export async function POST(request) {
     new Date(requestData.measureEndDatetime).getTime()
   );
 
-  let response = {};
+  let inferenceResult = {};
 
   if (spectralData === null) {
     //如果未找到光谱数据
@@ -232,15 +232,14 @@ export async function POST(request) {
 
     //计算误差
 
-    let response = {};
     const keys = ["Temperature", "C", "P", "S", "Mn", "Ni", "Mo", "Cr"];
 
-    console.log(requestData);
+    // console.log(requestData);
 
     for (let i = 0; i < keys.length; i++) {
       let key = keys[i];
-      response["test" + key] = inferenceOutput[key];
-      response["error" + key] = inferenceOutput[key] - requestData[key];
+      inferenceResult["test" + key] = inferenceOutput[key];
+      inferenceResult["error" + key] = inferenceOutput[key] - requestData[key];
     }
 
     // response = {
@@ -251,7 +250,7 @@ export async function POST(request) {
     // let furnaceUploadData = requestData;
     // furnaceUploadData.inferenceOutput = inferenceOutput;
     // furnaceUploadData.inferenceErrror = inferenceErrror;
-    let furnaceUploadData = { ...requestData, ...response };
+    let furnaceUploadData = { ...requestData, ...inferenceResult };
 
     furnaceUploadData.spectralData = pako.gzip(pack(spectralData));
     furnaceUploadData.spectralDim =
@@ -260,12 +259,13 @@ export async function POST(request) {
       1024 / (Number(process.env.SPECTRUM_BinningSpatial) + 1);
 
     // console.log(furnaceUploadData.spectralData.buffer.length);
+    console.log(inferenceResult);
     let furnaceUploadDataCompressed = pako.gzip(pack(furnaceUploadData));
-
+    console.log("after", inferenceResult);
     console.log(
       `[server][api/upload]正在上传此炉次数据到云服务器，压缩后数据大小为${
-        furnaceUploadDataCompressed.length / 1024
-      }KiByte`
+        furnaceUploadDataCompressed.length / 1024 / 1024
+      }MiByte`
     );
 
     let uploadResponse = await fetch(process.env.FURNACE_UPLOAD_API, {
@@ -279,7 +279,7 @@ export async function POST(request) {
       )}`
     );
   }
-  // console.log(result);
+  console.log(inferenceResult);
 
-  return NextResponse.json(response, { status: 200 });
+  return NextResponse.json(inferenceResult, { status: 200 });
 }
diff --git a/src/app/upload/page.js b/src/app/upload/page.js
index 9729d41..4118b90 100644
--- a/src/app/upload/page.js
+++ b/src/app/upload/page.js
@@ -67,11 +67,13 @@ export default function Upload() {
   };
 
   const [measureStartDatetime, setMeasureStartDatetime] = useState(
-    "2024-09-26T14:40:00"
+    // "2024-09-26T14:40:00"
+    getCurrentDateTime()
   );
 
   const [measureEndDatetime, setMeasureEndDatetime] = useState(
-    "2024-09-26T14:29:00"
+    // "2024-09-26T14:29:00"
+    getCurrentDateTime()
   );
 
   const handleMeasureEndDatetimeChange = (event) => {
@@ -112,10 +114,16 @@ export default function Upload() {
     });
   };
 
-  const [selecteMeasureType, setSelecteMeasureType] = useState("TSC");
+  const [measureType, setMeasureType] = useState("TSC");
 
-  const handleSelecteMeasureTypeChange = (event) => {
-    setSelecteMeasureType(event.target.value);
+  const handleMeasureTypeChange = (event) => {
+    setMeasureType(event.target.value);
+  };
+
+  const [uploadType, setUploadType] = useState("manual");
+
+  const handleUploadTypeChange = (event) => {
+    setUploadType(event.target.value);
   };
 
   const [stellType, setStellType] = useState("");
@@ -139,7 +147,7 @@ export default function Upload() {
 
       furnaceNumber: furnaceNumber,
       stellType: stellType,
-      uploadType: "manual",
+      uploadType: uploadType,
       measureStartDatetime: measureStartDatetime,
       measureEndDatetime: measureEndDatetime,
       Temperature: elementContent.Temperature,
@@ -150,7 +158,7 @@ export default function Upload() {
       Ni: elementContent.Ni,
       Mo: elementContent.Mo,
       Cr: elementContent.Cr,
-      selecteMeasureType: selecteMeasureType,
+      measureType: measureType,
       remark: remark,
     });
   }, [
@@ -158,7 +166,7 @@ export default function Upload() {
     measureStartDatetime,
     elementContent,
     measureEndDatetime,
-    selecteMeasureType,
+    measureType,
     stellType,
     remark,
   ]);
@@ -204,6 +212,18 @@ export default function Upload() {
         </select>
       </div> */}
 
+      <div>
+        <label htmlFor="dropdown">请选择数据上传数据方式:</label>
+        <select
+          id="dropdown"
+          value={uploadType}
+          onChange={handleUploadTypeChange}
+        >
+          <option value="manual">手动上传</option>
+          <option value="test">测试数据</option>
+        </select>
+      </div>
+
       <div>
         <label htmlFor="numberInput">请输入炉次号:</label>
         <input
@@ -224,6 +244,19 @@ export default function Upload() {
         />
       </div>
 
+      <div>
+        <label htmlFor="dropdown">请选择参数测量方式:</label>
+        <select
+          id="dropdown"
+          value={measureType}
+          onChange={handleMeasureTypeChange}
+        >
+          <option value="TSC">副枪TSC</option>
+          <option value="TSO">副枪TSO</option>
+          <option value="Hand">手动</option>
+        </select>
+      </div>
+
       <div>
         <label htmlFor="dateInput">请选择测温开始时间:</label>
         <input
@@ -262,16 +295,13 @@ export default function Upload() {
       </div>
 
       <div>
-        <label htmlFor="dropdown">请选择一个选项:</label>
-        <select
-          id="dropdown"
-          value={selecteMeasureType}
-          onChange={handleSelecteMeasureTypeChange}
-        >
-          <option value="TSC">TSC</option>
-          <option value="TSO">TSO</option>
-          <option value="Hand">Hand</option>
-        </select>
+        <label htmlFor="textInput">请输入备注:</label>
+        <input
+          type="text"
+          id="textInput"
+          value={remark}
+          onChange={handleRemarkChange}
+        />
       </div>
 
       <div className="flex items-center justify-center">
@@ -286,13 +316,6 @@ export default function Upload() {
       {/* <button ></button> */}
 
       <div>
-        <label htmlFor="textInput">请输入备注:</label>
-        <input
-          type="text"
-          id="textInput"
-          value={remark}
-          onChange={handleRemarkChange}
-        />
         <h2>待上传数据</h2>
         <pre>
           <code>{JSON.stringify(uploadData, null, 2)}</code>