自动连接

Gene_point_Service/.gitignore

@@ -0,0 +1,2 @@
+/.idea/
+*.exe

Gene_point_Service/.idea/workspace.xml

@@ -3,6 +3,7 @@
   <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>
@@ -17,23 +18,35 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.go">
+      <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="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" />
+            <state relative-caret-position="-989">
+              <caret line="62" column="27" lean-forward="true" selection-start-line="62" selection-start-column="27" selection-end-line="62" selection-end-column="27" />
               <folding>
-                <element signature="e#14#173#0" expanded="true" />
+                <element signature="e#18#192#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/controllers/converse/converse.go">
+      <file pinned="false" current-in-tab="false">
+        <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="322">
-              <caret line="23" column="17" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="17" />
+            <state relative-caret-position="-380">
+              <caret line="154" column="28" selection-start-line="154" selection-start-column="28" selection-end-line="154" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="195">
+              <caret line="131" column="21" lean-forward="true" selection-start-line="131" selection-start-column="21" selection-end-line="131" selection-end-column="21" />
+              <folding>
+                <element signature="e#14#173#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -46,6 +59,8 @@
       <find>ModifyTaskStatusCode</find>
       <find>TransPositionToNo</find>
       <find>rack_id</find>
+      <find>fmt</find>
+      <find>println</find>
     </findStrings>
   </component>
   <component name="GOROOT" path="D:\Development\GO" />
@@ -72,9 +87,9 @@
         <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/controllers/converse/converse.go" />
       </list>
     </option>
   </component>
@@ -221,15 +236,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.1575179" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.15831344" />
       <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 active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" visible="true" weight="0.32716763" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" weight="0.32716763" />
       <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" />
@@ -244,20 +258,20 @@
       <window_info anchor="right" id="Database" order="3" weight="0.32932693" />
     </layout>
     <layout-to-restore>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.4982639" visible="true" weight="0.14558473" />
-      <window_info id="Structure" order="1" sideWeight="0.5017361" side_tool="true" weight="0.30381805" />
-      <window_info id="Favorites" order="2" side_tool="true" />
+      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.15871121" />
+      <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.32947975" />
-      <window_info active="true" anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" visible="true" weight="0.66936415" />
+      <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 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" />
+      <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" />
@@ -269,7 +283,6 @@
     <option name="version" value="1" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/api/main.go" />
     <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">
@@ -303,13 +316,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/DASHOO/common/base_dashoo_common/src/dashoo.cn/utils/dbEngine.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-276">
-          <caret line="18" column="4" selection-start-line="18" selection-start-column="4" selection-end-line="18" selection-end-column="4" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://E:/DASHOO/base_go/src/github.com/astaxie/beego/controller.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="686">
@@ -515,13 +521,6 @@
         </state>
       </provider>
     </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="989">
-          <caret line="401" column="74" selection-start-line="401" selection-start-column="74" selection-end-line="401" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
     <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="11">
@@ -543,13 +542,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://D:/Development/GO/src/log/log.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1683">
-          <caret line="148" column="17" selection-start-line="148" selection-start-column="17" selection-end-line="148" selection-end-column="17" />
-        </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">
@@ -564,20 +556,54 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://E:/DASHOO/common/base_dashoo_common/src/dashoo.cn/utils/dbEngine.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="30" column="5" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://E:/DASHOO/base_go/src/github.com/robfig/cron/cron.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1748">
+          <caret line="76" column="5" selection-start-line="76" selection-start-column="5" selection-end-line="76" selection-end-column="5" />
+          <folding>
+            <element signature="e#14#58#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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" />
+        </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="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" />
+        <state relative-caret-position="195">
+          <caret line="131" column="21" lean-forward="true" selection-start-line="131" selection-start-column="21" selection-end-line="131" selection-end-column="21" />
           <folding>
             <element signature="e#14#173#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </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="-380">
+          <caret line="154" column="28" selection-start-line="154" selection-start-column="28" selection-end-line="154" selection-end-column="28" />
+        </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 relative-caret-position="-989">
+          <caret line="62" column="27" lean-forward="true" selection-start-line="62" selection-start-column="27" selection-end-line="62" selection-end-column="27" />
+          <folding>
+            <element signature="e#18#192#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

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

@@ -93,56 +93,6 @@ func (this *ConverseService) CheckStockTubeInfo(cu int, rack_id, tube_id, utc st
 	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) 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) CancelTast(utc string, task_id string) *RequestEntity{
 	var request = "task_change"
@@ -419,7 +369,6 @@ func handleQueryTube(entity *RequestEntity, detail *Sample_Storage_Task){
 //修改任务表状态码
 func (this *ConverseService) TaskStatusModify(statusCode int, task_id string)  error{
 	sql := "UPDATE sample_storage_task SET statuscode = '" + strconv.Itoa(statusCode) + "' WHERE task_id = '" + task_id + "'"
-	fmt.Println(sql)
 	_,err := this.DBE.Exec(sql)
 	return err
 }
@@ -431,15 +380,6 @@ func (this *ConverseService) SampleApplyStatusModify(statusCode int, entryNo str
 	return err
 }
 
-//修改任务完成状态
-//func (this *ConverseService) ModifyTaskStatusCode(taskId string, code int){
-//	sql := "UPDATE sample_storage_task SET statuscode = '" + string(code) + "' WHERE task_id = '" + taskId + "'"
-//	_,err := this.DBE.Exec(sql)
-//	if err != nil {
-//		log.Println(err)
-//	}
-//}
-
 //获取任务原始信息
 func (this *ConverseService) GetBasicTaskInfo(task_id string) ([]Sample_Storage_Task, error){
 	sql := `SELECT

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

@@ -119,7 +119,7 @@ func (this *ConverseController) HandleMessage(n int, message []byte){
 		log.Println(">>>>>>>>>>修改驳回状态>>>>>>>>>>")
 		err = this.StatusModify(REJECT,taskId)
 	}else if  result != 200 || (isEnd && res.Data.Abnormal_data != nil) {
-		log.Println("---------修改失败状态-----------")
+		log.Println("----------修改失败状态----------")
 		//处理异常信息
 		//保存异常信息
 		causeByte,_ := json.Marshal(res.Data.Causes)
@@ -150,7 +150,7 @@ func (this *ConverseController) DeleteAccomplishedTask() error{
 	svc := converseService.GetConverseService(utils.DBE)
 	defer svc.DBE.Close()
 	err := svc.DeleteEntityBytbl("sample_storage_task", where)
-	log.Println("===清除任务信息=================")
+	log.Println("===============清除任务信息===============")
 	if err != nil {
 		log.Println(err)
 		return err
@@ -158,39 +158,3 @@ func (this *ConverseController) DeleteAccomplishedTask() error{
 	return nil
 }
 
-////@Title 生成任务信息
-////@Description 根据出入库信息生成任务信息并存入任务信息表
-////@Success 200 {object}
-////@router /executetask [post]
-//func (this *ConverseController) GenerateTask(){
-//	taskId := this.GetString("EntryNo")
-//	applyType := this.GetString("ApplyType")	//1 入库  2 出库
-//	svc := converseService.GetConverseService(utils.DBE)
-//	list,err := svc.GetBasicTaskInfo(taskId)
-//
-//	var result CommonResult
-//	if err != nil || len(list) == 0 {
-//		result.Msg = "任务执行发送失败!"
-//		result.Code = -1
-//		return
-//	}
-//	list2 := svc.HandleTaskInfo(list,applyType)
-//	session := converseService.GetConverseSessionService(utils.DBE.NewSession())
-//	defer session.Session.Close()
-//	session.Session.Begin()
-//	_,err = session.InsertEntityBytbl("sample_storage_task",list2)
-//	if err != nil {
-//		session.Session.Rollback()
-//		result.Msg = "任务执行发送失败!"
-//		result.Code = -1
-//	}else {
-//		session.Session.Commit()
-//		result.Msg = "任务执行发送成功!"
-//		result.Code = 0
-//	}
-//	this.Data["json"] = &result
-//	this.ServeJSON()
-//}
-
-
-

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
@@ -32,19 +32,21 @@ func main() {
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt)
 	var done = make(chan struct{})
+	defer close(done)
 
 
 	var conn *websocket.Conn
 	conn = WebSocketFound()
-	log.Println("连接成功: %s", conn!=nil)
+	log.Println("连接成功: ", conn!=nil)
 	if conn != nil {
 		defer conn.Close()
 		ctrl.GetConnection(conn)
 		//发送请求
 		go ListenToSendMsg(conn)
 		//监听消息
-		go ListenToReadMsg(done,conn)
+		go ListenToReadMsg(conn)
 	}else{
+		//设置连接失败
 		go SetDisconnect()
 	}
 
@@ -75,7 +77,7 @@ func main() {
 			}
 			select {
 				case <-done:
-				case <-time.After(time.Second*30):
+				case <-time.After(time.Second*10):
 
 			}
 			//return
@@ -83,13 +85,13 @@ func main() {
 			log.Println("服务器连接已断开!")
 			for {
 				select{
-				case <-time.After(time.Second*30):
+				case <-time.After(time.Second*10):
 					conn = WebSocketFound()
 					if conn != nil {
 						defer conn.Close()
 						ctrl.GetConnection(conn)
 						go ListenToSendMsg(conn)
-						go ListenToReadMsg(done, conn)
+						go ListenToReadMsg(conn)
 						goto label
 					}
 					log.Println("连接失败, 等待重新连接........")
@@ -101,7 +103,7 @@ func main() {
 	label:
 	}
 
-	log.Println("===============Service_down==============")
+	log.Println("===============Service_down===============")
 	//conn.Close()
 }
 
@@ -116,9 +118,8 @@ func WebSocketFound() *websocket.Conn{
 }
 
 // 监听消息
-func ListenToReadMsg(done chan struct{}, conn *websocket.Conn) {
-	log.Println("监听消息func>>>>>>>>>>>>>>>>>>>")
-	defer close(done)
+func ListenToReadMsg(conn *websocket.Conn) {
+	log.Println("监听消息>>>>>>>>>>>>>>>>>>>")
 	for {
 
 		n, message, err := conn.ReadMessage()
@@ -134,7 +135,7 @@ func ListenToReadMsg(done chan struct{}, conn *websocket.Conn) {
 
 //发送请求
 func ListenToSendMsg(conn *websocket.Conn){
-	log.Println("发送消息func>>>>>>>>>>>>>>>>>>>")
+	log.Println("发送消息>>>>>>>>>>>>>>>>>>>")
 	cron := cron.New()
 	tick := "*/10 * * * * ?"
 	err = cron.AddFunc(tick, func() {