root/material-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复model异常

Browse Source
This commit is contained in:
han0
2024-06-05 09:04:48 +08:00
parent 54ac29d27b
commit a5619836f1
13 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/commons/models/asphalt_domestic.py
View File

@@ -1,10 +1,11 @@
from sqlalchemy import Column, Integer, String, Numeric, Date, UniqueConstraint, func
from commons.models.mixin.calculator import CalculatorMixin
from commons.models.model import Model
from core.extensions import db
class AsphaltDomestic(db.Model, CalculatorMixin):
class AsphaltDomestic(db.Model, Model, CalculatorMixin):
__tablename__ = 'ASPHALT_DOMESTIC'
id = Column('ID', Integer, primary_key=True)
name = Column('NAME', String(128), default='', comment='名称')

3
web/commons/models/asphalt_imported.py
View File

@@ -1,10 +1,11 @@
from sqlalchemy import Column, Integer, String, Numeric, Date, UniqueConstraint, func
from commons.models.mixin.calculator import CalculatorMixin
from commons.models.model import Model
from core.extensions import db
class AsphaltImported(db.Model, CalculatorMixin):
class AsphaltImported(db.Model, Model, CalculatorMixin):
__tablename__ = 'ASPHALT_IMPORTED'
id = Column('ID', Integer, primary_key=True)
name = Column('NAME', String(128), default='', comment='名称')

3
web/commons/models/cement.py
View File

@@ -1,10 +1,11 @@
from sqlalchemy import Column, Integer, String, Numeric, Date, UniqueConstraint, func
from commons.models.mixin.calculator import CalculatorMixin
from commons.models.model import Model
from core.extensions import db
class Cement(db.Model, CalculatorMixin):
class Cement(db.Model, Model, CalculatorMixin):
__tablename__ = 'CEMENT'
id = Column('ID', Integer, primary_key=True)
name = Column('NAME', String(128), default='', comment='名称')

3
web/commons/models/material.py
View File

@@ -1,10 +1,11 @@
from sqlalchemy import Column, Integer, String
from commons.models.mixin.operation_track import OperationTrackMixin
from commons.models.model import Model
from core.extensions import db
class Material(db.Model, OperationTrackMixin):
class Material(db.Model, Model, OperationTrackMixin):
id = Column('ID', String(128), primary_key=True)
parent_id = Column('PARENT_ID', String(128))
category_1 = Column('CATEGORY1', String(128), default='', comment='分类1')

2
web/commons/models/material_task.py
View File

@@ -6,7 +6,7 @@ from commons.models.model import Model
from core.extensions import db
class MaterialTask(db.Model, OperationTrackMixin, Model):
class MaterialTask(db.Model, Model, OperationTrackMixin, Model):
id = Column('ID', Integer, primary_key=True)
name = Column('NAME', String(128), default='', comment='任务名称')
status = Column('STATUS', Integer, default=0, comment='状态（待采集、已采集、采集中）')

7
web/commons/models/mixin/calculator.py
View File

@@ -1,3 +1,10 @@
import datetime
from sqlalchemy import func
from calculators import Helper
class CalculatorMixin:
date = None

3
web/commons/models/mixin/steel.py
View File

@@ -1,3 +1,6 @@
from commons.models.mixin.calculator import CalculatorMixin
class SteelMixin(CalculatorMixin):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)

3
web/commons/models/price_publish.py
View File

@@ -5,10 +5,11 @@ from sqlalchemy import Column, Integer, String, Numeric
from commons.models.mixin.base import BaseModelMixin
from commons.models.mixin.operation_track import OperationTrackMixin
from commons.models.model import Model
from core.extensions import db
class PricePublish(db.Model, OperationTrackMixin, BaseModelMixin):
class PricePublish(db.Model, Model, OperationTrackMixin, BaseModelMixin):
id = Column('ID', Integer, primary_key=True)
year = Column('YEAR', Integer, default='', comment='统计年份')
month = Column('MONTH', Integer, default='', comment='统计月份')

4
web/commons/models/price_result.py
View File

@@ -2,10 +2,12 @@ from sqlalchemy import Column, Integer, String, Numeric
from commons.models.mixin.base import BaseModelMixin
from commons.models.mixin.operation_track import OperationTrackMixin
from commons.models.model import Model
from core.extensions import db
class PriceResult(db.Model, OperationTrackMixin, BaseModelMixin):
class PriceResult(db.Model, Model, OperationTrackMixin, BaseModelMixin):
id = Column('ID', Integer, primary_key=True)
material_id = Column('MATERIAL_ID', String(128), default='', comment='编号')
name = Column('NAME', String(128), default='', comment='材料名称')

3
web/commons/models/steel_plate.py
View File

@@ -1,10 +1,11 @@
from sqlalchemy import Column, Integer, String, Numeric, Date, UniqueConstraint, func
from commons.models.mixin.steel import SteelMixin
from commons.models.model import Model
from core.extensions import db
class SteelPlate(db.Model, SteelMixin):
class SteelPlate(db.Model, Model, SteelMixin):
__tablename__ = 'STEEL_PLATE'
id = Column('ID', Integer, primary_key=True)
name = Column('NAME', String(128), default='', comment='名称')

3
web/commons/models/steel_rebar.py
View File

@@ -4,10 +4,11 @@ from sqlalchemy import Column, Integer, String, Numeric, Date, UniqueConstraint,
from calculators import Helper
from commons.models.mixin.steel import SteelMixin
from commons.models.model import Model
from core.extensions import db
class SteelRebar(db.Model, SteelMixin):
class SteelRebar(db.Model, Model, SteelMixin):
__tablename__ = 'STEEL_REBAR'
id = Column('ID', Integer, primary_key=True)
name = Column('NAME', String(128), default='', comment='名称')

3
web/commons/models/steel_section.py
View File

@@ -1,10 +1,11 @@
from sqlalchemy import Column, Integer, String, Numeric, Date, UniqueConstraint, func
from commons.models.mixin.steel import SteelMixin
from commons.models.model import Model
from core.extensions import db
class SteelSection(db.Model, SteelMixin):
class SteelSection(db.Model, Model, SteelMixin):
__tablename__ = 'STEEL_SECTION'
id = Column('ID', Integer, primary_key=True)
name = Column('NAME', String(128), default='', comment='名称')

3
web/commons/models/steel_strand.py
View File

@@ -1,10 +1,11 @@
from sqlalchemy import Column, Integer, String, Numeric, Date, UniqueConstraint, func
from commons.models.mixin.steel import SteelMixin
from commons.models.model import Model
from core.extensions import db
class SteelStrand(db.Model, SteelMixin):
class SteelStrand(db.Model, Model, SteelMixin):
__tablename__ = 'STEEL_STRAND'
id = Column('ID', Integer, primary_key=True)
name = Column('NAME', String(128), default='', comment='名称')