finish_az

main.py

@@ -107,6 +107,8 @@ class Task(BaseModel):
     sl: str
     n: int
     label: str
+    name: str
+    bh: str
 
 class Jxtz(BaseModel):
     biao_id: str
@@ -204,7 +206,7 @@ class Zjcs(BaseModel):
 
 @app.post("/pushtask/")
 async def pushtask(r: Task, user=Depends(manager)):
-    task = process_data.apply_async(kwargs={"data": {"bianma": r.bianma, "mc": r.mc, "tz": r.tz, "dw": r.dw, "sl": r.sl, "n": r.n, "label": r.label}})
+    task = process_data.apply_async(kwargs={"data": {"bianma": r.bianma, "mc": r.mc, "tz": r.tz, "dw": r.dw, "sl": r.sl, "n": r.n, "label": r.label, 'name': r.name, 'bh': r.bh}})
     return {"id": task.id}
 
 @app.get("/checktask/{id}")
@@ -1100,13 +1102,13 @@ async def upload(file: Annotated[UploadFile, File()], token: Annotated[str, Form
         string = content.decode('utf-8')
         await resolve(string, user)
         return [file.filename]
-    elif file.filename.endswith("jszf") or file.filename.endswith("JSZF"):
+    elif file.filename.endswith("jszf") or file.filename.endswith("JSZF") or file.filename.endswith('jscf') or file.filename.endswith('JSCF'):
         content = await file.read()
         string = content.decode('utf-8')
         root = ET.fromstring(string)
         for child in root:
             ##print(child)
-            if child.tag == "ZBFileContent":
+            if child.tag == "ZBFileContent" or child.tag == 'DYFileContent':
                 base64_bytes = child.text.encode("ascii")
 
                 sample_string_bytes = base64.b64decode(base64_bytes)

subdir/service.py

@@ -1150,11 +1150,11 @@ def getDeXilie_azfy(value, id):
         data = {'DW': ['项', '项', '项', '项', '项', '项', '项', '项','项','项',
                        '项','项','项','项','项','项','项','项','项','项',
                        '项','项','项',
-                       '项','项', "项",'项','项','项','项', "项",'项', "项"], 
+                       '项','项', "项",'项','项','项','项', "项",'项', "项", '项'], 
                 'DEBH': ['1-F2', '1-F2','1-F2','1-F2','1-F2','1-F2','1-F2','1-F2','1-F2','1-F2','1-F2','1-F2', 
                          '4-F2', '5-F2', '5-F2', '5-F2','6-F2',
                          '7-F2', '9-F2','9-F2','9-F2','9-F2', '10-F2','10-F2','10-F2','10-F2', 
-                         '11-F2','11-F2','11-F2','11-F2', '11-F2','11-F2','11-F2' ],
+                         '11-F2','11-F2','11-F2','11-F2', '11-F2','11-F2','11-F2','11-F2' ],
                  "GCLMC": ["第一册第1-6章(定额1-1～1-571)10-15m",
                            "第一册第1-6章(定额1-1～1-571)15-20m",
                            "第一册第1-6章(定额1-1～1-571)20-25m",
@@ -1186,13 +1186,14 @@ def getDeXilie_azfy(value, id):
                            "第十一册40-50m",
                            "第十一册50-60m",
                            "第十一册60-70m",
+                           "第十一册70-80m",
                            "第十一册80m以上",
 
                            ],
                    "GCLSJDJ": ["0", "0", '0', '0',"0", "0", "0", "0", "0", "0",
                                "0", "0", '0', '0',"0", "0", "0", "0", "0", "0",
                                 "0","0", "0", 
-                                "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"]}
+                                "0", "0", "0", "0", "0", "0", "0", "0", "0", "0", "0"]}
         df = pd.DataFrame(data)
         return df.to_json(force_ascii=False)
     if int(id) == 2078:
@@ -2466,6 +2467,8 @@ def getSingleDeXilie_az(debh):
             clde_["CLMC"] = CLMC
             clde_["JLDW"] = JLDW
             clde_["YSJG"] = YSJG.item() if type(YSJG) == float64 else YSJG
+            if np.isnan(clde_['YSJG']):
+                clde_['YSJG']=0
             clde_["SL"] = SL.item() if type(SL) == float64 else SL
             clde_["HJ"] = HJ.item() if type(HJ) == float64 else HJ
             clde.append(clde_)
@@ -2481,6 +2484,8 @@ def getSingleDeXilie_az(debh):
                 clde_["CLMC"] = CLMC
                 clde_["JLDW"] = JLDW
                 clde_["YSJG"] = YSJG.item() if type(YSJG) == float64 else YSJG
+                if np.isnan(clde_['YSJG']):
+                    clde_['YSJG']=0
                 clde_["SL"] = SL.item() if type(SL) == float64 else SL
                 clde_["HJ"] = HJ.item() if type(HJ) == float64 else HJ
                 clde.append(clde_)
@@ -2501,6 +2506,8 @@ def getSingleDeXilie_az(debh):
         clde_["CLMC"] = CLMC
         clde_["JLDW"] = JLDW
         clde_["YSJG"] = YSJG.item() if type(YSJG) == float64 else YSJG
+        if np.isnan(clde_['YSJG']):
+            clde_['YSJG']=0
         clde_["SL"] = 0
         clde_["HJ"] = 0
         clde.append(clde_)
@@ -2516,6 +2523,8 @@ def getSingleDeXilie_az(debh):
         clde_["CLMC"] = CLMC
         clde_["JLDW"] = JLDW
         clde_["YSJG"] = YSJG.item() if type(YSJG) == float64 else YSJG
+        if np.isnan(clde_['YSJG']):
+            clde_['YSJG']=0
         clde_["SL"] = 0
         clde_["HJ"] = 0
         clde.append(clde_)