设备名称

Gene_point_Service/.idea/workspace.xml

@@ -3,8 +3,9 @@
   <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/converse.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converse.go" 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/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/src/dashoo.cn/api/main.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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -20,8 +21,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="456">
-              <caret line="139" column="18" selection-start-line="139" selection-start-column="18" selection-end-line="139" selection-end-column="18" />
+            <state relative-caret-position="732">
+              <caret line="139" column="21" selection-start-line="139" selection-start-column="21" selection-end-line="139" selection-end-column="21" />
             </state>
           </provider>
         </entry>
@@ -29,8 +30,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="249">
-              <caret line="101" column="22" selection-start-line="101" selection-start-column="22" selection-end-line="101" selection-end-column="22" />
+            <state relative-caret-position="115">
+              <caret line="173" column="28" selection-start-line="173" selection-start-column="28" selection-end-line="173" selection-end-column="28" />
             </state>
           </provider>
         </entry>
@@ -38,8 +39,8 @@
       <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="168">
-              <caret line="81" column="17" selection-start-line="81" selection-start-column="14" selection-end-line="81" selection-end-column="17" />
+            <state relative-caret-position="1071">
+              <caret line="687" column="46" selection-start-line="687" selection-start-column="46" selection-end-line="687" selection-end-column="46" />
               <folding>
                 <element signature="e#25#163#0" expanded="true" />
               </folding>
@@ -47,6 +48,27 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://E:/DASHOO/common/base_dashoo_common/src/dashoo.cn/utils/db/serviceBase.go">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="275">
+              <caret line="46" column="38" selection-start-line="46" selection-start-column="38" selection-end-line="46" selection-end-column="38" />
+            </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="266">
+              <caret line="160" column="4" selection-start-line="160" selection-start-column="4" selection-end-line="160" selection-end-column="4" />
+              <folding>
+                <element signature="e#25#66#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -69,6 +91,7 @@
       <find>table_sample</find>
       <find>SampleStatusModify</find>
       <find>fmt</find>
+      <find>GetReason</find>
     </findStrings>
   </component>
   <component name="GOROOT" path="D:\Development\GO" />
@@ -94,9 +117,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/conf/app.conf" />
+        <option value="$PROJECT_DIR$/src/dashoo.cn/api/main.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/main.go" />
         <option value="$PROJECT_DIR$/src/dashoo.cn/api/business/converseService/converseService.go" />
       </list>
     </option>
@@ -273,13 +296,13 @@
     <frame x="1912" y="-8" width="2576" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.25417662" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49766356" visible="true" weight="0.25616547" />
       <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" visible="true" weight="0.30057803" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.89467406" weight="0.30057803" />
       <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" />
@@ -621,13 +644,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://E:/DASHOO/common/base_dashoo_common/src/dashoo.cn/utils/db/serviceBase.go">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="275">
-          <caret line="614" column="22" selection-start-line="614" selection-start-column="22" selection-end-line="614" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://D:/Development/GO/src/strings/strings.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
@@ -649,13 +665,6 @@
         </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="786">
-          <caret line="216" column="46" selection-start-line="216" selection-start-column="46" selection-end-line="216" selection-end-column="46" />
-        </state>
-      </provider>
-    </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="575">
@@ -665,22 +674,39 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/dashoo.cn/api/main.go">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="456">
-          <caret line="139" column="18" selection-start-line="139" selection-start-column="18" selection-end-line="139" selection-end-column="18" />
+        <state relative-caret-position="732">
+          <caret line="139" column="21" selection-start-line="139" selection-start-column="21" selection-end-line="139" selection-end-column="21" />
         </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="249">
-          <caret line="101" column="22" selection-start-line="101" selection-start-column="22" selection-end-line="101" selection-end-column="22" />
+        <state relative-caret-position="115">
+          <caret line="173" column="28" selection-start-line="173" selection-start-column="28" selection-end-line="173" selection-end-column="28" />
+        </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="266">
+          <caret line="160" column="4" selection-start-line="160" selection-start-column="4" selection-end-line="160" selection-end-column="4" />
+          <folding>
+            <element signature="e#25#66#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://E:/DASHOO/common/base_dashoo_common/src/dashoo.cn/utils/db/serviceBase.go">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="275">
+          <caret line="46" column="38" selection-start-line="46" selection-start-column="38" selection-end-line="46" selection-end-column="38" />
         </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="168">
-          <caret line="81" column="17" selection-start-line="81" selection-start-column="14" selection-end-line="81" selection-end-column="17" />
+        <state relative-caret-position="1071">
+          <caret line="687" column="46" selection-start-line="687" selection-start-column="46" selection-end-line="687" selection-end-column="46" />
           <folding>
             <element signature="e#25#163#0" expanded="true" />
           </folding>

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

@@ -1,6 +1,8 @@
 package converseService
 
-import "time"
+import (
+	"time"
+)
 
 const UNEXECUTED = 0
 const SENT = 1
@@ -239,4 +241,8 @@ type Bank_Apply_Detail struct {
 	DetailId       int       `xorm:INT(10)`
 	IsLocked       int        `xorm:INT(10)`
 
+}
+
+type Equipment struct {
+	Name 	string
 }

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

@@ -623,18 +623,26 @@ func (s *ConverseSessionService) InsertEntityBytbl(tablename string, entity inte
 	return
 }
 
+//获取设备名称
+func (s *ConverseService)GetEquipmentName(cu int) string {
+	sql := "SELECT name from " + TABLE_EQUIPMENT + " where cu = '" + strconv.Itoa(cu) + "'"
+	var entity Equipment
+	s.DBE.SQL(sql).Get(&entity)
+	return entity.Name
+}
 
 //异常信息转换
-func HandleCauses (causes []Cause) string {
+func (s *ConverseService)HandleCauses (causes []Cause) string {
 	var exceptInfo string
 	for _,cause := range causes {
-		exceptInfo += GetReason(cause)
+		eName := s.GetEquipmentName(cause.Cu)
+		exceptInfo += s.GetReason(cause, eName)
 	}
 	return exceptInfo
 }
 
 //根据异常码获取异常原因
-func GetReason(cause Cause) string{
+func (s *ConverseService)GetReason(cause Cause, equipmentName string) string{
 	var reasonStr string
 	switch cause.Reason {
 	case 1:
@@ -663,17 +671,18 @@ func GetReason(cause Cause) string{
 	}
 
 	if cause.Cu != 0 {
-		reasonStr = strconv.Itoa(cause.Cu)+"号设备," + reasonStr
+		reasonStr = strconv.Itoa(cause.Cu)+"号设备, '" + equipmentName + "'," + reasonStr
 	}
 	return reasonStr
 }
 
 //处理Exceptions异常信息
-func HandleExceptions (excepts []Exception) string {
+func (s *ConverseService)HandleExceptions (excepts []Exception) string {
 	var exceptStr string
 	for _,except := range excepts {
+		eName := s.GetEquipmentName(except.Cu)
 		for _,code := range except.Codes{
-			var tempStr = string(except.Cu)+"号设备,"
+			var tempStr = string(except.Cu)+"号设备'" + eName + "',"
 			switch code {
 			case 40200:
 				tempStr += "移动盒子过程中设备故障，动作失败;"

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

@@ -1,10 +1,9 @@
 package converse
 
 import (
-	."dashoo.cn/api/business/converseService"
+	. "dashoo.cn/api/business/converseService"
 	"dashoo.cn/utils"
 	"encoding/json"
-	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/gorilla/websocket"
 	"log"
@@ -168,14 +167,13 @@ func (this *ConverseController) HandleMessage(n int, message []byte){
 
 //保存异常信息
 func (this *ConverseController) SaveExcepMsg(res ResponseEntity,taskId string) {
+	svc := GetConverseService(utils.DBE)
 	//causeByte,_ := json.Marshal(res.Data.Causes)
 	//causeMsg := string(causeByte)
-	causeMsg := HandleCauses(res.Data.Causes)
-	fmt.Println("causeMsg: |",causeMsg,"|")
-	exceptMsg := HandleExceptions(res.Data.Exceptions)
+	causeMsg := svc.HandleCauses(res.Data.Causes)
+	exceptMsg := svc.HandleExceptions(res.Data.Exceptions)
 	//abnormalByte,_ := json.Marshal(res.Data.Abnormal_data)
 	//abnormalMsg := string(abnormalByte)
-	fmt.Println("exceptMsg:  |",exceptMsg,"|")
 
 	var totalMsg string
 	if causeMsg != "" && exceptMsg == ""{
@@ -186,8 +184,6 @@ func (this *ConverseController) SaveExcepMsg(res ResponseEntity,taskId string) {
 		totalMsg = causeMsg + "\\r\\n\\r\\n" + exceptMsg
 	}
 
-
-	svc := GetConverseService(utils.DBE)
 	if totalMsg != "" {
 		svc.SaveTaskExcepMsg(totalMsg,taskId)
 		svc.SaveSampleExcepMsg(totalMsg,taskId)

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

@@ -16,11 +16,11 @@ 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://270100d53m.wicp.vip:46538/socket"
+//const gpServiceUrl = "ws://270100d53m.wicp.vip:46538/socket"
 
 //var conn *websocket.Conn
 var err error