灯杆getList Remove

app/controller/lampPoleController.go

@@ -89,6 +89,17 @@ func (c *lampPoleCtl) GetRelevanceDetail(ctx *gin.Context) {
 }
 
 func (c *lampPoleCtl) Remove(ctx *gin.Context) {
+	var req *model.ReqLampPoleRemove
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	err := service.LampPoleService.Remove(req.IDs)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
 }
 
 func (c *lampPoleCtl) ImportExcel(ctx *gin.Context) {
@@ -101,6 +112,12 @@ func (c *lampPoleCtl) ExportTemplate(ctx *gin.Context) {
 }
 
 func (c *lampPoleCtl) GetList(ctx *gin.Context) {
+	devices, err := service.LampPoleService.GetList()
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
 }
 
 func lampPoleDaoToModel(device dao.LampPole) model.LampPoleDetail {

app/dao/lampPoleDao.go

@@ -85,11 +85,8 @@ func (c LampPole) GetDevices(offset, limit int) ([]LampPole, error) {
 	var devices []LampPole
 
 	db := GDb.Model(&c)
-	if c.PoleName != "" {
-		db = db.Where("pole_name like ?", "%"+c.PoleName+"%")
-	}
 	if c.PoleSN != "" {
-		db = db.Where("pole_sn like ?", "%"+c.PoleSN+"%")
+		db = db.Where("pole_name like ? or pole_sn like ?", "%"+c.PoleSN+"%", "%"+c.PoleSN+"%")
 	}
 	if c.GroupId != -1 {
 		db = db.Where("group_id = ?", c.GroupId)
@@ -101,8 +98,8 @@ func (c LampPole) GetDevices(offset, limit int) ([]LampPole, error) {
 	return devices, err
 }
 
-func (c LampPole) GetAllDevices() ([]LampPole, error) {
-	var devices []LampPole
+func (c LampPole) GetAllDevices() ([]*LampPole, error) {
+	var devices []*LampPole
 	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
 	return devices, err
 }

app/model/lampPole.go

@@ -49,5 +49,7 @@ type RspLampPoleList struct {
 }
 
 type ReqLampPoleRemove struct {
-	IDs int `json:"ids"` //分组编码
+	IDs  int    `json:"ids"`  //分组编码
+	SN   int    `json:"sn"`   //sn
+	Name string `json:"name"` //名称
 }

app/service/lampPoleService.go

@@ -89,7 +89,6 @@ func (s *lampPoleService) List(searchValue, groupId, boxId string, current, size
 	device := dao.LampPole{}
 	if searchValue != "" {
 		device.PoleSN = searchValue
-		device.PoleName = searchValue
 	}
 
 	device.GroupId = utils.StringToInt(groupId)
@@ -124,49 +123,16 @@ func (s *lampPoleService) Remove(id int) *utils.Errors {
 	return nil
 }
 
-func (s *lampPoleService) GetList() ([]dao.LampPole, *utils.Errors) {
+func (s *lampPoleService) GetList() ([]*dao.LampPole, *utils.Errors) {
 	// todo use redis cache
 	device := &dao.LampPole{
 		TenantId:  "000000", // todo 使用登录态
 		IsDeleted: 0,
 	}
 	devices, err := device.GetAllDevices()
-	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
-	}
-
-	return devices, nil
-}
-
-func (s *lampPoleService) GetFiltration() ([]dao.LampPole, *utils.Errors) {
-	// todo use redis cache
-	device := &dao.LampPole{
-		TenantId:  "000000", // todo 使用登录态
-		IsDeleted: 0,
-	}
-
-	//todo
-	// get t_dev_light_control _id
-	// Ids := lightControl.GetIds()
-
-	devices, err := device.GetAllDevices()
-	if err != nil {
-		return nil, utils.FailResponse(err.Error(), nil)
+	for _, device := range devices {
+		device.PoleName = device.PoleName + "(" + device.PoleSN + ")"
 	}
-
-	return devices, nil
-}
-
-func (s *lampPoleService) GetTree() ([]dao.LampPole, *utils.Errors) {
-	// todo use redis cache
-	device := &dao.LampPole{
-		TenantId:  "000000", // todo 使用登录态
-		IsDeleted: 0,
-	}
-
-	//todo lampPole getALlDevice
-
-	devices, err := device.GetAllDevices()
 	if err != nil {
 		return nil, utils.FailResponse(err.Error(), nil)
 	}