lite整合出库修改

Gene_point_Service/.idea/workspace.xml

@@ -5,6 +5,7 @@
       <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/conf/app.conf" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/conf/app.conf" 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" />
@@ -21,8 +22,8 @@
       <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="237">
-              <caret line="24" column="30" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="30" />
+            <state relative-caret-position="766">
+              <caret line="142" column="20" selection-start-line="142" selection-start-column="20" selection-end-line="142" selection-end-column="20" />
               <folding>
                 <element signature="e#14#255#0" expanded="true" />
               </folding>
@@ -30,29 +31,11 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/conf/app.conf">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="207">
-              <caret line="12" column="5" selection-start-line="12" selection-end-line="12" selection-end-column="44" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/../../common/base_dashoo_common/src/dashoo.cn/utils/dbEngine.go">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="125">
-              <caret line="31" column="5" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
-            </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="195">
-              <caret line="43" column="32" selection-start-line="43" selection-start-column="32" selection-end-line="43" selection-end-column="32" />
+            <state relative-caret-position="-23">
+              <caret line="137" column="30" selection-start-line="137" selection-start-column="30" selection-end-line="137" selection-end-column="30" />
               <folding>
                 <element signature="e#18#194#0" expanded="true" />
               </folding>
@@ -60,11 +43,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/business/converseService/converseService.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="201">
-              <caret line="698" column="29" selection-start-line="698" selection-start-column="29" selection-end-line="698" selection-end-column="29" />
+            <state relative-caret-position="111">
+              <caret line="476" column="57" lean-forward="true" selection-start-line="476" selection-start-column="57" selection-end-line="476" selection-end-column="57" />
               <folding>
                 <element signature="e#25#163#0" expanded="true" />
               </folding>
@@ -72,11 +55,20 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/../../common/base_dashoo_common/src/dashoo.cn/utils/db/serviceBase.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-2012">
+              <caret line="84" column="22" selection-start-line="84" selection-start-column="22" selection-end-line="84" selection-end-column="22" />
+            </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="368">
-              <caret line="18" column="6" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
+            <state relative-caret-position="-11">
+              <caret line="48" column="38" lean-forward="true" selection-start-line="48" selection-start-column="38" selection-end-line="48" selection-end-column="38" />
             </state>
           </provider>
         </entry>
@@ -85,8 +77,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>TransPositionToNo</find>
-      <find>rack_id</find>
       <find>println</find>
       <find>DeleteEntityBytbl</find>
       <find>GROUP</find>
@@ -115,6 +105,8 @@
       <find>retre</find>
       <find>gpServiceUrl</find>
       <find>Cfg</find>
+      <find>getAllSampleIdsFromResEntity</find>
+      <find>sampleCKSuccessDBModify</find>
     </findStrings>
   </component>
   <component name="GOROOT" path="D:\Development\GO" />
@@ -140,17 +132,18 @@
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/controllers/base.go" />
         <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/conf/app.conf" />
+        <option value="$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go" />
+        <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
-    <option name="x" value="2335" />
-    <option name="width" value="1292" />
-    <option name="height" value="688" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="1912" />
+    <option name="y" value="-8" />
+    <option name="width" value="2576" />
+    <option name="height" value="1056" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -217,14 +210,29 @@
               <item name="api" type="462c0819:PsiDirectoryNode" />
               <item name="controllers" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="Gene_point_Service" type="b2602c69:ProjectViewProjectNode" />
+              <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="controllers" type="462c0819:PsiDirectoryNode" />
+              <item name="converse" 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" />
@@ -306,16 +314,15 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="1912" y="-8" width="2576" height="1056" extended-state="6" />
-    <editor active="true" />
+    <frame x="1912" y="-8" width="2576" height="1056" extended-state="7" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.13632813" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.13908873" />
       <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.0" />
       <window_info anchor="bottom" id="Run" order="2" weight="0.6182432" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" visible="true" weight="0.22522523" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" visible="true" weight="0.49702734" />
       <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" />
@@ -553,13 +560,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://D:/Development/GO/src/runtime/panic.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="334">
-          <caret line="696" column="9" selection-start-line="696" selection-start-column="9" selection-end-line="698" selection-end-column="48" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/../../base_go/src/github.com/robfig/cron/cron.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1748">
@@ -640,89 +640,96 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../common/base_dashoo_common/src/dashoo.cn/utils/db/serviceBase.go">
+    <entry file="file://$PROJECT_DIR$/../../common/base_dashoo_common/src/dashoo.cn/utils/utils.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="84" column="22" selection-start-line="84" selection-start-column="22" selection-end-line="84" selection-end-column="22" />
+        <state relative-caret-position="50">
+          <caret line="47" column="38" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
+    <entry file="file://$PROJECT_DIR$/../../base_go/src/github.com/Unknwon/goconfig/read.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="368">
-          <caret line="18" column="6" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
+        <state relative-caret-position="-132">
+          <caret line="218" column="5" selection-start-line="218" selection-start-column="5" selection-end-line="218" selection-end-column="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../common/base_dashoo_common/src/dashoo.cn/utils/utils.go">
+    <entry file="file://$PROJECT_DIR$/../../base_go/src/github.com/Unknwon/goconfig/conf.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="50">
-          <caret line="47" column="38" selection-start-line="47" selection-start-column="24" selection-end-line="47" selection-end-column="38" />
+        <state relative-caret-position="211">
+          <caret line="257" column="21" selection-start-line="257" selection-start-column="21" selection-end-line="257" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../base_go/src/github.com/Unknwon/goconfig/read.go">
+    <entry file="file://$PROJECT_DIR$/../../base_go/src/github.com/gorilla/websocket/client.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-132">
-          <caret line="218" column="5" selection-start-line="218" selection-start-column="5" selection-end-line="218" selection-end-column="5" />
+        <state relative-caret-position="410">
+          <caret line="104" column="17" selection-start-line="104" selection-start-column="17" selection-end-line="104" selection-end-column="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/../../common/base_dashoo_common/src/dashoo.cn/utils/dbEngine.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="31" column="5" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
+        <state relative-caret-position="263">
+          <caret line="37" column="17" lean-forward="true" selection-start-line="36" selection-start-column="18" selection-end-line="37" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go">
+    <entry file="file://D:/Development/GO/src/runtime/panic.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="201">
-          <caret line="698" column="29" selection-start-line="698" selection-start-column="29" selection-end-line="698" selection-end-column="29" />
-          <folding>
-            <element signature="e#25#163#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="36">
+          <caret line="689" selection-start-line="689" selection-end-line="689" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
+    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/conf/app.conf">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="195">
-          <caret line="43" column="32" selection-start-line="43" selection-start-column="32" selection-end-line="43" selection-end-column="32" />
+        <state relative-caret-position="-69">
+          <caret column="26" selection-start-column="26" selection-end-column="26" />
+        </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="766">
+          <caret line="142" column="20" selection-start-line="142" selection-start-column="20" selection-end-line="142" selection-end-column="20" />
           <folding>
-            <element signature="e#18#194#0" expanded="true" />
+            <element signature="e#14#255#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../base_go/src/github.com/Unknwon/goconfig/conf.go">
+    <entry file="file://$PROJECT_DIR$/../../common/base_dashoo_common/src/dashoo.cn/utils/db/serviceBase.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="211">
-          <caret line="257" column="21" selection-start-line="257" selection-start-column="21" selection-end-line="257" selection-end-column="21" />
+        <state relative-caret-position="-2012">
+          <caret line="84" column="22" selection-start-line="84" selection-start-column="22" selection-end-line="84" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/../../base_go/src/github.com/gorilla/websocket/client.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="410">
-          <caret line="104" column="17" selection-start-line="104" selection-start-column="17" selection-end-line="104" selection-end-column="17" />
+        <state relative-caret-position="-11">
+          <caret line="48" column="38" lean-forward="true" selection-start-line="48" selection-start-column="38" selection-end-line="48" selection-end-column="38" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.go">
+    <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="237">
-          <caret line="24" column="30" selection-start-line="24" selection-start-column="30" selection-end-line="24" selection-end-column="30" />
+        <state relative-caret-position="-23">
+          <caret line="137" column="30" selection-start-line="137" selection-start-column="30" selection-end-line="137" selection-end-column="30" />
           <folding>
-            <element signature="e#14#255#0" expanded="true" />
+            <element signature="e#18#194#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/conf/app.conf">
+    <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="207">
-          <caret line="12" column="5" selection-start-line="12" selection-end-line="12" selection-end-column="44" />
+        <state relative-caret-position="111">
+          <caret line="476" column="57" lean-forward="true" selection-start-line="476" selection-start-column="57" selection-end-line="476" selection-end-column="57" />
+          <folding>
+            <element signature="e#25#163#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

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

@@ -29,8 +29,8 @@ const TABLE_APPLY_DETAIL = "bank_apply_detail"
 const STATUS_LOCKED = "1"
 const STATUS_UNLOCK = "0"
 const RK_PASS = "2"
-const CK_PASS_ONHOLD = "3"
-const CK_PASS_DONE = "4"
+const CK_PASS_ONHOLD = "3"	//保留位置
+const CK_PASS_DONE = "4"	//已归档
 
 
 
@@ -503,7 +503,7 @@ func (this *ConverseService) sampleCKSuccessDBModify (idsStr string, parentId in
 	}
 
 	sql := "UPDATE " + TABLE_SAMPLE + " SET istate = '" + CK_PASS_ONHOLD + "', islocked = '" + STATUS_UNLOCK + "' WHERE barcode IN ('" + strings.Join(onHold,"','") + "')"
-	sql2 := "UPDATE " + TABLE_SAMPLE + " SET istate = '" + CK_PASS_DONE + "', islocked = '" + STATUS_UNLOCK + "' WHERE barcode IN ('" + strings.Join(done,"','") + "')"
+	sql2 := "UPDATE " + TABLE_SAMPLE + " SET istate = '" + CK_PASS_DONE + "', islocked = '" + STATUS_UNLOCK + "', equipmentid = '0', shelfid = '0',boxid= '0', position = '', positioninfo = '' WHERE barcode IN ('" + strings.Join(done,"','") + "')"
 	sql3 := "UPDATE " + TABLE_APPLY_DETAIL + " SET IsLocked = '" + STATUS_UNLOCK + "', taskstatus = '" + strconv.Itoa(SUCCESS) + "' WHERE barcode IN (" + idsStr + ")" + " AND parentid = '" + strconv.Itoa(parentId) + "'"
 	_,err = this.DBE.Exec(sql)
 	_,err = this.DBE.Exec(sql2)
@@ -528,9 +528,13 @@ func (this *ConverseService) ModifySampleStatusByApplyMainInfo(entryNo string, r
 		taskType = "tube_storing"
 		operaIds,abnormalIds = this.getOperaSampleIdsStr(applyMain.ApplyType,applyMain.Id,resp,entity)
 	}else if applyMain.ApplyType == TASK_TUBE_RETREIVING && strings.Contains(resp,"_storing") {
+		//lite设备 部分管子出库
 		taskType = "tube_retrieving"
-		//todo
 		operaIds,abnormalIds = this.getOperaSampleIdsStr(applyMain.ApplyType,applyMain.Id,resp,entity)
+	}else if applyMain.ApplyType == TASK_TUBE_RETREIVING && resp == "rack_retrieving" && entity.Data.Is_end {
+		//lite设备 整盒出库
+		taskType = "tube_retrieving"
+		operaIds,abnormalIds = this.getAllSampleIdsFromResEntity(entity)
 	}else {
 		return
 	}
@@ -614,6 +618,21 @@ func (this *ConverseService) getOperaSampleIdsStr(applyType, parentId int, resp
 	return
 }
 
+
+//当任务为rack_retrieving 且 end 时, 获取所有样本Ids
+func (this *ConverseService) getAllSampleIdsFromResEntity( entity ResponseEntity)  (actualIds string, abnormalIds string){
+	//获取反馈报文中的所有成功样本Id列表
+	var actualTubeIds []string
+	for _, single := range entity.Data.Actual_data {
+		for _, tube := range single.Tubes {
+			actualTubeIds = append(actualTubeIds,tube.Id)
+		}
+	}
+	actualIds = "'" + strings.Join(actualTubeIds,"','") + "'"
+	abnormalIds = ""
+	return
+}
+
 ////样本状态修改
 //func (this *ConverseService)SampleStatusModify(statusCode int , res ResponseEntity){
 //	if statusCode == SUCCESS {

Gene_point_Service/src/dashoo.cn/api/conf/app.conf

@@ -1,4 +1,4 @@
-appname = dqm_api
+appname = genepoint_sevice
 httpport = 9635
 runmode = dev
 #runmode = prod
@@ -11,6 +11,7 @@ apiurl=http://121.42.244.228:10015/v1
 dataapiurl=http://121.42.244.228:18010/v1
 orderurl=http://uid.labsop.cn:8182/worker/2
 gpServiceUrl=ws://39.105.83.226:22225/socket
+#gpServiceUrl=ws://270100d53m.wicp.vip:46538/socket
 
 [db]
 type=mysql
@@ -39,11 +40,11 @@ user=dqmnt_user
 pwd=Y6Ba64w1Hezo
 domain=dqm
 
-[workflow]
-callbackHost=http://36dcae10.ngrok.io
-OriginUrl=http://39.98.34.197:8082/acti-api/api
-AposeUrl=http://39.98.34.197:8082/acti-api/api/apose
-BaseUrl=http://39.98.34.197:8082/acti-api/api/acti
+#[workflow]
+#callbackHost=http://36dcae10.ngrok.io
+#OriginUrl=http://39.98.34.197:8082/acti-api/api
+#AposeUrl=http://39.98.34.197:8082/acti-api/api/apose
+#BaseUrl=http://39.98.34.197:8082/acti-api/api/acti
 #OriginUrl=http://192.168.0.166:8081/api
 #AposeUrl=http://192.168.0.166:8081/api/apose
 #BaseUrl=http://192.168.0.166:8081/api/acti

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

@@ -150,7 +150,11 @@ func (this *ConverseController) HandleMessage(n int, message []byte){
 			//this.SamplePartsStatusModify(res)
 		}else if taskType == "task_activate" {
 			log.Println(">>>>>>>>>>修改激活状态>>>>>>>>>>")
-			err = this.StatusModify(ACTIVE,taskId)
+			if res.Data.Status == 3 {
+				err = this.StatusModify(REJECT,taskId)
+			}else {
+				err = this.StatusModify(ACTIVE,taskId)
+			}
 		}else if taskType == "accept" {
 			log.Println(">>>>>>>>>>修改接受状态>>>>>>>>>>")
 			err = this.StatusModify(ACCEPT,taskId)

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

@@ -21,8 +21,8 @@ import (
 //const gpServiceUrl = "ws://fdgfghfg.oicp.net:48681/socket"
 //const gpServiceUrl = "ws://fdgfghfg.oicp.net:23248/socket"
 //var gpServiceUrl = "ws://270100d53m.wicp.vip:46538/socket"
-var gpServiceUrl string
 //var gpServiceUrl = "ws://39.105.83.226:22225/socket"
+var gpServiceUrl string
 
 //var conn *websocket.Conn
 var err error