用户登录方式更改

controllers/CompanyList.go

@@ -9,9 +9,10 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"strconv"
+
 	beego "github.com/beego/beego/v2/server/web"
 	uuid "github.com/satori/go.uuid"
-	"strconv"
 )
 
 type CompanyController struct {
@@ -86,6 +87,8 @@ func (c *CompanyController) Read_Admin_List() {
 	if (int(count) % conf.Page_size) != 0 {
 		pageCount = int(count) / conf.Page_size
 		pageCount++
+	} else {
+		pageCount = int(count) / conf.Page_size
 	}
 	c.Data["json"] = lib.PageHelper{int(count), pageCount, int(page), int(page) >= pageCount, page <= 1, list}
 	c.ServeJSON()
@@ -141,24 +144,37 @@ func (c *CompanyController) UpdateUser() {
 		c.ServeJSON()
 		return
 	}
+	var UpdateUser Account.UpdateUser
+	var err error
 	var coldServe Account.ColdpUser
 	var cold []string
-	var err error
-	coldServe.Id, err = strconv.Atoi(c.GetString("Id"))
-	if len(c.GetString("T_name")) > 0 {
-		coldServe.T_name = c.GetString("T_name")
+	err = json.Unmarshal(c.Ctx.Input.RequestBody, &UpdateUser)
+
+	if len(UpdateUser.Id) > 0 {
+		coldServe.Id, err = strconv.Atoi(UpdateUser.Id)
+		cold = append(cold, "ID")
+	} else {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "id不存在!"}
+		c.ServeJSON()
+		return
+	}
+	if len(UpdateUser.T_name) > 0 {
+		coldServe.T_name = UpdateUser.T_name
 		cold = append(cold, "t_name")
 	}
-	if len(c.GetString("T_user")) > 0 {
-		coldServe.T_name = c.GetString("T_user")
+	if len(UpdateUser.T_user) > 0 {
+		coldServe.T_user = UpdateUser.T_user
 		cold = append(cold, "t_user")
 	}
-	if len(c.GetString("T_pass")) > 0 {
-		coldServe.T_name = c.GetString("T_pass")
+	if len(UpdateUser.T_pass) > 0 {
+		pass := UpdateUser.T_pass
+		bytes := []byte(pass)
+		sum := md5.Sum(bytes)
+		coldServe.T_pass = hex.EncodeToString(sum[:])
 		cold = append(cold, "t_pass")
 	}
-	if len(c.GetString("T_pid")) > 0 {
-		coldServe.T_name = c.GetString("T_pid")
+	if len(UpdateUser.T_pid) > 0 {
+		coldServe.T_pid, err = strconv.Atoi(UpdateUser.T_pid)
 		cold = append(cold, "t_pid")
 	}
 	if err != nil {
@@ -166,8 +182,7 @@ func (c *CompanyController) UpdateUser() {
 		c.ServeJSON()
 		return
 	}
-	cold = append(cold, "t__state")
-	cold = append(cold, "ID")
+
 	state := Account.UpdateByIdState(coldServe, cold...)
 	if state {
 		c.Data["json"] = lib.JSONS{Code: 200, Msg: "OK!"}
@@ -192,28 +207,22 @@ func (c *CompanyController) GetUserById() {
 		c.ServeJSON()
 		return
 	}
-	var coldServe Account.ColdpUser
-	var cold []string
-	var err error
+	//var coldServe Account.ColdpUser
+	//var cold []string
+	//var err error
+	var userId string
 	if len(c.GetString("Id")) > 0 {
-		coldServe.Id, err = strconv.Atoi(c.GetString("Id"))
-		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 202, Msg: "获取参数失败!"}
-			c.ServeJSON()
-			return
-		}
+		userId = c.GetString("Id")
 	}
-	cold = append(cold, "ID")
-	state := Account.UpdateByIdState(coldServe, cold...)
-	if state {
-		c.Data["json"] = lib.JSONS{Code: 200, Msg: "OK!"}
-		c.ServeJSON()
-		return
-	} else {
-		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改用户状态失败!"}
+	err, user := Account.GetByIdUser(userId)
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "获取用户信息失败!"}
 		c.ServeJSON()
 		return
 	}
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: user}
+	c.ServeJSON()
+	return
 }
 
 // DeleteUserById 删除用户
@@ -284,7 +293,6 @@ func (c *CompanyController) AddUser() {
 
 		}
 	}
-
 	if err != nil {
 		c.Data["json"] = lib.JSONS{Code: 202, Msg: "获取参数失败!"}
 		c.ServeJSON()

controllers/DataController.go

@@ -400,7 +400,7 @@ func (c *DataController) GetCompanyBySn() {
 		c.ServeJSON()
 		return
 	}
-	if admin.T_pid == 0 || admin.T_name == "宝智达-魏公梅" {
+	if admin.T_pid == 0 || admin.T_name == "bzdwgm" {
 		sn := c.GetString("sn")
 		company, err := Device.GetCompanyBySn(sn)
 		if err != nil {

lastupdate.tmp

@@ -1 +1 @@
-{"E:\\WebstormProjects\\ColdP_server\\controllers":1737510386700760500}
+{"E:\\WebstormProjects\\ColdP_server\\controllers":1737603276796091100}

logs/logx/logx.log

@@ -536,3 +536,96 @@
 2025/01/21 15:30:27.793 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
 2025/01/21 15:37:42.069 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
 2025/01/22 09:57:50.411 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/22 10:24:14.324 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/22 11:12:33.862 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:12:35.200 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:12:38.235 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:12:43.621 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:12:50.853 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:13:30.075 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:14:24.674 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:14:25.627 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:14:26.644 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:15:35.976 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:15:36.743 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:15:37.295 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:15:37.619 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:15:38.077 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:15:38.404 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:15:38.703 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:15:51.601 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:16:13.724 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:16:18.295 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:16:21.826 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:16:27.177 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:16:27.657 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:16:27.982 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:17:53.326 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:18:01.481 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:18:22.075 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:19:23.520 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:19:39.693 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:21:14.102 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:21:27.670 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:21:54.372 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024462674079198 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/22 11:25:14.321 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:25:14.321 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:25:30.073 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:25:30.073 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:31:19.712 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/22 11:33:08.779 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:08.786 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:20.545 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:20.545 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:34.411 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:34.411 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:34.442 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:34.442 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:47.224 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:47.224 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:47.224 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:47.245 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:58.581 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:33:58.581 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 11:43:31.756 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/22 12:22:05.214 [E] [Mqtt.go:452]  查询参数失败
+2025/01/22 12:22:05.219 [E] [Mqtt.go:452]  查询参数失败
+2025/01/23 10:13:35.458 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/23 10:46:00.846 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/23 10:53:22.404 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/23 11:15:54.726 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/23 11:18:13.790 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/23 11:24:12.798 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/23 11:25:19.427 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/23 11:25:26.494 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/23 11:26:19.471 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/23 11:29:06.859 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/23 11:34:49.979 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2025/01/23 12:28:10.363 [E] [Mqtt.go:452]  查询参数失败
+2025/01/23 13:18:37.809 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2024337792594540 WHERE t_id = 348 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/23 13:18:37.835 [E] [DeviceData.go:180]  ColdP_server/models/Device.Read_DeviceData <QuerySeter> no row found
+2025/01/23 13:18:38.133 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:06.706 [D] [DeviceData.go:177]  SELECT t_id,t_sp,t_t,t_rh,t_site,DATE_FORMAT(t_time,'%Y-%m-%d %H:%i:%s') AS t_time,t_time AS t_time1 FROM z_device_data_2023392896801574 WHERE t_id = 1 ORDER BY t_time1 DESC LIMIT 0,1
+2025/01/23 13:22:06.801 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:22.182 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:22.339 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:32.241 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:32.311 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:32.311 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:32.311 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:32.535 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:33.134 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:35.251 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:35.257 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:35.481 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:36.558 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:36.558 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:38.711 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:38.778 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:38.778 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:38.778 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:38.933 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:38.946 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:41.355 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/23 13:22:41.362 [E] [Mqtt.go:536]  ColdP_server/controllers/MqttServer.FindClodpServerBySnAndId <QuerySeter> no row found
+2025/01/24 11:33:19.691 [I] [WarningType.go:193]  =========== 初始化报警类型 =========

models/Account/User.go

@@ -53,6 +53,14 @@ type AddUser struct {
 	T_pid   string
 	T_pass  string
 }
+type UpdateUser struct {
+	Id      string
+	T_name  string // 姓名
+	T_user  string
+	T_State string
+	T_pid   string
+	T_pass  string
+}
 
 func ColdpUserToColdpUser_R(r ColdpUser) (v ColdpUser_R) {
 	v.T_uuid = r.T_uuid
@@ -252,14 +260,17 @@ func UpdateByIdState(m ColdpUser, cols ...string) bool {
 	}
 	return false
 }
-func GetByIdUser(m ColdpUser, cols ...string) bool {
+func GetByIdUser(userID string) (error, ColdpUser) {
 	o := orm.NewOrm()
-	err := o.Read(&m, cols...) // o.Read(&r,"Tokey") 如果不是 主键 就得指定字段名
+	var user ColdpUser
+	sql := fmt.Sprintf("SELECT * FROM `cold_user` WHERE ID = '%v'", userID)
+	err := o.Raw(sql).QueryRow(&user)
 	if err != nil {
 		fmt.Println(err)
+		return err, user
 	}
-	log.Println(m)
-	return false
+	log.Println(user)
+	return nil, user
 }
 func DeleteById(m ColdpUser) bool {
 	o := orm.NewOrm()

routers/company.go

@@ -12,4 +12,6 @@ func init() {
 	beego.Router("/User/update", &controllers.CompanyController{}, "*:UpdateUserStateById")
 	beego.Router("/User/delete", &controllers.CompanyController{}, "*:DeleteUserById")
 	beego.Router("/User/add", &controllers.CompanyController{}, "*:AddUser")
+	beego.Router("/User/detail", &controllers.CompanyController{}, "*:GetUserById")
+	beego.Router("/User/updateUser", &controllers.CompanyController{}, "*:UpdateUser")
 }

views/Device/Device.html

@@ -409,7 +409,8 @@
                         layui.layer.closeAll('loading');
                         if (rlt.Code === 200) {
                             layui.layer.msg(rlt.Msg);
-                            location.reload()
+                            getDeviceDataList(pageInfo.currentPage)
+                            // location.reload()
                         } else if (rlt.Code === 1201) {
                             if (Array.isArray(rlt.Data) && rlt.Data.length > 0) {
                                 // 构建失败SN的列表字符串

views/User/useredit.html

@@ -126,9 +126,9 @@
                     for (let v of result.list) {
                         let buttonHtml = '';
                         if (v.T_State === 1) {
-                            buttonHtml = `<button onclick="updateUserState('${v.T_State}', '${v.Id}', 0)" class="layui-btn layui-btn-normal layui-btn-sm layui-bg-green">启用</button>`;
+                            buttonHtml = `<button onclick="updateUserState('${v.State}', '${v.Id}', 0)" class="layui-btn layui-btn-normal layui-btn-sm layui-bg-green">启用</button>`;
                         } else if (v.T_State === 0) {
-                            buttonHtml = `<button onclick="updateUserState('${v.T_State}', '${v.Id}', 1)" class="layui-btn layui-btn-normal layui-btn-sm layui-bg-red">禁用</button>`;
+                            buttonHtml = `<button onclick="updateUserState('${v.State}', '${v.Id}', 1)" class="layui-btn layui-btn-normal layui-btn-sm layui-bg-red">禁用</button>`;
                         }
                         let isTrueStyle = v.Is_true === 1 ? 'style="background-color: #00FF97FF;"' : '';
                         b.append(`<tr ${isTrueStyle}>
@@ -140,6 +140,7 @@
                             </td>
                             <td>
                                <button onclick="DeleteUser('${v.Id}')" class="layui-btn layui-btn-normal layui-btn-sm layui-bg-red">删除</button>
+                               <button onclick="showEditUserForm('${v.Id}')" class="layui-btn layui-btn-normal layui-btn-sm">编辑</button>
                             </td>
                         </tr>
                         `)
@@ -261,29 +262,123 @@
         }
         form.on('submit(formDemo)', function (data) {
             console.log(data.field);
-            // 封装成 JSON 对象并打印
             const jsonData = JSON.stringify(data.field);
+            let url = "/User/add";
+            let method = "POST";
+            if (data.field.Id) { // 检查是否存在Id字段
+                url = "/User/updateUser";
+                method = "POST";
+            }
             $.ajax({
-                type: "POST",
-                url: "/User/add",
+                type: method,
+                url: url,
                 data: jsonData,
                 contentType: "application/json",
                 success: function (result) {
                     if (result.Code === 200) {
-                        layui.layer.msg('添加成功');
+                        layui.layer.msg('操作成功');
                         getDeviceDataList(currentPage);
-                        // 添加成功后关闭弹窗
                         layer.closeAll();
                     } else {
                         layui.layer.msg(result.Msg);
                     }
                 },
                 error: function () {
-                    layui.layer.msg('添加失败');
+                    layui.layer.msg('操作失败');
                 }
             });
-            return false; // 阻止表单跳转
+            return false;
+        });
+        // 添加 radio 监听事件
+        form.on('radio(noCompany)', function (data) {
+            if (data.value === '0') {
+                $('#companySelect').removeAttr('lay-verify');
+            } else {
+                $('#companySelect').attr('lay-verify', 'required');
+            }
+            form.render('select'); // 重新渲染select元素
         });
+
+        window.showEditUserForm = function (userId) {
+            layui.layer.open({
+                type: 1,
+                title: '编辑用户',
+                area: ['500px', '400px'],
+                content: `<form class="layui-form" action="" style="margin: 20px;" lay-filter="formDemo">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">用户名</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="T_name" required  placeholder="请输入用户名" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">用户账号</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="T_user" required  placeholder="请输入用户账号" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">密码</label>
+                        <div class="layui-input-block">
+                            <input type="password" lay-affix="eye" name="T_pass"   placeholder="请输入密码" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">公司</label>
+                        <div class="layui-input-block">
+                            <select id="companySelect" name="T_pid"  lay-search>
+                                <option value="">请选择公司</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">是否管理员</label>
+                        <div class="layui-input-block">
+                            <input type="radio" name="noCompany" value="0" title="无公司" lay-filter="noCompany">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-input-block">
+                            <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
+                            <button type="reset" class="layui-btn layui-btn-primary">重置</button>
+                            <button type="button" class="layui-btn layui-btn-primary" onclick="layer.closeAll()">关闭</button>
+                        </div>
+                    </div>
+                    <input type="hidden" name="Id" id="userIdInput">
+                </form>
+            `,
+                success: function (layero, index) {
+                    $.ajax({
+                        type: "GET",
+                        url: "/User/detail?Id=" + userId,
+                        success: function (result) {
+                            let user = result.Data;
+                            console.log("================", user)
+                            $('#companySelect').append(`<option value="${user.T_pid}">${user.T_pid}</option>`); // 修改此处显示公司名称
+                            $('input[name="T_name"]').val(user.T_name);
+                            $('input[name="T_user"]').val(user.T_user);  
+                            $('input[name="T_pass"]').val('');
+                            $('#userIdInput').val(user.Id); // 设置Id字段
+                            form.render('select'); // 重新渲染select元素
+                            form.render('radio'); // 重新渲染radio元素
+                        }
+                    });
+                    $.ajax({
+                        type: "GET",
+                        url: "/company/list",
+                        success: function (result) {
+                            let companySelect = $('#companySelect');
+                            result.Data.forEach(function (company) {
+                                companySelect.append(`<option value="${company.Id}">${company.T_name}</option>`);
+                            });
+                            form.render('select'); // 重新渲染select元素
+                            form.render('radio'); // 重新渲染radio元素
+                        }
+                    });
+                }
+            });
+        }
+
         // 添加 radio 监听事件
         form.on('radio(noCompany)', function (data) {
             if (data.value === '0') {

views/home.html

@@ -72,24 +72,19 @@
 </body>
 <script>
     window.onload = function () {
+        let adduser;
+        let elementsByClassName;
         // 页面加载完成后执行的代码
-        if ({{.T_pid}}!=0){
-             var elementsByClassName = document.querySelector(".getCompany");
-             var adduser = document.querySelector(".adduser");
-             elementsByClassName.style.display = 'none';
-            adduser.style.display = 'none';
-        }else{
-            var elementsByClassName = document.querySelector(".getCompany");
-            var adduser = document.querySelector(".adduser");
-            adduser.style.display = 'block';
-            elementsByClassName.style.display = 'block';
-        }
-        if ({{.names}}=='宝智达-魏公梅'){
-            var elementsByClassName = document.querySelector(".getCompany");
+        if ({{.T_pid}} == 0 || {{.names}} == 'bzdwgm') {
+            elementsByClassName = document.querySelector(".getCompany");
+            adduser = document.querySelector(".adduser");
             elementsByClassName.style.display = 'block';
-        }else{
-            var elementsByClassName = document.querySelector(".getCompany");
+            adduser.style.display = 'block';
+        } else {
+            elementsByClassName = document.querySelector(".getCompany");
+            adduser = document.querySelector(".adduser");
             elementsByClassName.style.display = 'none';
+            adduser.style.display = 'none';
         }
     }