添加状态

Gene_point_Service/.idea/workspace.xml

@@ -2,6 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="83c812bd-fdcd-4344-b866-5ecaac02b490" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/dashoo.cn/api/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/main.go" afterDir="false" />
     </list>
@@ -16,11 +17,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="161">
-              <caret line="16" selection-start-line="16" selection-end-line="16" />
+            <state relative-caret-position="368">
+              <caret line="130" column="19" lean-forward="true" selection-start-line="130" selection-start-column="19" selection-end-line="130" selection-end-column="19" />
               <folding>
                 <element signature="e#14#173#0" expanded="true" />
               </folding>
@@ -28,11 +29,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2139">
-              <caret line="102" column="51" selection-start-line="102" selection-start-column="51" selection-end-line="102" selection-end-column="51" />
+            <state relative-caret-position="322">
+              <caret line="23" column="17" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="17" />
             </state>
           </provider>
         </entry>
@@ -72,8 +73,8 @@
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/routers/router.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" />
-        <option value="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/main.go" />
+        <option value="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" />
       </list>
     </option>
   </component>
@@ -563,22 +564,22 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2139">
-          <caret line="102" column="51" selection-start-line="102" selection-start-column="51" selection-end-line="102" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="161">
-          <caret line="16" selection-start-line="16" selection-end-line="16" />
+        <state relative-caret-position="368">
+          <caret line="130" column="19" lean-forward="true" selection-start-line="130" selection-start-column="19" selection-end-line="130" selection-end-column="19" />
           <folding>
             <element signature="e#14#173#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="322">
+          <caret line="23" column="17" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="17" />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

Gene_point_Service/src/dashoo.cn/api/controllers/converse/converse.go

@@ -21,6 +21,8 @@ const ACCEPT = 2
 const ACTIVE = 3
 const FAILED = 4
 const SUCCESS = 5
+const RUNNING = 6
+const REJECT = 7
 
 
 func (this *ConverseController) SearchDatabase() map[string]*converseService.RequestEntity{
@@ -110,6 +112,12 @@ func (this *ConverseController) HandleMessage(n int, message []byte){
 			log.Println(">>>>>>>>>>修改接受状态>>>>>>>>>>")
 			err = this.StatusModify(ACCEPT,taskId)
 		}
+	}else if result == 300 && taskType == "running"{
+		log.Println(">>>>>>>>>>修改执行中状态>>>>>>>>>>")
+		err = this.StatusModify(RUNNING,taskId)
+	}else if  result == 300 && taskType == "reject"{
+		log.Println(">>>>>>>>>>修改驳回状态>>>>>>>>>>")
+		err = this.StatusModify(REJECT,taskId)
 	}else if  result != 200 || (isEnd && res.Data.Abnormal_data != nil) {
 		log.Println("---------修改失败状态-----------")
 		//处理异常信息

Gene_point_Service/src/dashoo.cn/api/main.go

@@ -83,7 +83,7 @@ func main() {
 			log.Println("服务器连接已断开!")
 			for {
 				select{
-				case <-time.After(time.Second*10):
+				case <-time.After(time.Second*30):
 					conn = WebSocketFound()
 					if conn != nil {
 						defer conn.Close()