show model name in getuutinfo interface
This commit is contained in:
r0n1n7an
parent
62c8b6fa2b
commit
97937ee7c4
BIN
APIServer.exe
BIN
APIServer.exe
Binary file not shown.
69
ews/ews.go
69
ews/ews.go
@ -21,6 +21,7 @@ type UutInfo struct {
|
||||
Status string
|
||||
Message string
|
||||
PartNO string
|
||||
Model string
|
||||
MfgMO string
|
||||
MfgSKU string
|
||||
MfgLine string
|
||||
@ -145,9 +146,6 @@ func (e *EWS) SetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
|
||||
return rst
|
||||
}
|
||||
|
||||
// fmt.Sprintf(`SELECT t1.usn,t1.mac,t1.ipaddr,t1.relay,t1.item,t1.status,t1.message,t1.partno,t1.mo,t1.sku,t1.line,t1.stage,t1.first_ack,t1.last_ack,t1.last_change,t2.model
|
||||
// FROM uutinfo t1 LEFT JOIN modelfamily t2 ON t1.partno=t2.modelfamily
|
||||
// WHERE t1.usn='%s';`, params["USN"]))
|
||||
rec := dbo.QueryRow(
|
||||
fmt.Sprintf(`SELECT usn,mac,ipaddr,relay,item,status,message,partno,mo,sku,line,stage,first_ack,last_ack,last_change
|
||||
FROM uutinfo
|
||||
@ -471,7 +469,7 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
|
||||
}
|
||||
|
||||
ul := new(UutInfo)
|
||||
//model := ""
|
||||
model := ""
|
||||
partNO := ""
|
||||
mfgMO := ""
|
||||
mfgSKU := ""
|
||||
@ -481,10 +479,26 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
|
||||
//Get Last Record
|
||||
last := ""
|
||||
curr, err := dbo.Query(
|
||||
fmt.Sprintf(`SELECT usn,mac,ipaddr,relay,item,status,message,partno,mo,sku,line,stage,first_ack,last_ack,last_change
|
||||
FROM uutinfo
|
||||
WHERE %s='%s'
|
||||
ORDER BY usn ASC, seqid ASC;`, params["KEY"], params["VALUE"]))
|
||||
fmt.Sprintf(`SELECT
|
||||
t1.usn,
|
||||
t1.mac,
|
||||
t1.ipaddr,
|
||||
t1.relay,
|
||||
t1.item,
|
||||
t1.status,
|
||||
t1.message,
|
||||
t1.partno,
|
||||
IFNULL(t2.model, '') AS model,
|
||||
t1.mo,
|
||||
t1.sku,
|
||||
t1.line,
|
||||
t1.stage,
|
||||
t1.first_ack,
|
||||
t1.last_ack,
|
||||
t1.last_change
|
||||
FROM uutinfo t1 LEFT JOIN modelfamily t2 ON t1.partno=t2.modelfamily
|
||||
WHERE t1.%s='%s'
|
||||
ORDER BY t1.usn ASC, t1.seqid ASC;`, params["KEY"], params["VALUE"]))
|
||||
|
||||
if err != nil {
|
||||
logger.Printf("[ERR] %s; %s; %#v; %s\r\n", addr, uri, params, err.Error())
|
||||
@ -504,6 +518,7 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
|
||||
&ul.Status,
|
||||
&ul.Message,
|
||||
&ul.PartNO,
|
||||
&ul.Model,
|
||||
&ul.MfgMO,
|
||||
&ul.MfgSKU,
|
||||
&ul.MfgLine,
|
||||
@ -540,6 +555,9 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
|
||||
</tr>%s`, ul.USN, ul.MAC, ul.IPAddr, ul.Relay, ul.Item, ul.Status, ul.Message, ul.LastChg, "\r\n")
|
||||
}
|
||||
|
||||
if ul.Model != "" {
|
||||
model = ul.Model
|
||||
}
|
||||
if ul.PartNO != "" {
|
||||
partNO = ul.PartNO
|
||||
}
|
||||
@ -561,10 +579,26 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
|
||||
uh := new(UutInfo)
|
||||
bkup := ""
|
||||
prev, err := dbo.Query(
|
||||
fmt.Sprintf(`SELECT usn,mac,ipaddr,relay,item,status,message,partno,mo,sku,line,stage,first_ack,last_ack,last_change
|
||||
FROM uutinfobkup
|
||||
WHERE %s='%s'
|
||||
ORDER BY usn ASC, seqid ASC;`, params["KEY"], params["VALUE"]))
|
||||
fmt.Sprintf(`SELECT
|
||||
t1.usn,
|
||||
t1.mac,
|
||||
t1.ipaddr,
|
||||
t1.relay,
|
||||
t1.item,
|
||||
t1.status,
|
||||
t1.message,
|
||||
t1.partno,
|
||||
IFNULL(t2.model, '') AS model,
|
||||
t1.mo,
|
||||
t1.sku,
|
||||
t1.line,
|
||||
t1.stage,
|
||||
t1.first_ack,
|
||||
t1.last_ack,
|
||||
t1.last_change
|
||||
FROM uutinfobkup t1 LEFT JOIN modelfamily t2 ON t1.partno=t2.modelfamily
|
||||
WHERE t1.%s='%s'
|
||||
ORDER BY t1.usn ASC, t1.seqid ASC;`, params["KEY"], params["VALUE"]))
|
||||
|
||||
if err != nil {
|
||||
logger.Printf("[ERR] %s; %s; %#v; %s\r\n", addr, uri, params, err.Error())
|
||||
@ -584,6 +618,7 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
|
||||
&uh.Status,
|
||||
&uh.Message,
|
||||
&uh.PartNO,
|
||||
&uh.Model,
|
||||
&uh.MfgMO,
|
||||
&uh.MfgSKU,
|
||||
&uh.MfgLine,
|
||||
@ -638,6 +673,9 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
|
||||
}
|
||||
|
||||
//Get Misc. Info
|
||||
if model == "" {
|
||||
model = uh.Model
|
||||
}
|
||||
if partNO == "" {
|
||||
partNO = uh.PartNO
|
||||
}
|
||||
@ -655,8 +693,8 @@ func (e *EWS) GetUutInfo(cfg cnf.Cfg, logger *log.Logger, host string, addr stri
|
||||
}
|
||||
|
||||
misc := ""
|
||||
misc = fmt.Sprintf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>",
|
||||
partNO, mfgMO, mfgSKU, fstAck, lstAck)
|
||||
misc = fmt.Sprintf("<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>",
|
||||
model, partNO, mfgMO, mfgSKU, fstAck, lstAck)
|
||||
|
||||
rst["RESULT"] = "OK"
|
||||
rst["ErrMsg"] = e.TemplateUutInfo(loc, locTime, misc, last, bkup)
|
||||
@ -878,7 +916,8 @@ func (e *EWS) TemplateUutInfo(loc, locTime, misc, last, bkup string) string {
|
||||
<br/>
|
||||
<table>
|
||||
<tr>
|
||||
<th>PartNO.</th>
|
||||
<th>Model</th>
|
||||
<th>Part NO.</th>
|
||||
<th>MO</th>
|
||||
<th>SKU</th>
|
||||
<th>First Ack</th>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user