|
@@ -239,8 +239,8 @@ func (c *DeviceClassController) List_List() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-// 添加-
|
|
|
-func (c *DeviceClassController) List_Add() {
|
|
|
+// 添加- 旧功能
|
|
|
+func (c *DeviceClassController) List_Add1() {
|
|
|
// 验证登录 User_is, User_r
|
|
|
User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
|
|
|
if !User_is {
|
|
@@ -384,6 +384,106 @@ func (c *DeviceClassController) List_Add() {
|
|
|
c.ServeJSON()
|
|
|
return
|
|
|
}
|
|
|
+func (c *DeviceClassController) List_Add() {
|
|
|
+ // 验证登录 User_is, User_r
|
|
|
+ User_r, User_is := Account.Verification_Admin(c.Ctx.GetCookie("User_tokey"), c.GetString("User_tokey"))
|
|
|
+ if !User_is {
|
|
|
+ c.Data["json"] = lib.JSONS{Code: 201, Msg: "请重新登录!"}
|
|
|
+ c.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ T_class, _ := c.GetInt("T_class")
|
|
|
+ T_sn_id_list := c.GetString("T_sn_id_list")
|
|
|
+
|
|
|
+ list := strings.Split(strings.TrimRight(T_sn_id_list, "|"), "|")
|
|
|
+ T_remark := c.GetString("T_remark")
|
|
|
+
|
|
|
+ _, is := Device.Read_DeviceClass_ById(T_class)
|
|
|
+ if !is {
|
|
|
+ c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class 错误"}
|
|
|
+ c.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ var successNum int // 成功数量
|
|
|
+ errList := []string{}
|
|
|
+ errList2 := []string{}
|
|
|
+ succesId := []string{}
|
|
|
+ for _, sn_id := range list {
|
|
|
+ T_sn := strings.Split(sn_id, ",")[0]
|
|
|
+ T_id := strings.Split(sn_id, ",")[1]
|
|
|
+ // 判断是否已存在sn
|
|
|
+ dc, is := Device.Read_DeviceClassList_T_class_T_sn(T_class, T_sn)
|
|
|
+ // 添加的id和数据库已存在id相同
|
|
|
+ if is && dc.T_id == T_id {
|
|
|
+ successNum += 1
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ // 添加的id和数据库已存在id不同
|
|
|
+ if is && dc.T_id != T_id {
|
|
|
+ dc.T_id = T_id
|
|
|
+ dc.T_remark = T_remark
|
|
|
+ if !Device.Update_DeviceClassList(dc, "T_id", "T_remark") {
|
|
|
+ errList = append(errList, sn_id)
|
|
|
+ } else {
|
|
|
+ successNum += 1
|
|
|
+ }
|
|
|
+ continue
|
|
|
+ }
|
|
|
+
|
|
|
+ _, is = Device.Read_DeviceClassList_T_class_T_id(T_class, T_id)
|
|
|
+ if is {
|
|
|
+ errList2 = append(errList2, sn_id)
|
|
|
+ continue
|
|
|
+ }
|
|
|
+
|
|
|
+ var pdf Certificate.CertificatePdf
|
|
|
+ pdfList, _ := Certificate.Read_CertificatePdf_Newest(T_sn)
|
|
|
+ if len(pdfList) > 0 {
|
|
|
+ pdf = pdfList[0]
|
|
|
+ }
|
|
|
+
|
|
|
+ var_ := Device.DeviceClassList{
|
|
|
+ T_class: T_class,
|
|
|
+ T_id: T_id,
|
|
|
+ T_sn: T_sn,
|
|
|
+ T_failure_time: pdf.T_failure_time,
|
|
|
+ T_pdf: pdf.T_pdf,
|
|
|
+ T_remark: T_remark,
|
|
|
+ T_State: 1,
|
|
|
+ }
|
|
|
+
|
|
|
+ _, is = Device.Add_DeviceClassList(var_)
|
|
|
+ if !is {
|
|
|
+ errList = append(errList, sn_id)
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ successNum += 1
|
|
|
+ succesId = append(succesId, sn_id)
|
|
|
+ System.Add_UserLogs_T(User_r.T_uuid, "分类设备管理", "添加", var_)
|
|
|
+ }
|
|
|
+
|
|
|
+ if len(errList) == 0 && len(errList2) == 0 {
|
|
|
+ c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: successNum}
|
|
|
+ c.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ var errStr string
|
|
|
+ if len(errList2) > 0 {
|
|
|
+ errStr += strings.Join(errList2, ",") + "编号已存在"
|
|
|
+ }
|
|
|
+ if len(errList) > 0 {
|
|
|
+ if len(errStr) > 0 {
|
|
|
+ errStr += ","
|
|
|
+ }
|
|
|
+ errStr += strings.Join(errList, ",") + "添加失败"
|
|
|
+ }
|
|
|
+
|
|
|
+ c.Data["json"] = lib.JSONS{Code: 210, Msg: errStr, Data: successNum}
|
|
|
+ c.ServeJSON()
|
|
|
+ return
|
|
|
+}
|
|
|
|
|
|
// 修改-
|
|
|
func (c *DeviceClassController) List_Up() {
|
|
@@ -419,6 +519,13 @@ func (c *DeviceClassController) List_Up() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ _, is = Device.Read_DeviceClassList_T_class_T_id(r.T_class, T_id)
|
|
|
+ if is && T_id != r.T_id {
|
|
|
+ c.Data["json"] = lib.JSONS{Code: 202, Msg: T_id + "编号已存在!"}
|
|
|
+ c.ServeJSON()
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
if len(T_id) > 0 {
|
|
|
r.T_id = T_id
|
|
|
}
|