2
3
yuedefeng преди 6 години
родител
ревизия
17c3ce8c3a

+ 40 - 0
src/dashoo.cn/backend/api/business/oilrtx/RtxService.go

@@ -0,0 +1,40 @@
+package oilrtx
+
+import (
+	. "dashoo.cn/utils/db"
+	"encoding/json"
+	"github.com/go-xorm/xorm"
+	"log"
+	"net/http"
+	"strings"
+)
+
+type RtxService struct {
+	ServiceBase
+}
+
+func GetRtxService(xormEngine *xorm.Engine) *RtxService {
+	s := new(RtxService)
+	s.DBE = xormEngine
+	return s
+}
+
+func (s *RtxService) CallRtx() *http.Response {
+	client := &http.Client{}
+	var rtx Rtx
+	rtx.Msg = "11"
+	rtx.Receiver = "12"
+	json, err := json.Marshal(rtx)
+	params := string(json)
+	req, err := http.NewRequest("POST", "http://localhost:7080/Api/sendRTX", strings.NewReader(params))
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("X-Token", "11111")
+	resp, err := client.Do(req)
+
+	if err != nil {
+		log.Println("err= ", err)
+	}
+	log.Println("resp= ", resp)
+
+	return resp
+}

+ 9 - 0
src/dashoo.cn/backend/api/business/oilrtx/rtx.go

@@ -0,0 +1,9 @@
+package oilrtx
+
+
+//"time"
+
+type Rtx struct {
+	Msg        string `json:"msg"`
+	Receiver   string `json:"receiver"`
+}

+ 14 - 5
src/dashoo.cn/backend/api/controllers/base.go

@@ -275,11 +275,20 @@ func (this *BaseController) Prepare() {
 	find := false
 
 	// 不需要做登录验证的页面
-	urls := []string{"/api/auth", "/api/users/registemanage", "/printservice",
-		"/api/webinterface/preparelist", "/api/webinterface/prepareinfo",
-		"/api/sampletest_v/sampletest", "/api/sampletest_v/getpass", "/api/sampletest_v/editpass/",
-		"/api/sampletest_v/donorsdetail", "/api/sampletest_v/testdetail", "/api/uploads/samplesinput", "/api/doctemplate_onlyoffice/callback", "/api/doctemplate_onlyoffice/viewcallback", "/api/limsupload/usersignimg",
-		"/api/uploads/samplestypeimg", "/api/workflow/historyimg/", "/api/document/getdocumentnameandtime", "/api/annualaudit/auditcallback", "/api/suppliercert/auditcallback", "/api/register/addentity", "/api/register/getsuppliername", "/api/register/getdictlist"}
+	urls := []string{
+		"/api/auth",
+		"/api/users/registemanage",
+		"/printservice",
+		"/api/uploads/samplestypeimg",
+		"/api/workflow/historyimg/",
+		"/api/document/getdocumentnameandtime",
+		"/api/annualaudit/auditcallback",
+		"/api/suppliercert/auditcallback",
+		"/api/register/addentity",
+		"/api/register/getsuppliername",
+		"/api/register/getdictlist",
+		"/api/rtx/call",
+	}
 	for _, v := range urls {
 		fmt.Println("**this.Ctx.Input.URL()**", this.Ctx.Input.URL())
 		if this.Ctx.Input.URL() == v {

+ 28 - 0
src/dashoo.cn/backend/api/controllers/rtx/rtx.go

@@ -0,0 +1,28 @@
+package rtx
+
+import (
+	"dashoo.cn/backend/api/business/oilrtx"
+	. "dashoo.cn/backend/api/controllers"
+	"dashoo.cn/utils"
+)
+
+type RtxController struct {
+	BaseController
+}
+
+
+// @Title get
+// @Description get workflow by token
+// @Success 200 {object} historicTasks
+// @router /call [get]
+func (this *RtxController) GetRtx() {
+
+	rtxSvc := oilrtx.GetRtxService(utils.DBE)
+	resp := rtxSvc.CallRtx()
+
+	var datainfo DataInfo
+	datainfo.Items = resp
+
+	this.Data["json"] = &datainfo
+	this.ServeJSON()
+}

+ 7 - 0
src/dashoo.cn/backend/api/routers/router.go

@@ -9,6 +9,7 @@ import (
 	"dashoo.cn/backend/api/controllers/document"
 	"dashoo.cn/backend/api/controllers/oilsupplier"
 	"dashoo.cn/backend/api/controllers/register"
+	"dashoo.cn/backend/api/controllers/rtx"
 
 	//	"dashoo.cn/backend/api/controllers/equipment"
 	//	"dashoo.cn/backend/api/controllers/instrument"
@@ -359,6 +360,12 @@ func init() {
 				&oilsupplier.SelectController{},
 			),
 		),
+		//RTX
+		beego.NSNamespace("/rtx",
+			beego.NSInclude(
+				&rtx.RtxController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }

+ 0 - 1
src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -661,7 +661,6 @@
           totalTab = 6
         }
         let valid = true
-        debugger
         if (this.formDataCert.Status <= 0 && this.activeName === '0') {
           valid = this.saveEntity()
         } else if (this.formDataCert.Status <= 0 && this.activeName === '1') {