2022.02.10 回滚前

@@ -11,6 +11,7 @@ from . import task_detail
 from . import task_delete
 from . import task_count
 from . import task_kill
+from . import task_update
 from app.decorators.token_decorator import token_decorator
 
 
@@ -64,3 +65,13 @@ class DataManager(BlueprintApi):
         任务统计
         """
         return task_count.Api().result
+
+
+    @staticmethod
+    @bp.route('/Update', methods=['POST'])
+    @swag_from(task_update.Api.api_doc)
+    def task_update():
+        """
+        任务信息更新
+        """
+        return task_update.Api().result
\ No newline at end of file

+# coding=utf-8
+#author:        4N
+#createtime:    2020/9/4
+#email:         nheweijun@sina.com
+
+from ..models import db,Task,Process
+from app.util.component.ApiTemplate import ApiTemplate
+import datetime
+import json
+import uuid
+class Api(ApiTemplate):
+    api_name = "任务更新"
+    def para_check(self):
+        if not self.para.get("task_guid"):
+            raise Exception("缺乏task_guid参数。")
+
+    def process(self):
+
+        res = {}
+        try:
+            task_guid = self.para.get("task_guid")
+            msg = self.para.get("msg")
+            task:Task = Task.query.filter_by(guid=task_guid)
+            task.update(json.loads(self.para.get("update")))
+
+            if msg:
+                message = "{} {}".format(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), msg)
+                task_process_guid = uuid.uuid1().__str__()
+                task_process = Process(guid=task_process_guid, message=message, time=datetime.datetime.now(),
+                                       task_guid=task_guid)
+                db.session.add(task_process)
+            db.session.commit()
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc={
+    "tags":["任务接口"],
+    "parameters":[
+        {"name": "task_guid",
+         "in": "formData",
+         "type": "string"},
+        {"name": "update",
+         "in": "formData",
+         "type": "string"},
+        {"name": "msg",
+         "in": "formData",
+         "type": "string"},
+
+    ],
+    "responses":{
+        200:{
+            "schema":{
+                "properties":{
+                }
+            }
+            }
+        }
+    }
\ No newline at end of file

@@ -3,7 +3,7 @@
 #createtime:    2021/7/19
 #email:         nheweijun@sina.com
 
-
+import configure
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.StructurePrint import StructurePrint
 from app.models import db
@@ -35,8 +35,7 @@ class Api(ApiTemplate):
                         state=0,
                         task_type=5,
                         creator=self.para.get("creator"),
-                        process="影像创建金字塔中",
-                        task_pid=pyramid_process.pid)
+                        process="影像创建金字塔中")
 
             db.session.add(task)
             db.session.commit()
@@ -62,17 +61,20 @@ class Api(ApiTemplate):
             task_writer.update_process("开始创建...")
 
             url = "{}/API/Service/Image/BuildPyramid".format(para.get("url"))
+
+
+            self.para["from"] = configure.deploy_ip_host
+            self.para["task_guid"] = task_guid
+
             response:requests.Response = requests.post(url,data=self.para)
 
             if not response.json().get("result"):
                 raise Exception("由于{}，影像服务修改失败！".format(response.json().get("msg")))
-
-            task_writer.update_task({"state":1,"update_time":datetime.datetime.now(),"process" : "创建完成"})
-            task_writer.update_process("创建完成！")
-
+            else:
+                task_writer.update_task({"task_pid": int(response.json().get("data"))})
         except Exception as e:
             try:
-                task_writer.update_task({"state": -1,"update_time":datetime.datetime.now(),"process": "下载失败"})
+                task_writer.update_task({"state": -1,"update_time":datetime.datetime.now(),"process": "创建失败"})
                 task_writer.update_process( e.__str__())
                 task_writer.update_process("任务中止！")
             except Exception as ee:

+# coding=utf-8
+#author:        4N
+#createtime:    2021/7/19
+#email:         nheweijun@sina.com
+
+import configure
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.StructurePrint import StructurePrint
+from app.models import db
+from app.modules.data.models import Task
+import multiprocessing
+import uuid
+import datetime
+import requests
+from app.util.component.TaskController import TaskController
+from app.util.component.TaskWriter import TaskWriter
+class Api(ApiTemplate):
+
+    api_name = "创建影像金字塔"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        try:
+            task_guid = uuid.uuid1().__str__()
+
+
+            pyramid_process = multiprocessing.Process(target=self.task, args=(task_guid,self.para))
+            pyramid_process.start()
+
+            task = Task(guid=task_guid,
+                        name="{}构建影像金字塔".format(self.para.get("alias")),
+                        create_time=datetime.datetime.now(),
+                        state=0,
+                        task_type=5,
+                        creator=self.para.get("creator"),
+                        process="影像创建金字塔中",
+                        task_pid=pyramid_process.pid)
+
+            db.session.add(task)
+            db.session.commit()
+
+            res["data"] = "创建影像金字塔任务已提交！"
+            res["result"] = True
+
+        except Exception as e:
+            raise Exception("数据库错误！")
+
+        return res
+
+
+    def task(self,task_guid,para):
+        task_writer = None
+        try:
+
+            #任务控制,等待执行
+            TaskController.wait(task_guid)
+            task_writer = TaskWriter(task_guid)
+
+            task_writer.update_task({"state":2,"update_time":datetime.datetime.now(),"process" : "创建中"})
+            task_writer.update_process("开始创建...")
+
+            url = "{}/API/Service/Image/BuildPyramid".format(para.get("url"))
+
+            # s = requests.session()
+            # s.keep_alive = True
+            # s.post()
+
+            self.para["from"] = configure.deploy_ip_host
+
+            response:requests.Response = requests.post(url,data=self.para)
+
+            if not response.json().get("result"):
+                raise Exception("由于{}，影像服务修改失败！".format(response.json().get("msg")))
+
+            task_writer.update_task({"state":1,"update_time":datetime.datetime.now(),"process" : "创建完成"})
+            task_writer.update_process("创建完成！")
+
+        except Exception as e:
+            try:
+                task_writer.update_task({"state": -1,"update_time":datetime.datetime.now(),"process": "创建失败"})
+                task_writer.update_process(e.__str__())
+                task_writer.update_process("任务中止！")
+            except Exception as ee:
+                StructurePrint().print(ee.__str__())
+            raise e
+        finally:
+            try:
+                task_writer.close()
+            except Exception as e:
+                StructurePrint().print(e.__str__())
+
+
+    api_doc = {
+        "tags": ["影像服务接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string",
+             "description": "guid"},
+            {"name": "url",
+             "in": "formData",
+             "type": "string",
+             "description": "url"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string",
+             "description": "影像alias"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
+

@@ -5,6 +5,7 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.StructurePrint import StructurePrint
 import requests
 from app.util.component.UserCheck import UserCheck
 
@@ -17,15 +18,17 @@ class Api(ApiTemplate):
         res = {}
         try:
 
-            user_req: requests.Response = requests.post("{}/API/Service/Info".format(self.para.get("url")),
+            user_req: requests.Response = requests.post("{}/ImageServer/API/Service/Info".format(self.para.get("url")),
                                                         data={"guid":self.para.get("guid")})
+
             if not user_req.json().get("result"):
                 raise Exception("服务不存在！")
             # 验证权限
             UserCheck.verify(user_req.json().get("data").get("service").get("creator"))
 
-            url = "{}/API/Service/Delete".format(self.para.get("url"))
+            url = "{}/ImageServer/API/Service/Delete".format(self.para.get("url"))
             response:requests.Response = requests.post(url,data=self.para)
+
             if not response.json().get("result"):
                 raise Exception("由于{}，影像地图删除失败！".format(response.json().get("msg")))
             res["result"] = True

@@ -41,7 +41,7 @@ class Api(ApiTemplate):
 
             elif s_type in [ServiceType.image_service.value]:
 
-                edit_url = "{}/API/Service/Info".format(self.para.get("url"))
+                edit_url = "{}/ImageServer/API/Service/Info".format(self.para.get("url"))
                 response:requests.Response = requests.post(edit_url,self.para)
                 if not response.json().get("result"):
                     raise Exception("查询影像地图失败！")