浏览代码

增加平峰电池组编号 102

Eric412V 2 年之前
父节点
当前提交
3969f52522

+ 3 - 0
LIB/BACKEND/OPENAPI/OpenApi.py

@@ -95,4 +95,7 @@ class OpenApi:
         #     df = df.append(d, ignore_index=True)   
         return df
     
+    #获取锁定状态及下行控制
+    
+    
     

+ 7 - 5
LIB/BACKEND/OPENAPI/main.ipynb

@@ -576,11 +576,8 @@
   }
  ],
  "metadata": {
-  "interpreter": {
-   "hash": "b3ba2566441a7c06988d0923437866b63cedc61552a5af99d1f4fb67d367b25f"
-  },
   "kernelspec": {
-   "display_name": "Python 3.8.8 64-bit ('base': conda)",
+   "display_name": "Python 3.8.8 ('base')",
    "language": "python",
    "name": "python3"
   },
@@ -596,7 +593,12 @@
    "pygments_lexer": "ipython3",
    "version": "3.8.8"
   },
-  "orig_nbformat": 4
+  "orig_nbformat": 4,
+  "vscode": {
+   "interpreter": {
+    "hash": "019f0d881dfa0a17be9f4bdd2ff37836e5df186180c5dee422b8abc136a3dbc4"
+   }
+  }
  },
  "nbformat": 4,
  "nbformat_minor": 2

+ 2 - 0
LIB/FRONTEND/CellStateEstimation/BatDiag/deploy.py

@@ -72,6 +72,8 @@ def diag_cal():
                 factory = "金茂换电"
             elif df_sn.loc[i, 'imei'][5:9] == 'L420':
                 celltype=101    #20ah磷酸铁锂电芯
+            elif df_sn.loc[i, 'imei'][5:9] == 'L264':
+                celltype=102    #20ah磷酸铁锂电芯
             else:
                 logger.info("pid-{} celltype-{} SN: {} SKIP!".format(os.getpid(), "未知", sn))
                 continue

+ 2 - 0
LIB/FRONTEND/CellStateEstimation/BatSafetyAlarm/deploy.py

@@ -79,6 +79,8 @@ def diag_cal(df_sn, df_bms_ram, df_alarm_ram, log_name):
                 factory = "金茂换电"
             elif df_sn.loc[i, 'imei'][5:9] == 'L420':
                 celltype=101    #20ah磷酸铁锂电芯
+            elif df_sn.loc[i, 'imei'][5:9] == 'L264':
+                celltype=102    #20ah磷酸铁锂电芯
             else:
                 logger.info("pid-{} celltype-{} SN: {} SKIP!".format(os.getpid(), "未知", sn))
                 continue

+ 2 - 0
LIB/FRONTEND/CellStateEstimation/BatSafetyWarning/deploy_saftywarning.py

@@ -96,6 +96,8 @@ def saftywarning_cal():
                 factory = "金茂换电"
             elif df_sn.loc[i, 'imei'][5:9] == 'L420':
                 celltype=101    #20ah磷酸铁锂电芯
+            elif df_sn.loc[i, 'imei'][5:9] == 'L264':
+                celltype=102    #20ah磷酸铁锂电芯
             else:
                 logger.info("pid-{} celltype-{} SN: {} SKIP!".format(os.getpid(), "未知", sn))
                 continue

+ 2 - 0
LIB/FRONTEND/CellStateEstimation/SOH/deploy.py

@@ -97,6 +97,8 @@ if __name__ == "__main__":
                 celltype=4 #CATL 50ah三元电芯
             elif df_sn.loc[i, 'imei'][5:9] == 'L420':
                 celltype=101    #20ah磷酸铁锂电芯
+            elif df_sn.loc[i, 'imei'][5:9] == 'L264':
+                celltype=102    #20ah磷酸铁锂电芯
             else:
                 logger.info("pid-{} celltype-{} SN: {} SKIP!".format(os.getpid(), "未知", sn))
                 continue

+ 2 - 0
LIB/FRONTEND/SaftyCenter/CellValueDiag/deploy.py

@@ -54,6 +54,8 @@ def fun():
                 celltype=4 #CATL 50ah三元电芯
             elif df_sn.loc[i, 'imei'][5:9] == 'L420':
                 celltype=101    #20ah磷酸铁锂电芯
+            elif df_sn.loc[i, 'imei'][5:9] == 'L264':
+                celltype=102    #120ah磷酸铁锂电芯
             else:
                 logger.info("pid-{} celltype-{} SN: {} SKIP!".format(os.getpid(), "未知", sn))
                 continue

+ 2 - 0
LIB/FRONTEND/SaftyCenter/Liplated/deploy.py

@@ -59,6 +59,8 @@ def cell_platd_sorvol_test(df_sn):
                 celltype=4 #CATL 50ah三元电芯
             elif df_sn.loc[i, 'imei'][5:9] == 'L420':
                 celltype=101    #20ah磷酸铁锂电芯
+            elif df_sn.loc[i, 'imei'][5:9] == 'L264':
+                celltype=102    #120ah磷酸铁锂电芯
             else:
                 logger.info("pid-{} celltype-{} SN: {} SKIP!".format(os.getpid(), "未知", sn))
                 continue

+ 2 - 0
LIB/FRONTEND/SaftyCenter/LowSocAlarm/deploy.py

@@ -122,6 +122,8 @@ if __name__ == "__main__":
                     celltype=4 #CATL 50ah三元电芯
                 elif df_sn.loc[i, 'imei'][5:9] == 'L420':
                     celltype=101    #20ah磷酸铁锂电芯
+                elif df_sn.loc[i, 'imei'][5:9] == 'L264':
+                    celltype=102    #120ah磷酸铁锂电芯
                 # else:
                 #     logger.info("pid-{} celltype-{} SN: {} SKIP!".format(os.getpid(), "未知", sn))
                 #     continue

+ 2 - 0
LIB/FRONTEND/SaftyCenter/Sorest/deploy.py

@@ -58,6 +58,8 @@ def cell_sor_test(df_sn):
                 celltype=4 #CATL 50ah三元电芯
             elif df_sn.loc[i, 'imei'][5:9] == 'L420':
                 celltype=101    #20ah磷酸铁锂电芯
+            elif df_sn.loc[i, 'imei'][5:9] == 'L264':
+                celltype=102    #120ah磷酸铁锂电芯
             else:
                 logger.info("pid-{} celltype-{} SN: {} SKIP!".format(os.getpid(), "未知", sn))
                 continue

+ 4 - 0
LIB/FRONTEND/SaftyCenter/diagfault/deploy.py

@@ -67,6 +67,10 @@ def fun():
                 celltype=3 #力信 50ah三元电芯
             elif df_sn.loc[i, 'imei'][3:5] == 'CL' and df_sn.loc[i, 'imei'][5:9] == 'N750': 
                 celltype=4 #CATL 50ah三元电芯
+            elif df_sn.loc[i, 'imei'][5:9] == 'L420':
+                celltype=101    #20ah磷酸铁锂电芯
+            elif df_sn.loc[i, 'imei'][5:9] == 'L264':
+                celltype=102    #120ah磷酸铁锂电芯
             else:
                 logger.info("pid-{} celltype-{} SN: {} SKIP!".format(os.getpid(), "未知", sn))
                 continue

+ 20 - 0
LIB/MIDDLE/CellStateEstimation/Common/BatParam.py

@@ -148,6 +148,26 @@ class BatParam:
                 self.BalCurrent=0.015
                 self.LookTab_SOC = [0.0, 2.5, 5.0, 7.5, 10.0, 12.5, 15.0, 17.5, 20.0, 22.5, 25.0, 27.5, 30.0, 32.5, 35.0, 37.5, 40.0, 42.5, 45.0, 47.5, 50.0, 52.5, 55.0, 57.5, 60.0, 62.5, 65.0, 67.5, 70.0, 72.5, 75.0, 77.5, 80.0, 82.5, 85.0, 87.5, 90.0, 92.5, 95.0, 97.5, 100.0]
                 self.LookTab_OCV = [2.5220, 2.8283, 3.0608, 3.1690, 3.1981, 3.2012, 3.2071, 3.2229, 3.2341, 3.2452, 3.2533, 3.2607, 3.2691, 3.2775, 3.2849, 3.2859, 3.2859, 3.2862, 3.2865, 3.2871, 3.2874, 3.2886, 3.2896, 3.2908, 3.2933, 3.2998, 3.3181, 3.3249, 3.3258, 3.3262, 3.3268, 3.3268, 3.3274, 3.3277, 3.3280, 3.3286, 3.3289, 3.3299, 3.3305, 3.3333, 3.4406]  
+        elif celltype==102:   #真芯好电_20ah磷酸铁锂电芯
+                self.Capacity = 120*2
+                self.PackFullChrgVolt= 426
+                self.CellFullChrgVolt=3.65
+                self.OcvInflexionBelow=3.2846
+                self.OcvInflexion2=3.2886
+                self.OcvInflexion3=3.3190
+                self.OcvInflexionAbove=3.3311
+                self.CellVoltNums=120
+                self.CellTempNums=40
+                self.FullChrgSoc=100
+                self.PeakSoc=60
+                self.PeakVoltLowLmt=3.35
+                self.PeakVoltUpLmt=3.4
+                self.PeakCellVolt=[3.362,3.363,3.365,3.366,3.367]
+                self.PackCrntDec=1
+                self.BalCurrent=0.015
+                self.LookTab_SOC = [0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100]
+                self.LookTab_OCV = [2.8977,3.1857,3.2040,3.2269,3.2521,3.2691,3.2846,3.2865,3.2871,3.2880,3.2886,3.2917,3.3190,3.3277,3.3277,3.3280,3.3286,3.3289,3.3296,3.3311,3.3795]
+
         else:
             print('未找到对应电池编号!!!')
             # sys.exit()

+ 1 - 1
LIB/MIDDLE/PingFeng/main.py

@@ -7,7 +7,7 @@ import pandas as pd
 from LIB.BACKEND import DBManager, Log
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
-import soc
+from LIB.MIDDLE.PingFeng.SOC.V1_0_0 import soc
 import time, datetime
 import traceback
 from LIB.MIDDLE.CellStateEstimation.Common import log