add：小程序传感器统计

controllers/Data.go

@@ -48,7 +48,7 @@ func (c *DataController) Device_Sensor_Get() {
 
 	DeviceSensor_r, err := Device.Read_DeviceSensor_ByTsn_Tid(T_sn, T_id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "获取失败!"}
 		c.ServeJSON()
 		return
 	}
@@ -265,7 +265,7 @@ func (c *DataController) Device_Sensor_Data_Excel() {
 	// 上传 OSS
 	url, is := NatsServer.Qiniu_UploadFile(lib.GetCurrentDirectory()+"/ofile/"+timeStr+".xlsx", "ofile/"+timeStr+".xlsx")
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "oss!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "oss!"}
 		c.ServeJSON()
 		return
 	}
@@ -383,7 +383,7 @@ func (c *DataController) Device_Sensor_Data_Excel_m() {
 	// 上传 OSS
 	url, is := NatsServer.Qiniu_UploadFile(lib.GetCurrentDirectory()+"/ofile/"+timeStr+".xlsx", "ofile/"+timeStr+".xlsx")
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "oss!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "oss!"}
 		c.ServeJSON()
 		return
 	}
@@ -470,13 +470,13 @@ func (c *DataController) Device_Sensor_Data_PDF() {
 
 	err = pdf.AddTTFFont("simsun", "static/fonts/三极行楷简体-粗.ttf")
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
 		c.ServeJSON()
 		return
 	}
 	err = pdf.SetFont("simsun", "", 24)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
 		c.ServeJSON()
 		return
 	}
@@ -503,13 +503,13 @@ func (c *DataController) Device_Sensor_Data_PDF() {
 
 	err = pdf.AddTTFFont("wts", "static/fonts/MiSans-Medium.ttf")
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 206, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
 		c.ServeJSON()
 		return
 	}
 	err = pdf.SetFont("wts", "", 12)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
 		c.ServeJSON()
 		return
 	}
@@ -530,7 +530,7 @@ func (c *DataController) Device_Sensor_Data_PDF() {
 
 	err = pdf.SetFont("wts", "", 10)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
 		c.ServeJSON()
 		return
 	}
@@ -571,7 +571,7 @@ func (c *DataController) Device_Sensor_Data_PDF() {
 
 	err = pdf.WritePdf(timeStr)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
 		c.ServeJSON()
 		return
 	}
@@ -579,7 +579,7 @@ func (c *DataController) Device_Sensor_Data_PDF() {
 	// 上传 OSS
 	url, is := NatsServer.Qiniu_UploadFile(lib.GetCurrentDirectory()+"/"+timeStr, timeStr)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "oss!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "oss!"}
 		c.ServeJSON()
 		return
 	}
@@ -678,13 +678,13 @@ func (c *DataController) Device_Sensor_Data_BackUp_PDF() {
 
 	err = pdf.AddTTFFont("simsun", "static/fonts/三极行楷简体-粗.ttf")
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
 		c.ServeJSON()
 		return
 	}
 	err = pdf.SetFont("simsun", "", 24)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
 		c.ServeJSON()
 		return
 	}
@@ -711,13 +711,13 @@ func (c *DataController) Device_Sensor_Data_BackUp_PDF() {
 
 	err = pdf.AddTTFFont("wts", "static/fonts/MiSans-Medium.ttf")
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 206, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "ok!", Data: err}
 		c.ServeJSON()
 		return
 	}
 	err = pdf.SetFont("wts", "", 12)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
 		c.ServeJSON()
 		return
 	}
@@ -738,7 +738,7 @@ func (c *DataController) Device_Sensor_Data_BackUp_PDF() {
 
 	err = pdf.SetFont("wts", "", 10)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
 		c.ServeJSON()
 		return
 	}
@@ -782,7 +782,7 @@ func (c *DataController) Device_Sensor_Data_BackUp_PDF() {
 
 	err = pdf.WritePdf(filenameStr)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 207, Msg: "ok!", Data: err}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: err.Error()}
 		c.ServeJSON()
 		return
 	}
@@ -790,7 +790,7 @@ func (c *DataController) Device_Sensor_Data_BackUp_PDF() {
 	// 上传 OSS
 	url, is := NatsServer.Qiniu_UploadFile(lib.GetCurrentDirectory()+"/"+filenameStr, filenameStr)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "oss!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "oss!"}
 		c.ServeJSON()
 		return
 	}

controllers/Device.go

@@ -83,12 +83,12 @@ func (c *DeviceController) Device_Get() {
 	T_sn := c.GetString("T_sn")
 	Device_r, err := Device.Read_Device_ByT_sn(T_sn)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 303, Msg: "查询失败！"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "查询失败！"}
 		c.ServeJSON()
 		return
 	}
 	if Device_r.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 303, Msg: "无权查看！"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "无权查看！"}
 		c.ServeJSON()
 		return
 	}
@@ -112,14 +112,14 @@ func (c *DeviceController) Device_Add() {
 		T_ish:     1, // 湿度   1开启
 	}
 	if len(T_sn) < 8 {
-		c.Data["json"] = lib.JSONS{Code: 303, Msg: "SN 太短 必须8个字符以上"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "SN 太短 必须8个字符以上"}
 		c.ServeJSON()
 		return
 	}
 
 	_, err = Device.Read_Device_ByT_sn(T_sn)
 	if err == nil {
-		c.Data["json"] = lib.JSONS{Code: 303, Msg: "重复SN！"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "重复SN！"}
 		c.ServeJSON()
 		return
 	}
@@ -152,7 +152,7 @@ func (c *DeviceController) Device_Edit() {
 
 	Device_r, err := Device.Read_Device_ByT_sn(T_SN)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 206, Msg: "T_sn Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_sn Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -208,7 +208,7 @@ func (c *DeviceController) Device_Edit() {
 	}
 
 	if is := Device.Update_Device(Device_r, clos...); !is {
-		c.Data["json"] = lib.JSONS{Code: 200, Msg: "修改失败！"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败！"}
 		c.ServeJSON()
 		return
 	}
@@ -352,7 +352,7 @@ func (c *DeviceController) Device_Parameter_Get() {
 	DeviceParameter_lite := Device.Read_DeviceParameter_SN(Sn)
 	if len(DeviceParameter_lite) == 0 {
 		NatsServer.Read_DeviceParameter(Sn)
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "未同步参数，请检查设备是否正常!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "未同步参数，请检查设备是否正常!"}
 		c.ServeJSON()
 		return
 	}
@@ -385,7 +385,7 @@ func (c *DeviceController) Device_Parameter_Pu() {
 	//
 	//Device_r, err := Device.Read_Device_ByT_sn(T_SN)
 	//if err != nil {
-	//	c.Data["json"] = lib.JSONS{Code: 206, Msg: "T_sn Err!"}
+	//	c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_sn Err!"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -410,7 +410,7 @@ func (c *DeviceController) Device_Parameter_Pu() {
 	//}
 	//Deviceparameter, is := Device.Add_DeviceParameter(Deviceparameter)
 	//if !is {
-	//	c.Data["json"] = lib.JSONS{Code: 203, Msg: "Add_DeviceParameter ERR"}
+	//	c.Data["json"] = lib.JSONS{Code: 202, Msg: "Add_DeviceParameter ERR"}
 	//	c.ServeJSON()
 	//	return
 	//}
@@ -426,13 +426,13 @@ func (c *DeviceController) Device_Parameter_Pu() {
 
 	Device_r, err := Device.Read_Device_ByT_sn(T_SN)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 206, Msg: "T_sn Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_sn Err!"}
 		c.ServeJSON()
 		return
 	}
 	DeviceParameter_lite := Device.Read_DeviceParameter_SN(T_SN)
 	if len(DeviceParameter_lite) == 0 {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "未同步参数，请检查设备是否正常!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "未同步参数，请检查设备是否正常!"}
 		c.ServeJSON()
 		return
 	}
@@ -490,7 +490,7 @@ func (c *DeviceController) Device_Parameter_Pu() {
 
 	Deviceparameter, is := Device.Add_DeviceParameter(DeviceParameter)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "Add_DeviceParameter ERR"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Add_DeviceParameter ERR"}
 		c.ServeJSON()
 		return
 	}
@@ -554,8 +554,8 @@ func (c *DeviceController) DeviceSensor_List() {
 	}
 
 	T_sn := c.GetString("T_sn")
-	Name := c.GetString("T_name") //  包含 T_name、T_sn
-	T_calss_id, _ := c.GetInt("T_calssid")
+	T_name := c.GetString("T_name") //  包含 T_name、T_sn
+	T_class_id, _ := c.GetInt("T_calssid")
 	T_type, T_type_err := c.GetInt("T_type")
 	if T_type_err != nil {
 		T_type = -1
@@ -568,21 +568,21 @@ func (c *DeviceController) DeviceSensor_List() {
 	if T_datashow_err != nil {
 		T_datashow = -1
 	}
-	if T_calss_id > 0 {
-		R_DeviceClass, err := Company.Read_CompanyClass_ById(T_calss_id)
+	if T_class_id > 0 {
+		R_DeviceClass, err := Company.Read_CompanyClass_ById(T_class_id)
 		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_class_id Err!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class_id Err!"}
 			c.ServeJSON()
 			return
 		}
 		if R_DeviceClass.T_pid != c.T_pid {
-			c.Data["json"] = lib.JSONS{Code: 205, Msg: "R_DeviceClass.T_pid  ！= T_pid Err!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "R_DeviceClass.T_pid  ！= T_pid Err!"}
 			c.ServeJSON()
 			return
 		}
 	}
 	Device.Read_DeviceSensorParameter_All_Map(T_sn, 0)
-	r_jsons.Data, r_jsons.Num = Device.Read_DeviceSensorList(c.Admin_r, c.T_pid, T_sn, Name, T_calss_id, T_datashow, T_type, T_State, page, page_z)
+	r_jsons.Data, r_jsons.Num = Device.Read_DeviceSensorList(c.Admin_r, c.T_pid, T_sn, T_name, T_class_id, T_datashow, T_type, T_State, page, page_z)
 	r_jsons.Page = page
 	r_jsons.Page_size = int(math.Ceil(float64(r_jsons.Num) / float64(page_z)))
 
@@ -599,13 +599,18 @@ func (c *DeviceController) DeviceSensor_Edit() {
 
 	DeviceSensor, is := Device.Read_DeviceSensor_ByT_sn(Sn, Id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "信息错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "信息错误!"}
 		c.ServeJSON()
 		return
 	}
 
 	// 数据视图3D视图订阅
 	if v, err := c.GetInt("T_type"); err == nil {
+		if v == 0 {
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "类型错误！"}
+			c.ServeJSON()
+			return
+		}
 		DeviceSensor.T_type = v
 		Device.Update_DeviceSensor(DeviceSensor, "T_type")
 		System.Add_UserLogs_T(c.Admin_r.T_uuid, "设备管理", "传感器 类型", "SN:"+Sn+" ["+strconv.Itoa(Id)+"]"+strconv.Itoa(v))
@@ -644,7 +649,7 @@ func (c *DeviceController) DeviceSensor_Del() {
 
 	_, is := Device.Read_DeviceSensor_ByT_sn(Sn, Id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "信息错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "信息错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -678,7 +683,7 @@ func (c *DeviceController) DeviceSensor_Parameter_Get() {
 	DeviceSensorParameter_lite := Device.Read_DeviceSensorParameter_T_sn_T_id(Sn, Id)
 	if len(DeviceSensorParameter_lite) == 0 {
 		NatsServer.Read_DeviceSensorParameter(Sn)
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "未同步参数，请检查设备是否正常!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "未同步参数，请检查设备是否正常!"}
 		c.ServeJSON()
 		return
 	}
@@ -715,21 +720,21 @@ func (c *DeviceController) DeviceSensor_Parameter_Pu() {
 	T_id, _ := c.GetInt("T_id")
 	_, err := Device.Read_Device_ByT_sn(T_SN)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 206, Msg: "T_sn Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_sn Err!"}
 		c.ServeJSON()
 		return
 	}
 
 	DeviceSensor, is := Device.Read_DeviceSensor_ByT_sn(T_SN, T_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 208, Msg: "T_sn T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_sn T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 
 	DeviceSensorParameter, is := Device.Read_DeviceSensorParameter(T_SN, T_id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 208, Msg: "T_sn T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_sn T_id Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -814,7 +819,7 @@ func (c *DeviceController) DeviceSensor_Parameter_Pu() {
 
 	Devicesensorparameter, is = Device.Add_DeviceSensorParameter(Devicesensorparameter)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 209, Msg: "Add_DeviceSensorParameter Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Add_DeviceSensorParameter Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -824,7 +829,7 @@ func (c *DeviceController) DeviceSensor_Parameter_Pu() {
 	if len(T_name) > 0 {
 		DeviceSensor.T_name = T_name
 		if is = Device.Update_DeviceSensor(DeviceSensor, "T_name"); !is {
-			c.Data["json"] = lib.JSONS{Code: 209, Msg: "Update_DeviceSensor Err!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "Update_DeviceSensor Err!"}
 			c.ServeJSON()
 			return
 		}
@@ -848,7 +853,7 @@ func (c *DeviceController) UpDeviceSensor_Tsort() {
 
 	DeviceSensor, is := Device.Read_DeviceSensor_ByT_sn(Sn, Id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "信息错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "信息错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -871,7 +876,7 @@ func (c *DeviceController) UpDeviceSensor_T3dview() {
 
 	DeviceSensor, is := Device.Read_DeviceSensor_ByT_sn(Sn, Id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "信息错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "信息错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -893,7 +898,7 @@ func (c *DeviceController) UpDeviceSensor_T_datashow() {
 
 	DeviceSensor, is := Device.Read_DeviceSensor_ByT_sn(Sn, Id)
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "信息错误!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "信息错误!"}
 		c.ServeJSON()
 		return
 	}
@@ -933,12 +938,12 @@ func (c *DeviceController) DeviceSensor_Manage_List() {
 	if T_calss_id > 0 {
 		R_DeviceClass, err := Company.Read_CompanyClass_ById(T_calss_id)
 		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_class_id Err!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class_id Err!"}
 			c.ServeJSON()
 			return
 		}
 		if R_DeviceClass.T_pid != c.T_pid {
-			c.Data["json"] = lib.JSONS{Code: 205, Msg: "CompanyClass.T_pid != T_pid Err!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "CompanyClass.T_pid != T_pid Err!"}
 			c.ServeJSON()
 			return
 		}
@@ -998,7 +1003,7 @@ func (c *DeviceController) DeviceTask_List() {
 	Time_end := c.GetString("Time_end")
 
 	if len(T_sn) < 6 {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_sn!!!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_sn!!!"}
 		c.ServeJSON()
 		return
 	}
@@ -1065,7 +1070,7 @@ func (c *DeviceController) DeviceWarning_List() {
 	if T_history == 1 {
 		date, err := time.Parse("2006-01-02 15:04:05", Time_start)
 		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 200, Msg: "时间格式错误"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "时间格式错误"}
 			c.ServeJSON()
 			return
 		}
@@ -1125,7 +1130,7 @@ func (c *DeviceController) DeviceWarning_Post() {
 	if T_history == 1 {
 		date, err := time.Parse("2006-01-02 15:04:05", T_time)
 		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 200, Msg: "时间格式错误"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "时间格式错误"}
 			c.ServeJSON()
 			return
 		}
@@ -1133,14 +1138,14 @@ func (c *DeviceController) DeviceWarning_Post() {
 		Wtab += "_" + T_year + "_" + T_month
 		warning, err = Warning.Read_Warning_ById_Backups(id, T_year, T_month)
 		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 206, Msg: "T_id Err!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 			c.ServeJSON()
 			return
 		}
 		warning.T_Text = T_Text
 		warning.T_State = 2
 		if is := Warning.Update_Warning_Backups(warning, T_year, T_month); !is {
-			c.Data["json"] = lib.JSONS{Code: 206, Msg: "修改失败!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 			c.ServeJSON()
 			return
 		}
@@ -1148,14 +1153,14 @@ func (c *DeviceController) DeviceWarning_Post() {
 	} else {
 		warning = Warning.Read_Warning_ById(int64(id))
 		if warning.Id == 0 {
-			c.Data["json"] = lib.JSONS{Code: 206, Msg: "T_id Err!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 			c.ServeJSON()
 			return
 		}
 		warning.T_Text = T_Text
 		warning.T_State = 2
 		if is := Warning.Update_Warning(warning, "T_Text", "T_State"); !is {
-			c.Data["json"] = lib.JSONS{Code: 206, Msg: "修改失败!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 			c.ServeJSON()
 			return
 		}
@@ -1179,7 +1184,7 @@ func (c *DeviceController) DeviceWarning_Del() {
 	if T_history == 1 {
 		date, err := time.Parse("2006-01-02 15:04:05", T_time)
 		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 200, Msg: "时间格式错误"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "时间格式错误"}
 			c.ServeJSON()
 			return
 		}
@@ -1188,13 +1193,13 @@ func (c *DeviceController) DeviceWarning_Del() {
 
 		warning, err = Warning.Read_Warning_ById_Backups(id, T_year, T_month)
 		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 206, Msg: "T_id Err!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 			c.ServeJSON()
 			return
 		}
 		warning.T_State = 0
 		if is := Warning.Update_Warning_Backups(warning, T_year, T_month); !is {
-			c.Data["json"] = lib.JSONS{Code: 206, Msg: "删除失败!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
 			c.ServeJSON()
 			return
 		}
@@ -1202,13 +1207,13 @@ func (c *DeviceController) DeviceWarning_Del() {
 	} else {
 		warning = Warning.Read_Warning_ById(int64(id))
 		if warning.Id == 0 {
-			c.Data["json"] = lib.JSONS{Code: 206, Msg: "T_id Err!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 			c.ServeJSON()
 			return
 		}
 		warning.T_State = 0
 		if is := Warning.Update_Warning(warning, "T_Text", "T_State"); !is {
-			c.Data["json"] = lib.JSONS{Code: 206, Msg: "删除失败!"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
 			c.ServeJSON()
 			return
 		}
@@ -1233,7 +1238,7 @@ func (c *DeviceController) DeviceWarning_Data_Excel() {
 	if T_history == 1 {
 		date, err := time.Parse("2006-01-02 15:04:05", Time_start)
 		if err != nil {
-			c.Data["json"] = lib.JSONS{Code: 200, Msg: "时间格式错误"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "时间格式错误"}
 			c.ServeJSON()
 			return
 		}
@@ -1293,7 +1298,7 @@ func (c *DeviceController) DeviceWarning_Data_Excel() {
 
 	url, is := NatsServer.Qiniu_UploadFile(lib.GetCurrentDirectory()+"/ofile/"+timeStr+".xlsx", "ofile/"+timeStr+".xlsx")
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "oss!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "oss!"}
 		c.ServeJSON()
 		return
 	}
@@ -1391,12 +1396,12 @@ func (c *DeviceController) CompanyClass_Get() {
 	id, _ := c.GetInt("T_id")
 	R_DeviceClass, err := Company.Read_CompanyClass_ById(id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceClass.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -1414,7 +1419,7 @@ func (c *DeviceController) CompanyClass_Add() {
 
 	Id, err := Company.Add_CompanyClass(t_c)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "添加失败"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败"}
 		c.ServeJSON()
 		return
 	}
@@ -1429,12 +1434,12 @@ func (c *DeviceController) CompanyClass_Edit() {
 	id, _ := c.GetInt("T_id")
 	R_DeviceClass, err := Company.Read_CompanyClass_ById(id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceClass.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -1444,7 +1449,7 @@ func (c *DeviceController) CompanyClass_Edit() {
 	}
 
 	if is := Company.Update_CompanyClass(R_DeviceClass, "T_name"); !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "修改失败"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败"}
 		c.ServeJSON()
 		return
 	}
@@ -1459,17 +1464,17 @@ func (c *DeviceController) CompanyClass_Del() {
 	id, _ := c.GetInt("T_id")
 	R_DeviceClass, err := Company.Read_CompanyClass_ById(id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceClass.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
 	if is := Company.Delete_CompanyClass_ById(id); !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "删除失败"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败"}
 		c.ServeJSON()
 		return
 	}
@@ -1511,12 +1516,12 @@ func (c *DeviceController) DeviceClassBind_List() {
 	T_type, _ := c.GetInt("T_type")
 	R_DeviceClass, err := Company.Read_CompanyClass_ById(T_class_id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_class_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceClass.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -1547,25 +1552,25 @@ func (c *DeviceController) ClassBind_Add() {
 		return
 	}
 	if _, err := Device.Read_Device_ByT_sn(T_sn); err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	R_DeviceClass, err := Company.Read_CompanyClass_ById(T_class_id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_class_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceClass.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
 
 	DeviceSensor_class_list := Device.Read_DeviceSensor_ALL_T_sn_T_id_T_Class(T_sn, T_id, T_class_id)
 	if len(DeviceSensor_class_list) > 0 {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "重复绑定!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "重复绑定!"}
 		c.ServeJSON()
 		return
 	}
@@ -1591,18 +1596,18 @@ func (c *DeviceController) ClassBind_Del() {
 		return
 	}
 	if _, err := Device.Read_Device_ByT_sn(T_sn); err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	R_DeviceClass, err := Company.Read_CompanyClass_ById(T_class_id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_class_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceClass.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -1680,12 +1685,12 @@ func (c *DeviceController) CompanyNotice_Get() {
 	id, _ := c.GetInt("T_id")
 	R_DeviceNotice, err := Company.Read_CompanyNotice_ById(id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceNotice.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -1704,7 +1709,7 @@ func (c *DeviceController) CompanyNotice_Add() {
 
 	Id, err := Company.Add_CompanyNotice(t_c)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "添加失败"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败"}
 		c.ServeJSON()
 		return
 	}
@@ -1726,12 +1731,12 @@ func (c *DeviceController) CompanyNotice_Edit() {
 
 	R_DeviceNotice, err := Company.Read_CompanyNotice_ById(id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceNotice.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -1775,7 +1780,7 @@ func (c *DeviceController) CompanyNotice_Edit() {
 	}
 
 	if err = Company.Update_CompanyNotice(R_DeviceNotice, "T_name", "T_Notice_wx", "T_Notice_wx2", "T_Notice_phone", "T_Notice_message", "T_Notice_mailbox", "T_Notice_mechanism"); err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "修改失败"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败"}
 		c.ServeJSON()
 		return
 	}
@@ -1791,12 +1796,12 @@ func (c *DeviceController) CompanyNotice_Reset_Mechanism() {
 
 	R_DeviceNotice, err := Company.Read_CompanyNotice_ById(id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceNotice.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -1804,7 +1809,7 @@ func (c *DeviceController) CompanyNotice_Reset_Mechanism() {
 	R_DeviceNotice.T_Notice_mechanism = Warning.Read_WarningType_All_T_Notice_mechanism()
 
 	if err = Company.Update_CompanyNotice(R_DeviceNotice, "T_Notice_mechanism"); err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "修改失败"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败"}
 		c.ServeJSON()
 		return
 	}
@@ -1819,17 +1824,17 @@ func (c *DeviceController) CompanyNotice_Del() {
 	id, _ := c.GetInt("T_id")
 	R_DeviceNotice, err := Company.Read_CompanyNotice_ById(id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceNotice.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
 	if is := Company.Delete_CompanyNotice_ById(id); !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "删除失败"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败"}
 		c.ServeJSON()
 		return
 	}
@@ -1870,12 +1875,12 @@ func (c *DeviceController) DeviceNoticeBind_List() {
 
 	R_DeviceNotice, err := Company.Read_CompanyNotice_ById(T_notice_id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_class_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceNotice.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -1906,25 +1911,25 @@ func (c *DeviceController) NoticeBind_Add() {
 		return
 	}
 	if _, err := Device.Read_Device_ByT_sn(T_sn); err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	R_CompanyNotice, err := Company.Read_CompanyNotice_ById(T_notice_id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_class_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_CompanyNotice.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
 
 	DeviceSensor_Notice_list := Device.Read_DeviceSensor_ALL_T_sn_T_id_T_Notice(T_sn, T_id, T_notice_id)
 	if len(DeviceSensor_Notice_list) > 0 {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "重复绑定!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "重复绑定!"}
 		c.ServeJSON()
 		return
 	}
@@ -1957,18 +1962,18 @@ func (c *DeviceController) NoticeBind_Del() {
 		return
 	}
 	if _, err := Device.Read_Device_ByT_sn(T_sn); err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	R_DeviceClass, err := Company.Read_CompanyNotice_ById(T_notice_id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_class_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_class_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	if R_DeviceClass.T_pid != c.T_pid {
-		c.Data["json"] = lib.JSONS{Code: 205, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -1998,8 +2003,8 @@ func (c *DeviceController) NoticeBind_Del() {
 	return
 }
 
-// 设备类型
-func (c *DeviceController) DeviceType_List_All() {
+// 传感器类型
+func (c *DeviceController) DeviceSensorType_List_All() {
 	type R_JSONS struct {
 		//必须的大写开头
 		Data      []Device.DeviceSensorType
@@ -2016,3 +2021,131 @@ func (c *DeviceController) DeviceType_List_All() {
 	c.ServeJSON()
 	return
 }
+
+// 传感器类型 - 小程序
+func (c *DeviceController) DeviceSensorType_List() {
+
+	var r_jsons lib.R_JSONS
+
+	list, err := Device.Read_DeviceSensor_T_type(c.T_pid)
+	if err != nil {
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "查询失败!"}
+		c.ServeJSON()
+		return
+	}
+
+	var ids []int
+	for _, v := range list {
+		id, _ := strconv.Atoi(v.(string))
+		ids = append(ids, id)
+	}
+	r_jsons.Data = Device.Read_DeviceSensorType_List_By_Ids(ids)
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
+	c.ServeJSON()
+	return
+}
+
+// 传感器统计 - 小程序
+func (c *DeviceController) DeviceSensor_Stat() {
+
+	type Monitor struct {
+		Count       int64
+		Monitor     int64
+		Unmonitored int64
+		NoNetwork   int64
+	}
+
+	type R_JSONS struct {
+		//必须的大写开头
+		Data      interface{}
+		Monitor   Monitor
+		Num       int64
+		Page      int
+		Page_size int
+	}
+
+	var monitor Monitor
+	var monitorList, unmonitoredList, noNetworkList []Device.DeviceSensor_R
+	var r_jsons R_JSONS
+
+	page, _ := c.GetInt("page")
+	if page < 1 {
+		page = 1
+	}
+	page_z, _ := c.GetInt("page_z")
+	if page_z < 1 {
+		page_z = conf.Page_size
+	}
+
+	T_name := c.GetString("T_name")
+	T_monitor, _ := c.GetInt("T_monitor")
+
+	T_type, T_type_err := c.GetInt("T_type")
+	if T_type_err != nil {
+		T_type = -1
+	}
+
+	list, num := Device.Read_DeviceSensor_List_For_Stat(c.T_pid, T_name, T_type)
+	monitor.Count = num
+	for _, v := range list {
+		// 0 未监控 1 监控 2 无网络
+		switch v.T_monitor {
+		case 0:
+			monitor.Unmonitored += 1
+			unmonitoredList = append(unmonitoredList, v)
+		case 1:
+			monitor.Monitor += 1
+			monitorList = append(monitorList, v)
+		case 2:
+			monitor.NoNetwork += 1
+			noNetworkList = append(noNetworkList, v)
+		}
+	}
+
+	var offset_z int
+	offset := conf.Page_size
+	if page <= 1 {
+		offset = 0
+	} else {
+		page -= 1
+		offset = page * page_z
+	}
+
+	offset_z = offset + page_z
+
+	// 0 未监控 1 监控 2 无网络
+	switch T_monitor {
+	case 0:
+		r_jsons.Num = monitor.Unmonitored
+		if r_jsons.Num < int64(offset_z) {
+			offset_z = int(r_jsons.Num)
+		}
+		r_jsons.Data = unmonitoredList[offset:offset_z]
+	case 1:
+		r_jsons.Num = monitor.Monitor
+		if r_jsons.Num < int64(offset_z) {
+			offset_z = int(r_jsons.Num)
+		}
+		r_jsons.Data = monitorList[offset:offset_z]
+	case 2:
+		r_jsons.Num = monitor.NoNetwork
+		if r_jsons.Num < int64(offset_z) {
+			offset_z = int(r_jsons.Num)
+		}
+		r_jsons.Data = noNetworkList[offset:offset_z]
+	case 3:
+		r_jsons.Num = monitor.Count
+		if r_jsons.Num < int64(offset_z) {
+			offset_z = int(r_jsons.Num)
+		}
+		r_jsons.Data = list[offset:offset_z]
+	}
+
+	r_jsons.Monitor = monitor
+	r_jsons.Page = page
+	r_jsons.Page_size = int(math.Ceil(float64(r_jsons.Num) / float64(page_z)))
+
+	c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}
+	c.ServeJSON()
+	return
+}

controllers/Product.go

@@ -93,7 +93,7 @@ func (c *ProductController) ProductUpgrade_Add() {
 
 	Id, err := Product.Add_ProductUpgrade(var_)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "添加失败"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "添加失败"}
 		c.ServeJSON()
 		return
 	}
@@ -115,13 +115,13 @@ func (c *ProductController) ProductUpgrade_Del() {
 
 	_, err := Product.Read_ProductUpgrade_ById(id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 
 	if is := Product.Delete_ProductUpgrade_ById(id); !is {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "删除失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
 		c.ServeJSON()
 		return
 	}

controllers/RawSql.go

@@ -93,7 +93,7 @@ func (c *RawSqlController) List_Del() {
 		RawSql_r := RawSql.Read_RawSql_ById(Id)
 		RawSql.Delete_RawSql(RawSql_r)
 	} else {
-		c.Data["json"] = lib.JSONS{Code: 201, Msg: "e!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "e!"}
 		c.ServeJSON()
 		return
 	}
@@ -108,13 +108,13 @@ func (c *RawSqlController) List_Del() {
 func (c *RawSqlController) Raw() {
 	T_id := c.GetString("T_id")
 	if len(T_id) != 5 {
-		c.Data["json"] = lib.JSONS{Code: 203, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}
 	RawSql_r := RawSql.Read_RawSql_ByT_id(T_id)
 	if RawSql_r.Id == 0 {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "T_id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_id Err!"}
 		c.ServeJSON()
 		return
 	}

controllers/User.go

@@ -116,7 +116,7 @@ func (c *UserController) Company_Add() {
 	if c.Admin_r.T_pids != "*" {
 		T_pids := []int{int(id)}
 		if err = Account.Add_Company_bind(c.Admin_r, T_pids); err != nil {
-			c.Data["json"] = lib.JSONS{Code: 200, Msg: "公司绑定失败"}
+			c.Data["json"] = lib.JSONS{Code: 202, Msg: "公司绑定失败"}
 			c.ServeJSON()
 			return
 		}
@@ -179,14 +179,14 @@ func (c *UserController) Company_Del() {
 
 	Id, Id_err := c.GetInt("Id")
 	if Id_err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "Id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id Err!"}
 		c.ServeJSON()
 		return
 	}
 
 	Company_r, err := Account.Read_Company_ById(Id)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "Id Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "Id Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -345,7 +345,7 @@ func (c *UserController) User_Post() {
 	}
 	is := Account.Update_Admin(admin_r, "T_name", "T_pass", "T_phone", "T_mail", "T_wx")
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "修改失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
 	}
@@ -450,7 +450,7 @@ func (c *UserController) User_Edit() {
 
 	is := Account.Update_Admin(r, "T_power", "T_pid", "T_name", "T_pass", "T_phone", "T_mail")
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "修改失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
 	}
@@ -482,7 +482,7 @@ func (c *UserController) User_Del() {
 		return
 	}
 	if is := Account.Delete_Admin(admin_r_lod); !is {
-		c.Data["json"] = lib.JSONS{Code: 200, Msg: "删除失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
 		c.ServeJSON()
 		return
 	}
@@ -680,7 +680,7 @@ func (c *UserController) Admin_Edit() {
 
 	is := Account.Update_Admin(r, "T_power", "T_name", "T_pass", "T_phone", "T_mail", "T_wx")
 	if !is {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "修改失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "修改失败!"}
 		c.ServeJSON()
 		return
 	}
@@ -717,7 +717,7 @@ func (c *UserController) Admin_Del() {
 		return
 	}
 	if is := Account.Delete_Admin(admin_r_lod); !is {
-		c.Data["json"] = lib.JSONS{Code: 200, Msg: "删除失败!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "删除失败!"}
 		c.ServeJSON()
 		return
 	}
@@ -807,7 +807,7 @@ func (c *UserController) AdminCompanyBind_Add() {
 
 	Company_r, err := Account.Read_Company_ById(T_pid)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -815,7 +815,7 @@ func (c *UserController) AdminCompanyBind_Add() {
 	T_pids := Account.ReadCompanyIds_T_path(Company_r.T_path)
 
 	if err = Account.Add_Company_bind(r, T_pids); err != nil {
-		c.Data["json"] = lib.JSONS{Code: 200, Msg: "公司绑定失败"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "公司绑定失败"}
 		c.ServeJSON()
 		return
 	}
@@ -842,7 +842,7 @@ func (c *UserController) AdminCompanyBind_Del() {
 	r, err := Account.Read_Admin_ByUuid(T_uuid)
 	Company_r, err := Account.Read_Company_ById(T_pid)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 204, Msg: "T_pid Err!"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "T_pid Err!"}
 		c.ServeJSON()
 		return
 	}
@@ -850,7 +850,7 @@ func (c *UserController) AdminCompanyBind_Del() {
 	T_pids := Account.ReadCompanyIds_T_path(Company_r.T_path)
 
 	if err = Account.Delete_Company_bind(r, T_pids); err != nil {
-		c.Data["json"] = lib.JSONS{Code: 200, Msg: "公司绑定失败"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "公司绑定失败"}
 		c.ServeJSON()
 		return
 	}
@@ -1088,7 +1088,7 @@ func (c *UserController) User_Menu_List() {
 	var r_jsons R_JSONS
 	power, err := Account.Read_Power_ById(c.Admin_r.T_power)
 	if err != nil {
-		c.Data["json"] = lib.JSONS{Code: 200, Msg: "获取菜单失败"}
+		c.Data["json"] = lib.JSONS{Code: 202, Msg: "获取菜单失败"}
 		c.ServeJSON()
 		return
 	}

controllers/lib/Qiniu.go

@@ -27,7 +27,7 @@ func init() {
 }
 
 // if !lib.Pload_qiniu("ofile/"+timeStr+".xlsx","ofile/"+timeStr+".xlsx"){
-// c.Data["json"] = lib.JSONS{Code: 203, Msg: "oss!"}
+// c.Data["json"] = lib.JSONS{Code: 202, Msg: "oss!"}
 // c.ServeJSON()
 // return
 // }

main.go

@@ -47,7 +47,6 @@ func main() {
 		// 如果设置，则允许共享身份验证凭据，例如cookie
 		AllowCredentials: true,
 	}))
-	beego.ErrorController(&controllers.ErrorController{})
 	//过滤器，拦截所有请求
 	beego.InsertFilter("/*", beego.BeforeRouter, routers.RBACFilter)
 	beego.BConfig.AppName = conf.AppName                    // 项目名

models/Account/Company.go

@@ -27,6 +27,7 @@ type Company struct {
 
 	T_path string `orm:"size(256);null"` // 公司路径 /0/1/5/
 
+	T_money    float32   `orm:"digits(12);decimals(2)"`
 	T_State    int       `orm:"size(200);default(1)"`                                  //  0删除  1 正常
 	CreateTime time.Time `orm:"column(create_time);type(timestamp);null;auto_now_add"` //auto_now 每次 model 保存时都会对时间自动更新
 	UpdateTime time.Time `orm:"column(update_time);type(timestamp);null;auto_now"`     //auto_now_add 第一次保存时才设置时间
@@ -36,11 +37,12 @@ type Company struct {
 
 type Company_R struct {
 	Id       int
-	T_mid    int    // 上一级 ID
-	T_name   string // 公司名称
-	T_plan   string // 平面图
-	T_data   string // 大数据
-	T_v3d    string // 3D 视图
+	T_mid    int     // 上一级 ID
+	T_name   string  // 公司名称
+	T_plan   string  // 平面图
+	T_data   string  // 大数据
+	T_v3d    string  // 3D 视图
+	T_money  float32 // 余额
 	Children []Company_R
 }
 
@@ -51,6 +53,7 @@ func CompanyToCompany_R(r Company) (v Company_R) {
 	v.T_plan = r.T_plan
 	v.T_data = r.T_data
 	v.T_v3d = r.T_v3d
+	v.T_money = r.T_money
 	return v
 }
 

models/Device/DeviceSensor.go

@@ -818,3 +818,56 @@ func Read_DeviceSensor_List_For_Data(T_pid int, T_name string, T_Class_id, T_typ
 	}
 	return DeviceSensor_r, cnt
 }
+
+// 获取列表
+func Read_DeviceSensor_T_type(T_pid int) (lists orm2.ParamsList, err error) {
+	o := orm.NewOrm()
+	var pl_lists orm2.ParamsList
+	_, err = o.Raw("SELECT DISTINCT t_type FROM device_sensor WHERE t_pid=? LIMIT 0,1000", T_pid).ValuesFlat(&pl_lists)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return
+	}
+
+	return pl_lists, nil
+}
+
+// 数据展示菜单下 传感器参数列表
+func Read_DeviceSensor_List_For_Stat(T_pid int, T_name string, T_type int) (DeviceSensor_r []DeviceSensor_R, cnt int64) {
+
+	o := orm.NewOrm()
+	// 也可以直接使用 Model 结构体作为表名
+
+	qs := o.QueryTable(new(DeviceSensor))
+
+	var r []DeviceSensor
+	cond := orm.NewCondition()
+	cond1 := cond.And("T_pid", T_pid).And("T_State", 1)
+
+	if T_type > 0 {
+		cond1 = cond1.And("T_type", T_type)
+	}
+
+	if len(T_name) == 16 {
+		cond1 = cond1.And("T_sn", T_name)
+	} else {
+		cond1 = cond1.And("T_name__icontains", T_name).And("T_datashow", 1)
+	}
+
+	_, err := qs.SetCond((*orm2.Condition)(cond1)).OrderBy("T_sort", "T_id").All(&r)
+
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return
+	}
+	cnt, err = qs.SetCond((*orm2.Condition)(cond1)).Count()
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return
+	}
+
+	for _, v := range r {
+		DeviceSensor_r = append(DeviceSensor_r, DeviceSensorToDeviceSensor_R(v))
+	}
+	return DeviceSensor_r, cnt
+}

models/Device/DeviceSensorType.go

@@ -92,3 +92,17 @@ func Read_DeviceSensorType_Get(Id int) (r DeviceSensorType) {
 		return r
 	}
 }
+
+func Read_DeviceSensorType_List_By_Ids(Ids []int) (r []DeviceSensorType) {
+
+	o := orm.NewOrm()
+	// 也可以直接使用 Model 结构体作为表名
+	qs := o.QueryTable(new(DeviceSensorType))
+	_, err := qs.Filter("T_State", 1).Filter("Id__in", Ids).All(&r)
+	if err != nil {
+		logs.Error(lib.FuncName(), err)
+		return
+	}
+
+	return r
+}

models/Product/ProductUpgrade.go

@@ -1,7 +1,6 @@
 package Product
 
 import (
-	"Cold_Api/conf"
 	"Cold_Api/controllers/lib"
 	"Cold_Api/logs"
 	"encoding/json"
@@ -173,9 +172,6 @@ func Read_ProductUpgrade_List(T_model string, page int, page_z int) (r []Product
 	var map_r []ProductUpgrade
 	qs := o.QueryTable(new(ProductUpgrade))
 	var offset int64
-	if page_z == 0 {
-		page_z = conf.Page_size
-	}
 	if page <= 1 {
 		offset = 0
 	} else {

routers/Device.go

@@ -1,53 +1,96 @@
 package routers
 
+import (
+	"Cold_Api/conf"
+	"Cold_Api/controllers"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
 func init() {
-	//var version = conf.Version
-	//---------------------------------- 设备管理
-
-	// 设备
-	//beego.Router(version+"/Device/List", &controllers.DeviceController{}, "*:Device_List")                                         //
-	//beego.Router(version+"/Device/Add", &controllers.DeviceController{}, "*:Device_Post")                                          //
-	//beego.Router(version+"/Device/Edit", &controllers.DeviceController{}, "*:Device_Edit")                                         //
-	//beego.Router(version+"/Device/Del", &controllers.DeviceController{}, "*:Device_Del")                                           //
-	//beego.Router(version+"/Device/Read_DeviceSensorParameter", &controllers.DeviceController{}, "*:Read_v2_DeviceSensorParameter") //
-	//beego.Router(version+"/Device/DeviceTask_Post", &controllers.DeviceController{}, "*:DeviceTask_Post")                          //
-	//beego.Router(version+"/Device/Log", &controllers.DeviceController{}, "*:V2DeviceLogs") //
-
-	//beego.Router(version+"/Device/Parameter_List", &controllers.DeviceController{}, "*:Device_Parameter_List") // 参数列表
-	//beego.Router(version+"/Device/Parameter_Pu", &controllers.DeviceController{}, "*:Device_Parameter_Pu")     //
-
-	// 权限绑定
-	//beego.Router(version+"/Device/Bind_Add", &controllers.DeviceController{}, "*:V2_DeviceBind_Add") //
-	//beego.Router(version+"/Device/Bind_Del", &controllers.DeviceController{}, "*:V2_DeviceBind_Del") //
-	// 设备任务列表
-	//beego.Router(version+"/DeviceTask/List", &controllers.DeviceController{}, "*:V2_DeviceTask_List")
-
-	//// 设备-传感器
-	//beego.Router(version+"/DeviceSensor/List", &controllers.DeviceController{}, "*:DeviceSensor_v2_List") //
-	//beego.Router(version+"/DeviceSensor/Edit", &controllers.DeviceController{}, "*:DeviceSensor_Edit")    //
-	//beego.Router(version+"/DeviceSensor/Del", &controllers.DeviceController{}, "*:DeviceSensor_Del")      //
-	//
-	//beego.Router(version+"/DeviceSensor/Parameter_List", &controllers.DeviceController{}, "*:DeviceSensor_Parameter_List") // 传感器列表
-	//beego.Router(version+"/DeviceSensor/Parameter_Pu", &controllers.DeviceController{}, "*:DeviceSensor_v2_Parameter_Pu")  //
-
-	//分类绑定
-	//beego.Router(version+"/Class/List", &controllers.DeviceController{}, "*:V2_Class_List") // 获取未读消息
-	//beego.Router(version+"/Class/Get", &controllers.DeviceController{}, "*:V2_Class_Get")   // 获取未读消息
-	//beego.Router(version+"/Class/Add", &controllers.DeviceController{}, "*:V2_Class_Add")   // 获取未读消息
-	//beego.Router(version+"/Class/Edit", &controllers.DeviceController{}, "*:V2_Class_Edit") // 获取未读消息
-	//beego.Router(version+"/Class/Del", &controllers.DeviceController{}, "*:V2_Class_Del")   // 获取未读消息
-	//// 绑定
-	//beego.Router(version+"/Class/Bind_Del", &controllers.DeviceController{}, "*:V2_ClassBind_Del") // 获取未读消息
-	//beego.Router(version+"/Class/Bind_Add", &controllers.DeviceController{}, "*:V2_ClassBind_Add") // 获取未读消息
-	//二维码
-	//beego.Router("/Device/Get_DeviceClassId_QRCode", &controllers.DeviceController{}, "*:Get_DeviceClassId_QRCode")   // 获取未读消息
-	//beego.Router("/Device/Get_DeviceClassId_QRCode2", &controllers.DeviceController{}, "*:Get_DeviceClassId_QRCode2") // 获取未读消息
-
-	// 设备报警
-	//beego.Router(version+"/DeviceWarning/List", &controllers.DeviceController{}, "*:V2_DeviceWarning_List")          // 获取未读消息
-	//beego.Router(version+"/DeviceWarning/Get", &controllers.DeviceController{}, "*:V2_DeviceWarning_Get")            // 获取未读消息
-	//beego.Router(version+"/DeviceWarning/Edit", &controllers.DeviceController{}, "*:V2_DeviceWarning_Post")          // 获取未读消息
-	//beego.Router(version+"/DeviceWarning/Del", &controllers.DeviceController{}, "*:V2_DeviceWarning_Del")            // 获取未读消息
-	//beego.Router(version+"/DeviceWarning/ToExcel", &controllers.DeviceController{}, "*:V2_DeviceWarning_Data_Excel") // 获取未读消息
+	ns := beego.NewNamespace(conf.Version,
+		beego.NSNamespace("/Device",
+			beego.NSBefore(T_pidFilter),
+			//设备
+			beego.NSRouter("/List", &controllers.DeviceController{}, "*:Device_List"), // 设备列表
+			beego.NSRouter("/Add", &controllers.DeviceController{}, "*:Device_Add"),   // 添加设备
+			beego.NSRouter("/Get", &controllers.DeviceController{}, "*:Device_Get"),   // 获取设备
+			//beego.NSRouter("/Del", &controllers.DeviceController{}, "*:Device_Del"),                                          // 删除设备 - 弃用
+			beego.NSRouter("/Edit", &controllers.DeviceController{}, "*:Device_Edit"),                       // 修改设备
+			beego.NSRouter("/RestartShutdown", &controllers.DeviceController{}, "*:Device_RestartShutdown"), // 重启/关机
+			beego.NSRouter("/ProductUpgrade", &controllers.DeviceController{}, "*:Device_ProductUpgrade"),   // 版本升级
+
+			beego.NSRouter("/Parameter_Get", &controllers.DeviceController{}, "*:Device_Parameter_Get"),   // 设备参数
+			beego.NSRouter("/Parameter_List", &controllers.DeviceController{}, "*:Device_Parameter_List"), // 设备参数列表
+			beego.NSRouter("/Parameter_Pu", &controllers.DeviceController{}, "*:Device_Parameter_Pu"),     // 修改设备参数
+			//beego.NSRouter("/Device_Parameter_Del_Device", &controllers.DeviceController{}, "*:Device_Parameter_Del_Device"), // 删除此设备 - 弃用
+			// 设备日志
+			beego.NSRouter("/Log", &controllers.DeviceController{}, "*:DeviceLogs"), // 日志
+
+			// 设备任务
+			beego.NSRouter("/DeviceTask_List", &controllers.DeviceController{}, "*:DeviceTask_List"), // 任务列表
+			beego.NSRouter("/DeviceTask_Post", &controllers.DeviceController{}, "*:DeviceTask_Post"), // 远程启停
+
+			// 分类绑定
+			beego.NSRouter("/DeviceClassBind_List", &controllers.DeviceController{}, "*:DeviceClassBind_List"), // 设备传感器绑定的分类列表
+			// 报警策略绑定
+			beego.NSRouter("/DeviceNoticeBind_List", &controllers.DeviceController{}, "*:DeviceNoticeBind_List"), // 设备传感器绑定的报警策略列表
+
+		),
+
+		// 传感器
+		beego.NSNamespace("/DeviceSensor",
+			beego.NSBefore(T_pidFilter),
+			// 设备-传感器
+			beego.NSRouter("/List", &controllers.DeviceController{}, "*:DeviceSensor_List"), // 传感器列表
+			beego.NSRouter("/Edit", &controllers.DeviceController{}, "*:DeviceSensor_Edit"), // 修改传感器
+			//beego.NSRouter("/Del", &controllers.DeviceController{}, "*:DeviceSensor_Del"),                       // 删除传感器 -弃用
+			beego.NSRouter("/Parameter_Get", &controllers.DeviceController{}, "*:DeviceSensor_Parameter_Get"),   // 传感器参数
+			beego.NSRouter("/Parameter_List", &controllers.DeviceController{}, "*:DeviceSensor_Parameter_List"), // 传感器参数列表
+			beego.NSRouter("/Parameter_Pu", &controllers.DeviceController{}, "*:DeviceSensor_Parameter_Pu"),     // 修改传感器参数
+			// 传感器管理列表
+			beego.NSRouter("/Manage_List", &controllers.DeviceController{}, "*:DeviceSensor_Manage_List"), // 传感器管理列表
+			beego.NSRouter("/Stat", &controllers.DeviceController{}, "*:DeviceSensor_Stat"),               // 传感器统计 - 小程序
+
+		),
+		// 传感器类型
+		beego.NSNamespace("/DeviceSensorType",
+			beego.NSBefore(T_pidFilter),
+			beego.NSRouter("/List", &controllers.DeviceController{}, "*:DeviceSensorType_List"),         // 传感器设备类型列表
+			beego.NSRouter("/List_All", &controllers.DeviceController{}, "*:DeviceSensorType_List_All"), // 传感器设备类型列表
+		),
+
+		// 分类
+		beego.NSNamespace("/Class",
+			beego.NSBefore(T_pidFilter),
+			beego.NSRouter("/List", &controllers.DeviceController{}, "*:CompanyClass_List"), // 分类列表
+			beego.NSRouter("/All", &controllers.DeviceController{}, "*:CompanyClass_All"),   // 所有分类列表
+			beego.NSRouter("/Get", &controllers.DeviceController{}, "*:CompanyClass_Get"),   // 获取分类
+			beego.NSRouter("/Add", &controllers.DeviceController{}, "*:CompanyClass_Add"),   // 添加分类
+			beego.NSRouter("/Edit", &controllers.DeviceController{}, "*:CompanyClass_Edit"), // 修改分类
+			beego.NSRouter("/Del", &controllers.DeviceController{}, "*:CompanyClass_Del"),   // 删除分类
+			// 分类绑定
+			beego.NSRouter("/Bind_Add", &controllers.DeviceController{}, "*:ClassBind_Add"), // 添加分类设备绑定
+			beego.NSRouter("/Bind_Del", &controllers.DeviceController{}, "*:ClassBind_Del"), // 删除分类设备绑定
+		),
+		//报警策略
+		beego.NSNamespace("/Notice",
+			beego.NSBefore(T_pidFilter),
+			beego.NSRouter("/List", &controllers.DeviceController{}, "*:CompanyNotice_List"), // 报警策略列表
+			beego.NSRouter("/All", &controllers.DeviceController{}, "*:CompanyNotice_All"),   // 所有报警策略列表
+			beego.NSRouter("/Get", &controllers.DeviceController{}, "*:CompanyNotice_Get"),   // 获取报警策略
+			beego.NSRouter("/Add", &controllers.DeviceController{}, "*:CompanyNotice_Add"),   // 添加报警策略
+			beego.NSRouter("/Edit", &controllers.DeviceController{}, "*:CompanyNotice_Edit"), // 修改报警策略
+			beego.NSRouter("/Del", &controllers.DeviceController{}, "*:CompanyNotice_Del"),   // 删除报警策略
+
+			beego.NSRouter("/Reset_Mechanism", &controllers.DeviceController{}, "*:CompanyNotice_Reset_Mechanism"), // 重置报警机制
+			// 报警策略绑定
+			beego.NSRouter("/Bind_Add", &controllers.DeviceController{}, "*:NoticeBind_Add"), // 添加报警策略绑定
+			beego.NSRouter("/Bind_Del", &controllers.DeviceController{}, "*:NoticeBind_Del"), // 删除报警策略绑定
+			// 报警通知用户列表
+			beego.NSRouter("/User_List", &controllers.UserController{}, "*:User_Notice_List"), // 报警通知用户列表
+		),
+	)
+
+	beego.AddNamespace(ns)
 
 }

routers/GoodsOrder.go

@@ -1,14 +0,0 @@
-package routers
-
-func init() {
-	//var version = conf.Version
-	//
-	//// 订单管理
-	//beego.Router(version+"/GoodsOrder/List", &controllers.GoodsOrderController{}, "*:GoodsOrder_List") // 获取未读消息
-	//beego.Router(version+"/GoodsOrder/Get", &controllers.GoodsOrderController{}, "*:GoodsOrder_Get")   // 获取未读消息
-	//beego.Router(version+"/GoodsOrder/Add", &controllers.GoodsOrderController{}, "*:GoodsOrder_Add")   // 获取未读消息
-	//beego.Router(version+"/GoodsOrder/Edit", &controllers.GoodsOrderController{}, "*:GoodsOrder_Edit") // 获取未读消息
-	//beego.Router(version+"/GoodsOrder/Del", &controllers.GoodsOrderController{}, "*:GoodsOrder_Del")   // 获取未读消息
-	//beego.Router(version+"/GoodsOrder/PDF", &controllers.GoodsOrderController{}, "*:GoodsOrder_PDF")   // 获取未读消息
-
-}

routers/Warning.go

@@ -0,0 +1,29 @@
+package routers
+
+import (
+	"Cold_Api/conf"
+	"Cold_Api/controllers"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+func init() {
+	ns := beego.NewNamespace(conf.Version,
+
+		// 设备报警
+		beego.NSNamespace("/DeviceWarning",
+			beego.NSRouter("/List", &controllers.DeviceController{}, "*:DeviceWarning_List"),          // 告警列表
+			beego.NSRouter("/Get", &controllers.DeviceController{}, "*:DeviceWarning_Get"),            // 获取告警
+			beego.NSRouter("/Edit", &controllers.DeviceController{}, "*:DeviceWarning_Post"),          // 修改告警 报警处理
+			beego.NSRouter("/Del", &controllers.DeviceController{}, "*:DeviceWarning_Del"),            // 删除告警
+			beego.NSRouter("/ToExcel", &controllers.DeviceController{}, "*:DeviceWarning_Data_Excel"), // 导出excel
+
+		),
+		// 报警类型
+		beego.NSNamespace("/WarningType",
+			beego.NSRouter("/List_All", &controllers.DeviceController{}, "*:WarningType_List_All"),         // 添加权限-告警类型列表
+			beego.NSRouter("/Power_List", &controllers.DeviceController{}, "*:WarningType_Power_List_All"), // 报警搜索-告警类型列表
+		),
+	)
+
+	beego.AddNamespace(ns)
+}

routers/v2.go

@@ -1,145 +0,0 @@
-package routers
-
-func init() {
-	////   -----------网关接口-----------
-	//// 添加网关
-	////beego.Router("/API/A_Device_List", &controllers.DeviceController{}, "*:A_Device_List") // *全部；  get,post:
-	////// 添加网关
-	////beego.Router("/API/Add_A_Device", &controllers.DeviceController{}, "*:Add_A_Device") // *全部；  get,post:
-	////// 修改网关
-	////beego.Router("/API/Up_A_Device", &controllers.DeviceController{}, "*:Up_A_Device") // *全部；  get,post:
-	////// 删除网关
-	////beego.Router("/API/Delete_A_Device", &controllers.DeviceController{}, "*:Delete_A_Device") // *全部；  get,post:
-	//// 用户 - 微信授权
-	//beego.Router("/", &controllers.AdminController{}, "*:Login")
-	//
-	//beego.Router("/UpFile", &controllers.UpFileController{}, "*:UpFile") // *全部；  get,post:
-	//
-	//beego.Router("/Login", &controllers.AdminController{}, "*:Login")                           // *全部；  get,post:
-	//beego.Router("/Login_verification", &controllers.AdminController{}, "*:Login_verification") // *全部；  get,post:
-	//
-	//beego.Router("/User/Info", &controllers.AdminController{}, "*:Info")
-	//
-	//// 日志
-	//beego.Router("/System/Logs", &controllers.LogsController{}, "*:List") // 获取未读消息
-	//
-	//// 微信服务端
-	////beego.Router("/Wx/Wx_handler", &controllers.WxController{}, "*:Wx_handler")  // 获取未读消息
-	////beego.Router("/Wx/Wx_handler", &controllers.WxController{}, "*:Wx")  // 获取未读消息
-	//
-	//beego.Router("/RawSql/Raw_html", &controllers.RawSqlController{}, "*:RawSql_html")   // 获取未读消息
-	//beego.Router("/RawSql/Raw__html", &controllers.RawSqlController{}, "*:RawSql__html") // 获取未读消息
-	//beego.Router("/RawSql/List_Post", &controllers.RawSqlController{}, "*:List_Post")    // 获取未读消息
-	//beego.Router("/RawSql/List_Del", &controllers.RawSqlController{}, "*:List_Del")      // 获取未读消息
-	//
-	////   -----------3、用户管理
-	////3.1用户账户只可以由管理员添加。
-	////3.2管理员账户只可以有一个。
-	////3.3用户可添加和删除子账号。
-	////3.4用户可对子账号分配管理权限，包括：设备数据查看权限，设备运行参数修改权限。
-	////-----------
-	//
-	//beego.Router("/User/Admin_html", &controllers.UserController{}, "*:Admin_html") // 获取未读消息
-	//beego.Router("/User/Admin_", &controllers.UserController{}, "*:Admin_")         // 获取未读消息
-	//beego.Router("/User/Admin_Post", &controllers.UserController{}, "*:Admin_Post") // 获取未读消息
-	//beego.Router("/User/Admin_Del", &controllers.UserController{}, "*:Admin_Del")   // 获取未读消息
-	//
-	//beego.Router("/User/User_", &controllers.UserController{}, "*:User_")           // 获取未读消息
-	//beego.Router("/User/User_Get", &controllers.UserController{}, "*:User_Get")     // 获取未读消息
-	//beego.Router("/User/User_Info", &controllers.UserController{}, "*:User_Info")   // 获取未读消息
-	//beego.Router("/User/User_Info_", &controllers.UserController{}, "*:User_Info_") // 获取未读消息
-	//beego.Router("/User/User_Post", &controllers.UserController{}, "*:User_Post")   // 获取未读消息
-	//beego.Router("/User/User_Del", &controllers.UserController{}, "*:User_Del")     // 获取未读消息
-	//beego.Router("/User/User_Entry", &controllers.UserController{}, "*:User_Entry") // 获取未读消息
-	//
-	//beego.Router("/User/Power", &controllers.UserController{}, "*:Power_html")      // 获取未读消息
-	//beego.Router("/User/Power_", &controllers.UserController{}, "*:Power_")         // 获取未读消息
-	//beego.Router("/User/Power_Post", &controllers.UserController{}, "*:Power_Post") // 获取未读消息
-	//beego.Router("/User/Power_Del", &controllers.UserController{}, "*:Power_Del")   // 获取未读消息
-	//
-	//beego.Router("/User/Panel_plan_Syn", &controllers.UserController{}, "*:Panel_plan_Syn") // 获取未读消息
-	//beego.Router("/User/InspectTokey", &controllers.UserController{}, "*:InspectTokey")     // 获取未读消息
-	//
-	//// 日志
-	//beego.Router("/User/UserLogs", &controllers.LogsController{}, "*:UserLogs") // 获取未读消息
-	//
-	//beego.Router("/GoodsOrder/List_Post", &controllers.GoodsOrderController{}, "*:List_Post") // 获取未读消息
-	//beego.Router("/GoodsOrder/List_Del", &controllers.GoodsOrderController{}, "*:List_Del")   // 获取未读消息
-	//beego.Router("/GoodsOrder/Data_PDF", &controllers.GoodsOrderController{}, "*:Data_PDF")   // 获取未读消息
-
-	//   -----------3、用户管理
-	//3.1用户账户只可以由管理员添加。
-	//3.2管理员账户只可以有一个。
-	//3.3用户可添加和删除子账号。
-	//3.4用户可对子账号分配管理权限，包括：设备数据查看权限，设备运行参数修改权限。
-	//-----------
-	// 设备日志
-	//beego.Router("/Device/DeviceLogs", &controllers.DeviceController{}, "*:DeviceLogs") // 获取未读消息
-
-	//beego.Router("/Device/Read_DeviceParameter", &controllers.DeviceController{}, "*:Read_DeviceParameter")             // 获取 基本信息
-	//beego.Router("/Device/Read_DeviceSensorParameter", &controllers.DeviceController{}, "*:Read_DeviceSensorParameter") // 获取 基本信息
-	//beego.Router("/Device/Read_DeviceParameter", &controllers.DeviceController{}, "*:Read_DeviceParameter")           // 获取 基本信息
-	//beego.Router("/Device/Pu_DeviceParameter", &controllers.DeviceController{}, "*:Pu_DeviceParameter")               // 设置 设备参数
-	//beego.Router("/Device/Pu_DeviceParameter_Sensor", &controllers.DeviceController{}, "*:Pu_DeviceParameter_Sensor") // 设置 传感器参数
-	//beego.Router("/Device/Pu_DeviceParameter_Sensor_Cache", &controllers.DeviceController{}, "*:Pu_DeviceParameter_Sensor_Cache") // 设置 传感器参数
-	//beego.Router("/Device/Pu_DeviceParameter_T_l_p", &controllers.DeviceController{}, "*:Pu_DeviceParameter_T_type")  // 设置 传感器参数
-	//beego.Router("/Device/Pu_DeviceParameter_T_give", &controllers.DeviceController{}, "*:Pu_DeviceParameter_T_give") // 设置 传感器参数
-
-	//beego.Router("/Device/Device_Post", &controllers.DeviceController{}, "*:Device_Post")                       // 获取未读消息
-	//beego.Router("/Device/Device_Add", &controllers.DeviceController{}, "*:Device_Post")                        // 获取未读消息
-	//beego.Router("/Device/Device_Del", &controllers.DeviceController{}, "*:Device_Del")                         // 获取未读消息
-	//beego.Router("/Device/DeviceClassBind_List", &controllers.DeviceController{}, "*:DeviceClassBind_List") // 获取未读消息
-
-	//beego.Router("/Device/Get_DeviceClassId_QRCode", &controllers.DeviceController{}, "*:Get_DeviceClassId_QRCode")   // 获取未读消息
-	//beego.Router("/Device/Get_DeviceClassId_QRCode2", &controllers.DeviceController{}, "*:Get_DeviceClassId_QRCode2") // 获取未读消息
-
-	//beego.Router("/Device/Device_List", &controllers.DeviceController{}, "*:Device_List") // 获取未读消息
-	//beego.Router("/Device/Device_Parameter", &controllers.DeviceController{}, "*:Device_Parameter_html")                  // 获取未读消息
-	//beego.Router("/Device/Device_Parameter_Del", &controllers.DeviceController{}, "*:Device_Parameter_Del")               // 获取未读消息
-	//beego.Router("/Device/Device_Parameter_Del_Device", &controllers.DeviceController{}, "*:Device_Parameter_Del_Device") // 获取未读消息
-	//beego.Router("/Device/DeviceSensor_List", &controllers.DeviceController{}, "*:DeviceSensor_List")                     // 获取未读消息
-	//beego.Router("/Device/DeviceWarning_List", &controllers.DeviceController{}, "*:DeviceWarning_List")             // 获取未读消息
-	//beego.Router("/Device/DeviceWarning_", &controllers.DeviceController{}, "*:DeviceWarning_")                     // 获取未读消息
-	//beego.Router("/Device/DeviceWarning_log", &controllers.DeviceController{}, "*:DeviceWarning_log")               // 获取未读消息
-	//beego.Router("/Device/DeviceWarning_M", &controllers.DeviceController{}, "*:DeviceWarning_M")                   // 获取未读消息
-	//beego.Router("/Device/DeviceWarning_Post", &controllers.DeviceController{}, "*:DeviceWarning_Post")             // 获取未读消息
-	//beego.Router("/Device/DeviceWarning_Data_Excel", &controllers.DeviceController{}, "*:DeviceWarning_Data_Excel") // 获取未读消息
-	//beego.Router("/Device/DeviceWarning_Del", &controllers.DeviceController{}, "*:DeviceWarning_Del")               // 获取未读消息
-	//beego.Router("/Device/DeviceWarningListT_Tips", &controllers.DeviceController{}, "*:DeviceWarningList_T_Tips")  // 获取未读消息
-
-	//beego.Router("/Device/UpDeviceSensor_Tsort", &controllers.DeviceController{}, "*:UpDeviceSensor_Tsort")     // 获取未读消息
-	//beego.Router("/Device/UpDeviceSensor_T3dview", &controllers.DeviceController{}, "*:UpDeviceSensor_T3dview") // 获取未读消息
-	//// 获取未读消息
-	//beego.Router("/Device/UpDeviceSensor_T_datashow", &controllers.DeviceController{}, "*:UpDeviceSensor_T_datashow") // 获取未读消息
-
-	//beego.Router("/Device/DeviceTask_List", &controllers.DeviceController{}, "*:DeviceTask_List") // 设置 设备参数
-	//beego.Router("/Device/DeviceTask_Post", &controllers.DeviceController{}, "*:DeviceTask_Post") // 设置 设备参数
-
-	//beego.Router("/Device/DeviceData_Add", &controllers.DeviceController{}, "*:DeviceData_Add") // 设置 设备参数
-
-	//   -----------3、用户管理
-	//3.1用户账户只可以由管理员添加。
-	//3.2管理员账户只可以有一个。
-	//3.3用户可添加和删除子账号。
-	//3.4用户可对子账号分配管理权限，包括：设备数据查看权限，设备运行参数修改权限。
-	//-----------
-	//beego.Router("/Data/Device_Sensor", &controllers.DataController{}, "*:Device_Sensor") // 设置 设备参数
-	//// 获取 基本信息
-	//beego.Router("/Data/Device_Sensor_List", &controllers.DataController{}, "*:Device_Sensor_List")                      // 设置 设备参数
-	//beego.Router("/Data/Device_Sensor_Data", &controllers.DataController{}, "*:Device_Sensor_Data")                      // 设置 设备参数
-	//beego.Router("/Data/Device_Sensor_Data_More", &controllers.DataController{}, "*:Device_Sensor_Data_More")            // 设置 设备参数
-	//beego.Router("/Data/Device_Sensor_Data_More_ColdVerify", &controllers.DataController{}, "*:Device_Sensor_Data_More") // 设置 设备参数
-	//beego.Router("/Data/Device_Sensor_Data_Excel", &controllers.DataController{}, "*:Device_Sensor_Data_Excel")          // 设置 设备参数
-	//beego.Router("/Data/Device_Sensor_Data_Excel_m", &controllers.DataController{}, "*:Device_Sensor_Data_Excel_m")      // 设置 设备参数
-	//beego.Router("/Data/Device_Sensor_Data_PDF", &controllers.DataController{}, "*:Device_Sensor_Data_PDF")              // 设置 设备参数
-	//beego.Router("/Data/DataPlane", &controllers.DataController{}, "*:DataPlane")                                        // 设置 设备参数
-	//
-	//beego.Router("/Data/DataScreen_Data", &controllers.DataController{}, "*:DataScreen_Data")                 // 设置 设备参数
-	//beego.Router("/Data/DeviceSensor_Data_Print", &controllers.DataController{}, "*:DeviceSensor_Data_Print") // 设置 设备参数
-	//beego.Router("/Data/DataScreen_Map", &controllers.DataController{}, "*:DataScreen_Map")                   // 设置 设备参数
-	//
-	////beego.Router("/Data/Raw", &controllers.DataController{}, "*:Raw") // 设置 设备参数
-	//// 3D
-	//beego.Router("/Data/DataView3d_html", &controllers.DataController{}, "*:DataView3d_html")
-	//beego.Router("/Data/UpDataView3d", &controllers.DataController{}, "*:UpDataView3d")
-}

routers/v3.go

@@ -1,112 +0,0 @@
-package routers
-
-import (
-	"Cold_Api/conf"
-	"Cold_Api/controllers"
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-func init() {
-	ns := beego.NewNamespace(conf.Version,
-		beego.NSNamespace("/Device",
-			beego.NSBefore(T_pidFilter),
-			//设备
-			beego.NSRouter("/List", &controllers.DeviceController{}, "*:Device_List"), // 设备列表
-			beego.NSRouter("/Add", &controllers.DeviceController{}, "*:Device_Add"),   // 添加设备
-			beego.NSRouter("/Get", &controllers.DeviceController{}, "*:Device_Get"),   // 获取设备
-			//beego.NSRouter("/Del", &controllers.DeviceController{}, "*:Device_Del"),                                          // 删除设备
-			beego.NSRouter("/Edit", &controllers.DeviceController{}, "*:Device_Edit"),                       // 修改设备
-			beego.NSRouter("/RestartShutdown", &controllers.DeviceController{}, "*:Device_RestartShutdown"), // 重启/关机
-			beego.NSRouter("/ProductUpgrade", &controllers.DeviceController{}, "*:Device_ProductUpgrade"),   // 版本升级
-
-			beego.NSRouter("/Parameter_Get", &controllers.DeviceController{}, "*:Device_Parameter_Get"),   // 设备参数
-			beego.NSRouter("/Parameter_List", &controllers.DeviceController{}, "*:Device_Parameter_List"), // 设备参数列表
-			beego.NSRouter("/Parameter_Pu", &controllers.DeviceController{}, "*:Device_Parameter_Pu"),     // 修改设备参数
-			//beego.NSRouter("/Device_Parameter_Del_Device", &controllers.DeviceController{}, "*:Device_Parameter_Del_Device"), // 删除此设备
-			// 设备日志
-			beego.NSRouter("/Log", &controllers.DeviceController{}, "*:DeviceLogs"), // 日志
-
-			// 设备任务
-			beego.NSRouter("/DeviceTask_List", &controllers.DeviceController{}, "*:DeviceTask_List"), // 任务列表
-			beego.NSRouter("/DeviceTask_Post", &controllers.DeviceController{}, "*:DeviceTask_Post"), // 远程启停
-
-			// 分类绑定
-			beego.NSRouter("/DeviceClassBind_List", &controllers.DeviceController{}, "*:DeviceClassBind_List"), // 设备传感器绑定的分类列表
-			// 报警策略绑定
-			beego.NSRouter("/DeviceNoticeBind_List", &controllers.DeviceController{}, "*:DeviceNoticeBind_List"), // 设备传感器绑定的报警策略列表
-
-			//beego.NSRouter("/UpDeviceSensor_Tsort", &controllers.DeviceController{}, "*:UpDeviceSensor_Tsort"),           // 传感器排序
-			//beego.NSRouter("/UpDeviceSensor_T3dview", &controllers.DeviceController{}, "*:UpDeviceSensor_T3dview"),       // 传感器3D视图
-			//beego.NSRouter("/UpDeviceSensor_T_datashow", &controllers.DeviceController{}, "*:UpDeviceSensor_T_datashow"), // 传感器屏蔽数据展示
-			//beego.NSRouter("/DeviceWarningListT_Tips", &controllers.DeviceController{}, "*:DeviceWarningList_T_Tips"), // 获取未读消息
-
-		),
-
-		// 传感器
-		beego.NSNamespace("/DeviceSensor",
-			beego.NSBefore(T_pidFilter),
-			// 设备-传感器
-			beego.NSRouter("/List", &controllers.DeviceController{}, "*:DeviceSensor_List"),                     // 传感器列表
-			beego.NSRouter("/Edit", &controllers.DeviceController{}, "*:DeviceSensor_Edit"),                     // 修改传感器
-			beego.NSRouter("/Del", &controllers.DeviceController{}, "*:DeviceSensor_Del"),                       // 删除传感器
-			beego.NSRouter("/Parameter_Get", &controllers.DeviceController{}, "*:DeviceSensor_Parameter_Get"),   // 传感器参数
-			beego.NSRouter("/Parameter_List", &controllers.DeviceController{}, "*:DeviceSensor_Parameter_List"), // 传感器参数列表
-			beego.NSRouter("/Parameter_Pu", &controllers.DeviceController{}, "*:DeviceSensor_Parameter_Pu"),     // 修改传感器参数
-			// 传感器管理列表
-			beego.NSRouter("/Manage_List", &controllers.DeviceController{}, "*:DeviceSensor_Manage_List"), // 传感器管理列表
-
-		),
-		// 设备报警
-		beego.NSNamespace("/DeviceWarning",
-			beego.NSRouter("/List", &controllers.DeviceController{}, "*:DeviceWarning_List"),          // 告警列表
-			beego.NSRouter("/Get", &controllers.DeviceController{}, "*:DeviceWarning_Get"),            // 获取告警
-			beego.NSRouter("/Edit", &controllers.DeviceController{}, "*:DeviceWarning_Post"),          // 修改告警 报警处理
-			beego.NSRouter("/Del", &controllers.DeviceController{}, "*:DeviceWarning_Del"),            // 删除告警
-			beego.NSRouter("/ToExcel", &controllers.DeviceController{}, "*:DeviceWarning_Data_Excel"), // 导出excel
-
-		),
-		// 报警类型
-		beego.NSNamespace("/WarningType",
-			beego.NSRouter("/List_All", &controllers.DeviceController{}, "*:WarningType_List_All"),         // 添加权限-告警类型列表
-			beego.NSRouter("/Power_List", &controllers.DeviceController{}, "*:WarningType_Power_List_All"), // 报警搜索-告警类型列表
-		),
-		// 分类
-		beego.NSNamespace("/Class",
-			beego.NSBefore(T_pidFilter),
-			beego.NSRouter("/List", &controllers.DeviceController{}, "*:CompanyClass_List"), // 分类列表
-			beego.NSRouter("/All", &controllers.DeviceController{}, "*:CompanyClass_All"),   // 所有分类列表
-			beego.NSRouter("/Get", &controllers.DeviceController{}, "*:CompanyClass_Get"),   // 获取分类
-			beego.NSRouter("/Add", &controllers.DeviceController{}, "*:CompanyClass_Add"),   // 添加分类
-			beego.NSRouter("/Edit", &controllers.DeviceController{}, "*:CompanyClass_Edit"), // 修改分类
-			beego.NSRouter("/Del", &controllers.DeviceController{}, "*:CompanyClass_Del"),   // 删除分类
-			// 分类绑定
-			beego.NSRouter("/Bind_Add", &controllers.DeviceController{}, "*:ClassBind_Add"), // 添加分类设备绑定
-			beego.NSRouter("/Bind_Del", &controllers.DeviceController{}, "*:ClassBind_Del"), // 删除分类设备绑定
-		),
-		//报警策略
-		beego.NSNamespace("/Notice",
-			beego.NSBefore(T_pidFilter),
-			beego.NSRouter("/List", &controllers.DeviceController{}, "*:CompanyNotice_List"), // 报警策略列表
-			beego.NSRouter("/All", &controllers.DeviceController{}, "*:CompanyNotice_All"),   // 所有报警策略列表
-			beego.NSRouter("/Get", &controllers.DeviceController{}, "*:CompanyNotice_Get"),   // 获取报警策略
-			beego.NSRouter("/Add", &controllers.DeviceController{}, "*:CompanyNotice_Add"),   // 添加报警策略
-			beego.NSRouter("/Edit", &controllers.DeviceController{}, "*:CompanyNotice_Edit"), // 修改报警策略
-			beego.NSRouter("/Del", &controllers.DeviceController{}, "*:CompanyNotice_Del"),   // 删除报警策略
-
-			beego.NSRouter("/Reset_Mechanism", &controllers.DeviceController{}, "*:CompanyNotice_Reset_Mechanism"), // 重置报警机制
-			// 报警策略绑定
-			beego.NSRouter("/Bind_Add", &controllers.DeviceController{}, "*:NoticeBind_Add"), // 添加报警策略绑定
-			beego.NSRouter("/Bind_Del", &controllers.DeviceController{}, "*:NoticeBind_Del"), // 删除报警策略绑定
-			// 报警通知用户列表
-			beego.NSRouter("/User_List", &controllers.UserController{}, "*:User_Notice_List"), // 报警通知用户列表
-		),
-
-		// 设备类型
-		beego.NSNamespace("/DeviceType",
-			beego.NSRouter("/List_All", &controllers.DeviceController{}, "*:DeviceType_List_All"), // 传感器设备类型列表
-		),
-	)
-
-	beego.AddNamespace(ns)
-
-}