Browse Source

appInfo image

chenjunkai 5 năm trước cách đây
mục cha
commit
586bbfea27
4 tập tin đã thay đổi với 15 bổ sung35 xóa
  1. 0 2
      Ansjer/test/kbt.py
  2. 4 2
      Ansjer/urls.py
  3. 4 3
      Controller/AppInfo.py
  4. 7 28
      Controller/SysManage.py

+ 0 - 2
Ansjer/test/kbt.py

@@ -1,2 +0,0 @@
-for i in range(10):
-    print(i)

+ 4 - 2
Ansjer/urls.py

@@ -2,9 +2,10 @@ from django.conf.urls import url
 from django.urls import path, re_path
 
 from Controller import FeedBack, EquipmentOTA, EquipmentInfo, EquipmentSensor, StreamMedia, AdminManage, AppInfo, \
-    AccessLog, DynamoDBLog , Test, MealManage, DeviceManage, EquipmentStatus, SysManage, DeviceLog, LogAccess, AppColophon, \
+    AccessLog, DynamoDBLog, Test, MealManage, DeviceManage, EquipmentStatus, SysManage, DeviceLog, LogAccess, \
+    AppColophon, \
     EquipmentManager, LogManager, PermissionManager, OTAEquipment, shareUserPermission, UidSetController, \
-    UserManger, CheckUserData,\
+    UserManger, CheckUserData, \
     UserController, CloudVod, OrderContrller, VodBucket, DetectController, DeviceShare, UserBrandController, \
     StsOssController, UIDPreview, SysMsg
 
@@ -143,6 +144,7 @@ urlpatterns = [
     url(r'^feedback/(?P<operation>.*)$', FeedBack.FeedBackView.as_view()),
     url(r'^uidpreview/(?P<operation>.*)$', UIDPreview.UIDPreview.as_view()),
     url(r'^sysmsg/(?P<operation>.*)$', SysMsg.SysMsgView.as_view()),
+    url(r'^sysfile/(?P<filePath>.*)$', SysManage.getStatView.as_view()),
 
     url(r'^equipment/flowUpdate', EquipmentManager.update_uid_set),
 

+ 4 - 3
Controller/AppInfo.py

@@ -172,9 +172,10 @@ class AppInfo(View):
             count = queryset.count()
             res = queryset[(page - 1) * line:page * line]
             send_json = CommonService.qs_to_dict(res)
-            # for k, v in enumerate(send_json["datas"]):
-                # img = 'http://www.dvema.com/appInfo/img/' + send_json['datas'][k]['img']
-                # send_json["datas"][k]['img'] = img
+            for k, v in enumerate(send_json["datas"]):
+                if send_json['datas'][k]['img']:
+                    img = SERVER_DOMAIN + 'sysfile/' + send_json['datas'][k]['img']
+                    send_json["datas"][k]['img'] = img
             send_json['count'] = count
             return response.json(0, send_json)
         return response.json(0)

+ 7 - 28
Controller/SysManage.py

@@ -11,27 +11,16 @@
 @file: SysManage.py
 @Contact: chanjunkai@163.com
 """
-from django.views.decorators.csrf import csrf_exempt
-from Service.CommonService import CommonService
-from Service.ModelService import ModelService
-from Ansjer.config import BASE_DIR
-from Object.ResponseObject import ResponseObject
-from Object.TokenObject import TokenObject
-import os
-import time
-import traceback
 import os
-from django.shortcuts import render_to_response
-from django.utils.decorators import method_decorator
+
+from django.http import HttpResponse
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
 
-from Model.models import App_Info, App_Colophon
+from Ansjer.config import BASE_DIR
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-from Service.CommonService import CommonService
 from Service.ModelService import ModelService
-from Ansjer.config import BASE_DIR, SERVER_DOMAIN
 
 
 @csrf_exempt
@@ -85,23 +74,13 @@ class getStatView(View):
             pass
         else:
             return response.json(800)
-        fullPath = os.path.join(BASE_DIR, "static", filePath).replace('\\', '/')
-        defaultPath = os.path.join(BASE_DIR, "static", "User/default.png").replace('\\', '/')
+        fullPath = os.path.join(BASE_DIR,filePath).replace('\\', '/')
+        from var_dump import var_dump
+        var_dump(fullPath)
         if os.path.isfile(fullPath):
             try:
                 Imagedata = open(fullPath, 'rb').read()
             except Exception as e:
                 return response.json(906, repr(e))
             else:
-                return HttpResponse(Imagedata, content_type="image/jpeg")
-        else:
-            print('----------------')
-            print(defaultPath)
-            print('----------------')
-            try:
-                Imagedata = open(defaultPath, 'rb').read()
-            except Exception as e:
-                return response.json(906, repr(e))
-            else:
-                return HttpResponse(Imagedata, content_type="image/jpeg")
-            # return response.json(907)
+                return HttpResponse(Imagedata, content_type="image/jpeg")