api/eqpt_views.py

@@ -134,7 +134,7 @@ def eqpt_result(request):

                     ipuis = [ipui.data for ipui in ipuis]
              

                 
              

                     total_active_eqpt_num = eqpts.count()
              

                -    has_upload_temperature_num = len([1 for ipui in ipuis if ipui.get('temperature_has_upload', '') == '已上报'])
              

                +    has_upload_temperature_num = len([1 for ipui in ipuis if ipui.get('temperature_has_upload', '') == IsolationPointUserInfo.HAS_YET_UPLOAD])
              

                     fever_num = len([1 for ipui in ipuis if ipui.get('temperature', 0) > settings.FEVER_TEMPERATURE])
              

                 
              

                     ipuis = {ipui.get('pk'): {
              
@@ -181,7 +181,7 @@ def get_screen_data(point=None, point_id=None):

                     ipuis = [ipui.data for ipui in ipuis]
              

                 
              

                     total_active_eqpt_num = eqpts.count()
              

                -    has_upload_temperature_num = len([1 for ipui in ipuis if ipui.get('temperature_has_upload', '') == '已上报'])
              

                +    has_upload_temperature_num = len([1 for ipui in ipuis if ipui.get('temperature_has_upload', '') == IsolationPointUserInfo.HAS_YET_UPLOAD])
              

                     fever_num = len([1 for ipui in ipuis if ipui.get('temperature', 0) > settings.FEVER_TEMPERATURE])
              

                 
              

                     ipuis = {ipui.get('pk'): {
              
@@ -229,7 +229,7 @@ def get_screen_data(point=None, point_id=None):

                         temperature = eqpt.get('temperature')
              

                         if temperature > settings.FEVER_TEMPERATURE:
              

                             eqpts_fever.append(eqpt)
              

                -        elif has_upload == '未上报' and temperature <= settings.FEVER_TEMPERATURE:
              

                +        elif has_upload == IsolationPointUserInfo.HAS_NOT_UPLOAD and temperature <= settings.FEVER_TEMPERATURE:
              

                             eqpts_not_upload.append(eqpt)
              

                         else:
              

                             eqpts_other.append(eqpt)
              

equipment/models.py

@@ -136,6 +136,9 @@ class IsolationPointInfo(BaseModelMixin):

                 
              

                 
              

                 class IsolationPointUserInfo(BaseModelMixin):
              

                +    HAS_NOT_UPLOAD = '未上报'
              

                +    HAS_YET_UPLOAD = '已上报'
              

                +
              

                     point_id = models.CharField(_('point_id'), max_length=32, blank=True, null=True, help_text='隔离点唯一标识', db_index=True)
              

                 
              

                     user_id = models.CharField(_('user_id'), max_length=32, blank=True, null=True, help_text='用户唯一标识', db_index=True)
              
@@ -166,10 +169,10 @@ class IsolationPointUserInfo(BaseModelMixin):

                     @property
              

                     def temperature_has_upload(self):
              

                         if not self.last_submit_at:
              

                -            return '未上报'
              

                +            return IsolationPointUserInfo.HAS_NOT_UPLOAD
              

                         if self.last_submit_at > tc.utc_datetime(hours=-1):
              

                -            return '已上报'
              

                -        return '未上报'
              

                +            return IsolationPointUserInfo.HAS_YET_UPLOAD
              

                +        return IsolationPointUserInfo.HAS_NOT_UPLOAD
              

                 
              

                     @property
              

                     def data(self):