位置信息

Gene_point_Service/.idea/workspace.xml

@@ -2,8 +2,10 @@
 <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/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" />
@@ -19,8 +21,8 @@
       <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="427">
-              <caret line="42" column="17" lean-forward="true" selection-start-line="42" selection-start-column="17" selection-end-line="42" selection-end-column="17" />
+            <state relative-caret-position="1186">
+              <caret line="120" column="26" selection-start-line="120" selection-start-column="26" selection-end-line="120" selection-end-column="26" />
               <folding>
                 <element signature="e#18#192#0" expanded="true" />
               </folding>
@@ -29,19 +31,10 @@
         </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="754">
-              <caret line="97" column="19" selection-start-line="97" selection-start-column="19" selection-end-line="97" selection-end-column="19" />
-            </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="289">
-              <caret line="352" column="38" selection-start-line="352" selection-start-column="32" selection-end-line="352" selection-end-column="38" />
+            <state relative-caret-position="1104">
+              <caret line="470" column="51" selection-start-line="470" selection-start-column="51" selection-end-line="470" selection-end-column="51" />
               <folding>
                 <element signature="e#25#144#0" expanded="true" />
               </folding>
@@ -49,11 +42,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/main.go">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="404">
-              <caret line="142" column="32" selection-start-line="142" selection-start-column="32" selection-end-line="142" selection-end-column="32" />
+            <state relative-caret-position="299">
+              <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
               <folding>
                 <element signature="e#14#173#0" expanded="true" />
               </folding>
@@ -72,6 +65,7 @@
       <find>fmt</find>
       <find>println</find>
       <find>DeleteEntityBytbl</find>
+      <find>GROUP</find>
     </findStrings>
   </component>
   <component name="GOROOT" path="D:\Development\GO" />
@@ -98,16 +92,17 @@
         <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/main.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/controllers/converse/converse.go" />
+        <option value="$PROJECT_DIR$/src/dashoo.cn/api/main.go" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1923" />
-    <option name="width" value="2564" />
-    <option name="height" value="1047" />
+    <option name="x" value="1904" />
+    <option name="y" value="-12" />
+    <option name="width" value="1296" />
+    <option name="height" value="709" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -157,6 +152,14 @@
               <item name="business" type="462c0819:PsiDirectoryNode" />
               <item name="converseService" 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="conf" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="Gene_point_Service" type="b2602c69:ProjectViewProjectNode" />
               <item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
@@ -247,15 +250,14 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="1912" y="-8" width="2576" height="1056" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.1618934" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.08512331" />
       <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.61915886" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" weight="0.32716763" />
+      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" visible="true" weight="0.5086705" />
       <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" />
@@ -295,7 +297,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/api/controllers/converse/converse.go" />
     <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService_test.go" />
     <entry file="file://E:/DASHOO/base_go/src/github.com/go-xorm/xorm/session_insert.go">
       <provider selected="true" editor-type-id="text-editor">
@@ -581,31 +582,28 @@
     <entry file="file://D:/Development/GO/src/log/log.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="275">
-          <caret line="306" column="5" selection-start-line="306" selection-start-column="5" selection-end-line="306" selection-end-column="5" />
+          <caret line="300" column="5" selection-start-line="300" selection-start-column="5" selection-end-line="300" selection-end-column="5" />
         </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/converse.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="404">
-          <caret line="142" column="32" selection-start-line="142" selection-start-column="32" selection-end-line="142" selection-end-column="32" />
-          <folding>
-            <element signature="e#14#173#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="92">
+          <caret line="4" column="37" lean-forward="true" selection-start-line="4" selection-start-column="37" selection-end-line="4" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go">
+    <entry file="file://E:/DASHOO/base_go/src/github.com/gorilla/websocket/json.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="754">
-          <caret line="97" column="19" selection-start-line="97" selection-start-column="19" selection-end-line="97" selection-end-column="19" />
+        <state relative-caret-position="164">
+          <caret line="22" column="15" selection-start-line="22" selection-start-column="15" selection-end-line="22" selection-end-column="15" />
         </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="427">
-          <caret line="42" column="17" lean-forward="true" selection-start-line="42" selection-start-column="17" selection-end-line="42" selection-end-column="17" />
+        <state relative-caret-position="1186">
+          <caret line="120" column="26" selection-start-line="120" selection-start-column="26" selection-end-line="120" selection-end-column="26" />
           <folding>
             <element signature="e#18#192#0" expanded="true" />
           </folding>
@@ -614,13 +612,23 @@
     </entry>
     <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="289">
-          <caret line="352" column="38" selection-start-line="352" selection-start-column="32" selection-end-line="352" selection-end-column="38" />
+        <state relative-caret-position="1104">
+          <caret line="470" column="51" selection-start-line="470" selection-start-column="51" selection-end-line="470" selection-end-column="51" />
           <folding>
             <element signature="e#25#144#0" expanded="true" />
           </folding>
         </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="299">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+          <folding>
+            <element signature="e#14#173#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>

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

@@ -2,13 +2,13 @@ package converseService
 
 import (
 	"crypto/md5"
+	. "dashoo.cn/utils/db"
 	"fmt"
 	"github.com/go-xorm/xorm"
 	"log"
 	"strconv"
 	"strings"
 	"time"
-	. "dashoo.cn/utils/db"
 )
 
 const CU = 1
@@ -16,6 +16,8 @@ const EE = 1
 const POS = 1
 const LTU = 1
 const GROUP = 1
+const TABLE_TAST = "sample_storage_task"
+const TABLE_SAMPLE = "samplesapply"
 
 type ConverseService struct {
 	ServiceBase
@@ -240,7 +242,8 @@ func handleRackStore (entity *RequestEntity, detail *Sample_Storage_Task) {
 		one.Target.Unit = detail.Unit
 		one.Target.Pos = detail.Pos
 		one.Target.Ltu = 1
-		one.Target.Group = 1
+		//one.Target.Group = 1
+		one.Target.Group = detail.Group
 		if detail.BarCode != "" {
 			var tube Tube
 			tube.Id = detail.BarCode
@@ -426,7 +429,7 @@ func (this *ConverseService) TransferPosition(one *Sample_Storage_Task) {
 		one.No = (y-1)*one.B_Col + x
 	}
 	one.Ltu = LTU
-	one.Group = GROUP
+	//one.Group = GROUP
 }
 
 //处理任务原始信息
@@ -451,8 +454,15 @@ func (this *ConverseService) AddTaskType(one *Sample_Storage_Task, applyType str
 }
 
 //保存异常信息
-func (this *ConverseService) SaveExcepMsg(tableName, msg,taskId string) error{
-	sql := "UPDATE " + tableName+ " SET exception = '" + msg + "' WHERE task_id = '" + taskId + "'"
+func (this *ConverseService) SaveTaskExcepMsg(msg,taskId string) error{
+	sql := "UPDATE " + TABLE_TAST+ " SET exception = '" + msg + "' WHERE task_id = '" + taskId + "'"
+	_,err := this.DBE.Exec(sql)
+	return err
+}
+
+//保存异常信息
+func (this *ConverseService) SaveSampleExcepMsg(msg,entryNo string) error{
+	sql := "UPDATE " + TABLE_SAMPLE+ " SET exception = '" + msg + "' WHERE entryno = '" + entryNo + "'"
 	_,err := this.DBE.Exec(sql)
 	return err
 }

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

@@ -23,8 +23,6 @@ const FAILED = 4
 const SUCCESS = 5
 const RUNNING = 6
 const REJECT = 7
-const TABLE_TAST = "sample_storage_task"
-const TABLE_SAMPLE = "samplesapply"
 
 
 func (this *ConverseController) SearchDatabase() map[string]*converseService.RequestEntity{
@@ -72,7 +70,7 @@ func (this *ConverseController) GetConnection(c *websocket.Conn) {
 func (this *ConverseController) SendMessage(req *converseService.RequestEntity, conn *websocket.Conn) {
 	err := conn.WriteJSON(&req)
 	if err != nil {
-		log.Println("write:", err)
+		log.Println("write err:", err)
 	}
 }
 
@@ -114,13 +112,12 @@ func (this *ConverseController) HandleMessage(n int, message []byte){
 		}else if taskType == "accept" {
 			log.Println(">>>>>>>>>>修改接受状态>>>>>>>>>>")
 			err = this.StatusModify(ACCEPT,taskId)
+		}else if taskType == "running" {
+			log.Println(">>>>>>>>>>修改执行中状态>>>>>>>>>>")
+			err = this.StatusModify(RUNNING,taskId)
 		}
 	}else if result == 300{
 		switch taskType {
-			case "running":
-				log.Println(">>>>>>>>>>修改执行中状态>>>>>>>>>>")
-				err = this.StatusModify(RUNNING,taskId)
-				break
 			case "reject":
 				log.Println(">>>>>>>>>>修改驳回状态>>>>>>>>>>")
 				//保存异常信息
@@ -154,23 +151,23 @@ func (this *ConverseController) SaveExcepMsg(res converseService.ResponseEntity,
 	abnormalMsg := string(abnormalByte)
 
 	var exceptMsg string
-	if causeMsg != "" && abnormalMsg == ""{
+	if causeMsg != "null" && abnormalMsg == "1null"{
 		exceptMsg = causeMsg
-	}else if causeMsg == "" && abnormalMsg != ""{
+	}else if causeMsg == "null" && abnormalMsg != "null"{
 		exceptMsg = abnormalMsg
-	}else if causeMsg != "" && abnormalMsg != "" {
-		exceptMsg = causeMsg +"\r\n\r\n" + abnormalMsg
+	}else if causeMsg != "null" && abnormalMsg == "null" {
+		exceptMsg = causeMsg + "\\r\\n\\r\\n" + abnormalMsg
 	}
 
 
 	svc := converseService.GetConverseService(utils.DBE)
 	if exceptMsg != "" {
-		svc.SaveExcepMsg(TABLE_TAST, exceptMsg,taskId)
-		svc.SaveExcepMsg(TABLE_SAMPLE, exceptMsg,taskId)
+		svc.SaveTaskExcepMsg(exceptMsg,taskId)
+		svc.SaveSampleExcepMsg(exceptMsg,taskId)
 	} else {
 		//任务再次执行成功时,删除已有的异常信息
-		svc.SaveExcepMsg(TABLE_TAST," ",taskId)
-		svc.SaveExcepMsg(TABLE_SAMPLE," ",taskId)
+		svc.SaveTaskExcepMsg(" ",taskId)
+		svc.SaveSampleExcepMsg(" ",taskId)
 	}
 }
 

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

@@ -11,10 +11,10 @@ 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://39.105.83.226:22368/socket"
 //const gpServiceUrl = "ws://fdgfghfg.oicp.net:48681/socket"
-//const gpServiceUrl = "ws://fdgfghfg.oicp.net:23248/socket"
+const gpServiceUrl = "ws://fdgfghfg.oicp.net:23248/socket"
 
 //var conn *websocket.Conn
 var err error
@@ -124,7 +124,7 @@ func ListenToReadMsg(conn *websocket.Conn) {
 
 		n, message, err := conn.ReadMessage()
 		if err != nil {
-			log.Println("read:", err)
+			log.Println("read err:", err)
 			disconnect <- true
 			return
 		}
@@ -142,15 +142,15 @@ func ListenToSendMsg(conn *websocket.Conn){
 		//如果已连接则发送任务
 		reqMap := ctrl.SearchDatabase()
 		if err != nil {
-			log.Println("read:", err)
+			log.Println("read err:", err)
 		}
 
-		for k,v := range reqMap {
-			err := conn.WriteJSON(v)
+		for taskId,reqEntity := range reqMap {
+			err := conn.WriteJSON(reqEntity)
 			if err != nil {
-				log.Println("write:", err)
+				log.Println("write err:", err)
 			}else{
-				err = ctrl.StatusModify(converse.SENT,k)
+				err = ctrl.StatusModify(converse.SENT, taskId)
 			}
 		}
 	})