From 8b19556affc556e99ae6d526fa2cebf3d8972101 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Fri, 17 Mar 2023 17:42:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=9B=B8=E5=85=B3=E6=96=B9=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E5=8E=82=E4=BA=BA=E5=91=98=E6=B7=BB=E5=8A=A0=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E7=AD=89=E5=8A=9F=E8=83=BD-=E5=BE=85=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ecm/tasks.py       | 17 +++++++++++++++++
 apps/rpm/serializers.py | 12 ++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/apps/ecm/tasks.py b/apps/ecm/tasks.py
index f596fa47..aee6c02f 100644
--- a/apps/ecm/tasks.py
+++ b/apps/ecm/tasks.py
@@ -19,6 +19,7 @@ import time
 from django.core.cache import cache
 from django.conf import settings
 from apps.utils.tasks import CustomTask
+from apps.ecm.models import AlgoChannel
 from datetime import timedelta
 
 
@@ -118,6 +119,22 @@ def opl_task(vc_codes: list, opl_id: str):
     opl.mtask_uid = None
     opl.save()
 
+@shared_task(base=CustomTask)
+def monitor_check():
+    """监控 监控任务的执行
+    """
+    acs = AlgoChannel.objects.filter(always_on=True)
+    for i in acs:
+        td = i.vchannel
+        if td.mtask_uid:
+            pass
+        else:
+            pass
+
+@shared_task(base=CustomTask)
+def loop_and_analyse(vchannel_code: str):
+    td = TDevice.objects.filter(code=vchannel_code).first()
+    pass
 
 @shared_task(base=CustomTask)
 def monitor_and_analyse(vchannel_code: str, algo_codes: list):
diff --git a/apps/rpm/serializers.py b/apps/rpm/serializers.py
index f13862f9..da5a85f9 100644
--- a/apps/rpm/serializers.py
+++ b/apps/rpm/serializers.py
@@ -211,8 +211,8 @@ class RpjmemberCreateSerializer(CustomModelSerializer):
 
     def create(self, validated_data):
         rpj = validated_data['rpj']
-        if rpj.state != Rpj.RPJ_CREATE:
-            raise ParseError('成员非创建状态不可新增')
+        if rpj.state in [Rpj.RPJ_DONE, Rpj.RPJ_CLOSE]:
+            raise ParseError('成员该项目状态不可新增')
         rcertificates = validated_data.pop('rcertificates')
         remployee = validated_data['remployee']
         if remployee.phone and remployee.photo and remployee.id_number:
@@ -238,6 +238,8 @@ class RpjmemberCreateSerializer(CustomModelSerializer):
                 rpjc.save()
             if ins.is_manager:
                 Rpjmember.objects.exclude(id=ins.id).update(is_manager=False)
+            if rpj.state in [Rpj.RPJ_ENTER, Rpj.RPJ_WORKING]: # 如果是待入厂后添加的
+                pass
         return ins
 
 
@@ -250,8 +252,8 @@ class RpjmemberUpdateSerializer(CustomModelSerializer):
 
     def update(self, instance, validated_data):
         rpj = validated_data['rpj']
-        if rpj.state != Rpj.RPJ_CREATE:
-            raise ParseError('成员非创建状态不可修改')
+        if rpj.state in [Rpj.RPJ_DONE, Rpj.RPJ_CLOSE]:
+            raise ParseError('成员该项目状态不可修改')
         rcertificates = validated_data.pop('rcertificates')
         with transaction.atomic():
             ins = super().update(instance, validated_data)
@@ -269,6 +271,8 @@ class RpjmemberUpdateSerializer(CustomModelSerializer):
                 rpjc.save()
             if ins.is_manager:
                 Rpjmember.objects.exclude(id=ins.id).update(is_manager=False)
+            if rpj.state in [Rpj.RPJ_ENTER, Rpj.RPJ_WORKING]: # 如果是待入厂后更改的
+                pass
         return ins