fix: 先调整asm以启动服务
This commit is contained in:
parent
01615b4b27
commit
3dcb26f14a
|
|
@ -2,7 +2,6 @@ from apps.utils.models import CommonADModel, CommonBDModel
|
||||||
from django.db import models
|
from django.db import models
|
||||||
|
|
||||||
class AssetAudit(CommonBDModel):
|
class AssetAudit(CommonBDModel):
|
||||||
org = models.
|
|
||||||
asset_data = models.JSONField(verbose_name='资产信息', blank=True, null=True)
|
asset_data = models.JSONField(verbose_name='资产信息', blank=True, null=True)
|
||||||
ticket = models.OneToOneField('wf.ticket', verbose_name='关联工单',
|
ticket = models.OneToOneField('wf.ticket', verbose_name='关联工单',
|
||||||
on_delete=models.SET_NULL, related_name='asset_ticket', null=True, blank=True, db_constraint=False)
|
on_delete=models.SET_NULL, related_name='asset_ticket', null=True, blank=True, db_constraint=False)
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
from apps.asm.models import Asset, AssetLog
|
from apps.asm.models import Asset, AssetAudit
|
||||||
from apps.utils.serializers import CustomModelSerializer
|
from apps.utils.serializers import CustomModelSerializer
|
||||||
from apps.utils.constants import EXCLUDE_FIELDS_DEPT
|
from apps.utils.constants import EXCLUDE_FIELDS_DEPT
|
||||||
|
|
||||||
|
|
@ -11,6 +11,6 @@ class AssetSerializer(CustomModelSerializer):
|
||||||
|
|
||||||
class AssetlogSerializer(CustomModelSerializer):
|
class AssetlogSerializer(CustomModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = AssetLog
|
model = AssetAudit
|
||||||
fields = '__all__'
|
fields = '__all__'
|
||||||
read_only_fields = EXCLUDE_FIELDS_DEPT
|
read_only_fields = EXCLUDE_FIELDS_DEPT
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
from django.urls import path, include
|
from django.urls import path, include
|
||||||
from rest_framework.routers import DefaultRouter
|
from rest_framework.routers import DefaultRouter
|
||||||
from apps.asm.views import AssetViewSet, AssetLogViewSet
|
from apps.asm.views import AssetViewSet, AssetAuditViewSet
|
||||||
|
|
||||||
API_BASE_URL = 'api/asm/'
|
API_BASE_URL = 'api/asm/'
|
||||||
|
|
||||||
router = DefaultRouter()
|
router = DefaultRouter()
|
||||||
router.register('asset', AssetViewSet, basename='asset')
|
router.register('asset', AssetViewSet, basename='asset')
|
||||||
router.register('assetlog', AssetLogViewSet, basename='assetlog')
|
router.register('assetlog', AssetAuditViewSet, basename='assetlog')
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path(API_BASE_URL, include(router.urls)),
|
path(API_BASE_URL, include(router.urls)),
|
||||||
]
|
]
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
from apps.wf.mixins import TicketMixin
|
from apps.wf.mixins import TicketMixin
|
||||||
from apps.utils.viewsets import CustomModelViewSet
|
from apps.utils.viewsets import CustomModelViewSet
|
||||||
from apps.asm.models import Asset, AssetLog
|
from apps.asm.models import Asset
|
||||||
from rest_framework.exceptions import ParseError
|
from rest_framework.exceptions import ParseError
|
||||||
from apps.asm.serializers import AssetSerializer, AssetlogSerializer
|
from apps.asm.serializers import AssetSerializer, AssetlogSerializer
|
||||||
from apps.wf.models import Ticket
|
from apps.wf.models import Ticket
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue