account/admin.py

@@ -10,7 +10,7 @@ from equipment.models import IsolationPointInfo

                 
              

                 
              

                 class UserInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('user_id', 'unionid', 'openid', 'openid_miniapp', 'name', 'sex', 'nickname', 'avatar', 'phone', 'country', 'province', 'city', 'user_status', 'updated_at', 'created_at')
              

                +    list_display = ('user_id', 'unionid', 'openid', 'openid_miniapp', 'name', 'sex', 'nickname', 'avatar', 'phone', 'country', 'province', 'city', 'user_status', 'created_at', 'updated_at')
              

                 
              

                 
              

                 class AdministratorInfoAdmin(admin.ModelAdmin):
              

commands/management/commands/mqtt.py

@@ -34,11 +34,18 @@ def connect_mqtt():

                             print('Connected to MQTT Broker')
              

                         else:
              

                             print('Failed to connect, return code %d\n', rc)
              

                +
              

                +    def on_disconnect(client, userdata, rc):
              

                +        if rc != 0:
              

                +            print("Unexpected MQTT disconnection. Will auto-reconnect")
              

                +
              

                     # Set Connecting Client ID
              

                     print(f'Connected to MQTT Broker by client_id `{client_id}`')
              

                -    client = mqtt_client.Client(client_id)
              

                +    # https://github.com/eclipse/paho.mqtt.python/issues/573
              

                +    client = mqtt_client.Client(client_id, clean_session=False)
              

                     client.username_pw_set(username, password=password)
              

                     client.on_connect = on_connect
              

                +    client.on_disconnect = on_disconnect
              

                     client.connect(broker, port)
              

                     return client
              

                 
              

equipment/admin.py

@@ -8,24 +8,24 @@ from equipment.models import (IsolationPointFieldPoolInfo, IsolationPointInfo, I

                 
              

                 
              

                 class IsolationPointFieldPoolInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('field_type', 'field_key', 'field_name', 'field_options', 'status', 'updated_at', 'created_at')
              

                +    list_display = ('field_type', 'field_key', 'field_name', 'field_options', 'status', 'created_at', 'updated_at')
              

                 
              

                 
              

                 class IsolationPointInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('point_id', 'point_name', 'point_fields', 'limit_scene_qrcode_url', 'status', 'updated_at', 'created_at')
              

                +    list_display = ('point_id', 'point_name', 'point_fields', 'limit_scene_qrcode_url', 'status', 'created_at', 'updated_at')
              

                 
              

                 
              

                 class IsolationPointUserInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('point_id', 'user_id', 'fields', 'observed_days', 'chg_sta', 'temperature', 'last_submit_at', 'leave_at', 'status', 'updated_at', 'created_at')
              

                +    list_display = ('point_id', 'user_id', 'fields', 'observed_days', 'chg_sta', 'temperature', 'last_submit_at', 'leave_at', 'status', 'created_at', 'updated_at')
              

                 
              

                 
              

                 class ThermometerEquipmentInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin):
              

                -    list_display = ('eqpt_id', 'point_id', 'macid', 'sn', 'active_status', 'active_at', 'ipui_pk', 'status', 'updated_at', 'created_at')
              

                +    list_display = ('eqpt_id', 'point_id', 'macid', 'sn', 'active_status', 'active_at', 'ipui_pk', 'status', 'created_at', 'updated_at')
              

                     list_filter = ('point_id', 'status')
              

                 
              

                 
              

                 class ThermometerMeasureLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin):
              

                -    list_display = ('point_id', 'macid', 'sn', 'start_stamp', 'end_stamp', 'temperature_src', 'temperature', 'chg_sta', 'ignore_temperature', 'ignore_fever_temperature', 'status', 'updated_at', 'created_at')
              

                +    list_display = ('point_id', 'macid', 'sn', 'start_stamp', 'end_stamp', 'temperature_src', 'temperature', 'chg_sta', 'ignore_temperature', 'ignore_fever_temperature', 'status', 'created_at', 'updated_at')
              

                     list_filter = ('point_id', 'temperature_src', 'chg_sta', 'ignore_temperature', 'ignore_fever_temperature', 'status')