modifiy

Gene_point_Service/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

Gene_point_Service/.idea/workspace.xml

@@ -1,7 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="83c812bd-fdcd-4344-b866-5ecaac02b490" name="Default Changelist" comment="" />
+    <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/business/converseService/converseService.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" 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>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -13,11 +18,41 @@
   </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="4">
-              <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
+            <state relative-caret-position="276">
+              <caret line="42" column="38" selection-start-line="42" selection-start-column="38" selection-end-line="42" selection-end-column="38" />
+              <folding>
+                <element signature="e#14#173#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="391">
+              <caret line="38" column="19" lean-forward="true" selection-start-line="38" selection-start-column="19" selection-end-line="38" selection-end-column="19" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="2875">
+              <caret line="125" column="16" selection-start-line="125" selection-start-column="16" selection-end-line="125" selection-end-column="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="473">
+              <caret line="197" column="12" lean-forward="true" selection-start-line="197" selection-start-column="12" selection-end-line="197" selection-end-column="12" />
             </state>
           </provider>
         </entry>
@@ -31,10 +66,14 @@
     </findStrings>
   </component>
   <component name="GOROOT" path="D:\Development\GO" />
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
   <component name="GoLibraries">
     <option name="urls">
       <list>
         <option value="file://E:/DASHOO/common/base_dashoo_common" />
+        <option value="file://$PROJECT_DIR$" />
       </list>
     </option>
   </component>
@@ -51,16 +90,17 @@
         <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/controllers/converse/converse.go" />
-        <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/main.go" />
+        <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="1">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="1913" />
     <option name="width" value="2572" />
     <option name="height" value="1047" />
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
@@ -97,43 +137,20 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="dashoo.cn" type="462c0819:PsiDirectoryNode" />
               <item name="api" type="462c0819:PsiDirectoryNode" />
-              <item name="conf" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="Gene_point_Service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-            </path>
-            <path>
-              <item name="Gene_point_Service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="GOPATH &lt;Gene_point_Service&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
-            </path>
-            <path>
-              <item name="Gene_point_Service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="GOPATH &lt;Gene_point_Service&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="Gene_point_Service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="GOPATH &lt;Gene_point_Service&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="Gene_point_Service" type="b2602c69:ProjectViewProjectNode" />
-              <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="GOPATH &lt;Gene_point_Service&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
+              <item name="Gene_point_Service" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="dashoo.cn" type="462c0819:PsiDirectoryNode" />
+              <item name="api" type="462c0819:PsiDirectoryNode" />
+              <item name="business" type="462c0819:PsiDirectoryNode" />
+              <item name="converseService" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="Gene_point_Service" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
-              <item name="GOPATH &lt;Gene_point_Service&gt;" type="20ee2d1f:SyntheticLibraryElementNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="dashoo.cn" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -146,10 +163,10 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="configurable.Global.GOPATH.is.expanded" value="true" />
     <property name="configurable.Module.GOPATH.is.expanded" value="false" />
-    <property name="configurable.Project.GOPATH.is.expanded" value="false" />
+    <property name="configurable.Project.GOPATH.is.expanded" value="true" />
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="go.sdk.automatically.set" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/dashoo.cn/api" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="com.goide.configuration.GoLibrariesConfigurableProvider" />
@@ -185,10 +202,18 @@
     </configuration>
     <configuration name="go build dashoo.cn/api" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
       <module name="Gene_point_Service" />
-      <working_directory value="E:\DASHOO2\Gene_point_Service\src\dashoo.cn\api" />
+      <working_directory value="E:\DASHOO2\genepoint_service\Gene_point_Service\src\dashoo.cn\api" />
       <kind value="DIRECTORY" />
       <filePath value="$PROJECT_DIR$/src/dashoo.cn/api/main.go" />
-      <directory value="E:\DASHOO2\Gene_point_Service\src\dashoo.cn\api" />
+      <directory value="E:\DASHOO2\genepoint_service\Gene_point_Service\src\dashoo.cn\api" />
+      <method v="2" />
+    </configuration>
+    <configuration name="go build dashoo.cn/api" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
+      <module name="Gene_point_Service" />
+      <working_directory value="E:\DASHOO2\genepoint_service\Gene_point_Service\src\dashoo.cn\api" />
+      <kind value="DIRECTORY" />
+      <filePath value="$PROJECT_DIR$/src/dashoo.cn/api/main.go" />
+      <directory value="E:\DASHOO2\genepoint_service\Gene_point_Service\src\dashoo.cn\api" />
       <method v="2" />
     </configuration>
     <list>
@@ -198,6 +223,7 @@
     <recent_temporary>
       <list>
         <item itemvalue="Go Build.go build dashoo.cn/api" />
+        <item itemvalue="Go Build.go build dashoo.cn/api" />
       </list>
     </recent_temporary>
   </component>
@@ -211,22 +237,23 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="1913" y="0" width="2572" height="1047" extended-state="1" />
+    <frame x="1912" y="-8" width="2576" height="1056" extended-state="7" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.14820717" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.15274464" />
       <window_info id="Structure" order="1" sideWeight="0.50233644" side_tool="true" weight="0.14701195" />
       <window_info id="Favorites" order="2" sideWeight="0.50233644" side_tool="true" weight="0.14701195" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.49960256" weight="0.3179669" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.61915886" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" visible="true" weight="0.96378505" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" weight="0.32485548" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" weight="0.32943925" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
-      <window_info anchor="bottom" id="Version Control" order="9" weight="0.3289941" />
-      <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49519232" weight="0.2566168" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.32827103" />
+      <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49519232" weight="0.25549132" />
       <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.5048077" side_tool="true" weight="0.26359338" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -486,55 +513,58 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/conf/auth_model.conf">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://E:/DASHOO/common/base_dashoo_common/src/dashoo.cn/utils/utils.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="117">
-          <caret line="385" column="19" lean-forward="true" selection-start-line="385" selection-start-column="19" selection-end-line="385" selection-end-column="19" />
+        <state relative-caret-position="115">
+          <caret line="28" column="1" lean-forward="true" selection-start-line="28" selection-start-column="1" selection-end-line="28" selection-end-column="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/routers/router.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="754">
-          <caret line="125" column="16" selection-start-line="125" selection-start-column="16" selection-end-line="125" selection-end-column="16" />
+        <state relative-caret-position="437">
+          <caret line="23" column="47" selection-start-line="23" selection-start-column="47" selection-end-line="23" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/conf/auth_model.conf">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/conf/app.conf">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="759">
+        <state relative-caret-position="467">
           <caret line="33" column="15" selection-start-line="33" selection-start-column="15" selection-end-line="33" selection-end-column="15" />
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/DASHOO/common/base_dashoo_common/src/dashoo.cn/utils/utils.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="28" column="1" lean-forward="true" selection-start-line="28" selection-start-column="1" selection-end-line="28" selection-end-column="1" />
+        <state relative-caret-position="276">
+          <caret line="42" column="38" selection-start-line="42" selection-start-column="38" selection-end-line="42" selection-end-column="38" />
+          <folding>
+            <element signature="e#14#173#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/routers/router.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="23" column="47" selection-start-line="23" selection-start-column="47" selection-end-line="23" selection-end-column="47" />
+        <state relative-caret-position="2875">
+          <caret line="125" column="16" selection-start-line="125" selection-start-column="16" selection-end-line="125" selection-end-column="16" />
         </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="532">
-          <caret line="76" column="11" selection-start-line="76" selection-start-column="11" selection-end-line="76" selection-end-column="11" />
+        <state relative-caret-position="391">
+          <caret line="38" column="19" lean-forward="true" selection-start-line="38" selection-start-column="19" selection-end-line="38" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4">
-          <caret line="7" column="8" lean-forward="true" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
+        <state relative-caret-position="473">
+          <caret line="197" column="12" lean-forward="true" selection-start-line="197" selection-start-column="12" selection-end-line="197" selection-end-column="12" />
         </state>
       </provider>
     </entry>

Gene_point_Service/src/dashoo.cn/api/business/converseService/converseService.go

@@ -47,11 +47,11 @@ func (this *ConverseService) GetSessionSetupRequest(utc string) *RequestEntity{
 	return entity
 }
 
-func (this *ConverseService) GetRandomTaskId() string{
-	t := time.Now().Unix()
-	task_id := "TK"+ strconv.FormatInt(t,10)
-	return task_id
-}
+//func (this *ConverseService) GetRandomTaskId() string{
+//	t := time.Now().Unix()
+//	task_id := "TK"+ strconv.FormatInt(t,10)
+//	return task_id
+//}
 
 //生成请求报文
 func (this *ConverseService) GetRequestEntity(request string, utc string, data RequestData) *RequestEntity{
@@ -94,54 +94,54 @@ func (this *ConverseService) CheckStockTubeInfo(cu int, rack_id, tube_id, utc st
 }
 
 
-//冻存盒入库
-func (this *ConverseService) StoreRack(utc string, list []Single) *RequestEntity{
-	var request = "rack_storing"
-	var data RequestData
-	data.Task_id = this.GetRandomTaskId()
-	//data.Task_id = "001Acs5601"
-	data.Type = "begin"
-	data.Task_data = list
-	entity := this.GetRequestEntity(request,utc,data)
-	return entity
-
-}
+////冻存盒入库
+//func (this *ConverseService) StoreRack(utc string, list []Single) *RequestEntity{
+//	var request = "rack_storing"
+//	var data RequestData
+//	data.Task_id = this.GetRandomTaskId()
+//	//data.Task_id = "001Acs5601"
+//	data.Type = "begin"
+//	data.Task_data = list
+//	entity := this.GetRequestEntity(request,utc,data)
+//	return entity
+//
+//}
 
-//冻存盒出库
-func (this *ConverseService) RetrieveRack(utc string, list[]Single) *RequestEntity{
-	var request = "rack_retrieving"
-	var data RequestData
-	data.Type = "begin"
-	data.Task_id = this.GetRandomTaskId()
-	// data.Task_id ="A11050WD054799"
-	data.Task_data = list
-	entity := this.GetRequestEntity(request,utc,data)
-	return entity
-}
+////冻存盒出库
+//func (this *ConverseService) RetrieveRack(utc string, list[]Single) *RequestEntity{
+//	var request = "rack_retrieving"
+//	var data RequestData
+//	data.Type = "begin"
+//	data.Task_id = this.GetRandomTaskId()
+//	// data.Task_id ="A11050WD054799"
+//	data.Task_data = list
+//	entity := this.GetRequestEntity(request,utc,data)
+//	return entity
+//}
 
-//冻存管入库
-func (this *ConverseService) StoreTube(utc string, mode string, list []Single) *RequestEntity{
-	var request = "tube_storing"
-	var data RequestData
-	data.Type = "begin"
-	data.Task_id = this.GetRandomTaskId()
-	//data.Task_id = "QW5982"
-	data.Operation_mode = mode
-	data.Task_data = list
-	entity := this.GetRequestEntity(request,utc,data)
-	return entity
-}
+////冻存管入库
+//func (this *ConverseService) StoreTube(utc string, mode string, list []Single) *RequestEntity{
+//	var request = "tube_storing"
+//	var data RequestData
+//	data.Type = "begin"
+//	data.Task_id = this.GetRandomTaskId()
+//	//data.Task_id = "QW5982"
+//	data.Operation_mode = mode
+//	data.Task_data = list
+//	entity := this.GetRequestEntity(request,utc,data)
+//	return entity
+//}
 
-//冻存管出库
-func (this *ConverseService) RetrieveTube(utc string, single Single) *RequestEntity{
-	var request = "tube_retrieving"
-	var data RequestData
-	data.Type = "begin"
-	data.Task_id = this.GetRandomTaskId()
-	data.Task_data = single
-	entity := this.GetRequestEntity(request,utc, data)
-	return entity
-}
+////冻存管出库
+//func (this *ConverseService) RetrieveTube(utc string, single Single) *RequestEntity{
+//	var request = "tube_retrieving"
+//	var data RequestData
+//	data.Type = "begin"
+//	data.Task_id = this.GetRandomTaskId()
+//	data.Task_data = single
+//	entity := this.GetRequestEntity(request,utc, data)
+//	return entity
+//}
 
 //任务撤销
 func (this *ConverseService) CancelTast(utc string, task_id string) *RequestEntity{
@@ -193,10 +193,10 @@ func TransPositionToNo(boxType int, position string) int{
 	var no int
 	switch boxType {
 	case 101,102,103:
-		no = (x-1)*9+y
+		no = (y-1)*9+x
 		break
 	case 0 :
-		no = (x-1)*10+y
+		no = (y-1)*10+x
 	}
 	return no
 }
@@ -425,7 +425,7 @@ func (this *ConverseService) TaskStatusModify(statusCode int, task_id string)  e
 
 // 修改出入库单状态
 func (this *ConverseService) SampleApplyStatusModify(statusCode int, entryNo string) error{
-	sql := "UPDATE samplesapply SET applystatus = '" + strconv.Itoa(statusCode) + "' WHERE entryno = '" + entryNo + "'"
+	sql := "UPDATE samplesapply SET taskstatus = '" + strconv.Itoa(statusCode) + "' WHERE entryno = '" + entryNo + "'"
 	_,err := this.DBE.Exec(sql)
 	return err
 }

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

@@ -15,10 +15,12 @@ type ConverseController struct {
 	beego.Controller
 }
 
-const SENT = 4
+const UNEXECUTED = 0
+const SENT = 1
+const ACCEPT = 2
+const ACTIVE = 3
+const FAILED = 4
 const SUCCESS = 5
-const FAILED = 6
-const EXECUTING = 7
 
 
 func (this *ConverseController) SearchDatabase() map[string]*converseService.RequestEntity{
@@ -103,7 +105,11 @@ func (this *ConverseController) HandleMessage(n int, message []byte){
 			//todo or link to biobank
 			err = this.StatusModify(SUCCESS,taskId)
 		}else if taskType == "task_ activate" {
-			err = this.StatusModify(EXECUTING,taskId)
+			log.Println(">>>>>>>>>>修改激活状态>>>>>>>>>>")
+			err = this.StatusModify(ACTIVE,taskId)
+		}else if taskType == "accept" {
+			log.Println(">>>>>>>>>>修改接受状态>>>>>>>>>>")
+			err = this.StatusModify(ACCEPT,taskId)
 		}
 	}else if  result != 200 || (isEnd && res.Data.Abnormal_data != nil) {
 		log.Println("---------修改失败状态-----------")

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

@@ -11,7 +11,9 @@ import (
 	"github.com/gorilla/websocket"
 )
 
-const gpServiceUrl = "ws://39.105.83.226:22225/socket"
+//const gpServiceUrl = "ws://39.105.83.226:22225/socket"
+//const gpServiceUrl = "ws://fdgfghfg.oicp.net:48681/socket"
+const gpServiceUrl = "ws://fdgfghfg.oicp.net:23248/socket"
 
 var conn *websocket.Conn
 var err error
@@ -34,7 +36,7 @@ func main() {
 	//发送请求
 	go func(){
 		cron := cron.New()
-		tick := "*/15 * * * * ?"
+		tick := "*/10 * * * * ?"
 		err = cron.AddFunc(tick, func() {
 			//如果已连接则发送任务
 			if conn != nil {
@@ -120,6 +122,8 @@ func main() {
 			return
 		}
 	}
+
+	log.Println("===============Service_down==============")
 	conn.Close()
 }