垃圾桶接口

app/controller/garbageController.go

@@ -2,6 +2,13 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/dao"
+	"iot_manager_service/app/model"
+	"iot_manager_service/app/service"
+	"iot_manager_service/app/utils"
+	"math"
+	"net/http"
+	"strconv"
 )
 
 // 垃圾桶管理对象
@@ -10,15 +17,71 @@ var Garbage = new(garbageCtl)
 type garbageCtl struct{}
 
 func (c *garbageCtl) Detail(ctx *gin.Context) {
+	id, e := strconv.Atoi(ctx.Query("id"))
+	if e != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(e.Error(), nil))
+		return
+	}
+
+	device, err := service.GarbageService.Get(id)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, device))
 }
 
 func (c *garbageCtl) List(ctx *gin.Context) {
+	searchValue := ctx.Query("searchValue")
+	current, _ := strconv.Atoi(ctx.Query("current"))
+	size, _ := strconv.Atoi(ctx.Query("size"))
+	if current == 0 {
+		current = 1
+	}
+	if size <= 0 || size > 100 {
+		size = 10
+	}
+	devices, err := service.GarbageService.List(searchValue, current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	pages := math.Ceil(float64(len(devices)) / float64(size))
+	rsp := model.RsqGarbageList{
+		Current: current,
+		Size:    size,
+		Total:   len(devices),
+		Pages:   int(pages),
+	}
+	for _, device := range devices {
+
+		rsp.Records = append(rsp.Records, device)
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, rsp))
 }
 
 func (c *garbageCtl) CreateOrUpdate(ctx *gin.Context) {
+	var req dao.Garbage
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	err := service.GarbageService.CreateOrUpdate(req)
+	ctx.JSON(http.StatusOK, err)
 }
 
 func (c *garbageCtl) Remove(ctx *gin.Context) {
+	var req *model.ReqGarbageRemove
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	err := service.GarbageService.Remove(req.IDs)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
 }
 
 func (c *garbageCtl) ImportExcel(ctx *gin.Context) {
@@ -31,4 +94,10 @@ func (c *garbageCtl) ExportTemplate(ctx *gin.Context) {
 }
 
 func (c *garbageCtl) GetList(ctx *gin.Context) {
+	devices, err := service.GarbageService.GetList()
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
 }

app/dao/common.go

@@ -21,8 +21,8 @@ func InitDB() {
 		GDb.DB().SetMaxOpenConns(32)
 		GDb.DB().SetMaxIdleConns(5)
 		GDb.LogMode(false)
-		err = GDb.AutoMigrate(&LampPoleGroup{}, &LampPole{}, &Gateway{}, &GatewayRelation{}, &Transformer{},
-			&LightControl{}).Error
+		err = GDb.AutoMigrate(&LampPoleGroup{}, &LampPole{}, &Gateway{}, &GatewayRelation{},
+			&LightControl{}, Garbage{}).Error
 		if err != nil {
 			panic(fmt.Sprintf("AutoMigrate err : %v", err))
 		}

app/dao/garbageDao.go

@@ -0,0 +1,98 @@
+package dao
+
+import (
+	"github.com/jinzhu/gorm"
+	"time"
+)
+
+// GarbageWay 垃圾桶道路分组管理
+type Garbage struct {
+	ID              int       `gorm:"primary_key" json:"id"`                    //编号
+	DeviceName      string    `gorm:"type:varchar(64)" json:"deviceName"`       //垃圾桶名称
+	DeviceSN        string    `gorm:"type:varchar(60)" json:"deviceSN"`         //垃圾桶序列号
+	DeviceIMei      string    `gorm:"type:varchar(64)" json:"deviceIMei"`       //传感器编码-唯一不允许重复
+	KindType        int       `gorm:"type:int" json:"kindType"`                 //种类
+	Material        int       `gorm:"type:int" json:"material"`                 //材质
+	BrandId         int       `gorm:"type:int" json:"brandId"`                  //品牌
+	ModelId         int       `gorm:"type:int" json:"modelId"`                  //型号
+	GarbageOneType  int       `gorm:"type:int" json:"garbageOneType"`           //桶1类型
+	GarbageTwoType  int       `gorm:"type:int" json:"garbageTwoType"`           //桶2类型
+	GarbageHeight   int       `gorm:"int" json:"garbageHeight"`                 //内桶高度
+	TotalHeight     int       `gorm:"int" json:"totalHeight"`                   //传感器距离内桶高度
+	InstallTime     time.Time `gorm:"type:date" json:"installTime"`             //安装时间
+	WayID           int       `gorm:"type:int" json:"wayID"`                    //所属道路号
+	CameraID        int       `gorm:"type:int" json:"cameraID"`                 //摄像机id
+	CameraSN        string    `gorm:"type:varchar(60)" json:"cameraSN"`         //摄像机sn
+	PoleLng         float64   `gorm:"type:double(17, 14) " json:"poleLng"`      //经度
+	PoleLat         float64   `gorm:"type:double(17, 14)  " json:"poleLat"`     //纬度
+	ProvinceName    string    `gorm:" type:varchar(60)" json:"provinceName"`    //省份
+	CityName        string    `gorm:"type:varchar(60)" json:"cityName"`         //市
+	DistrictName    string    `gorm:"type:varchar(60)" json:"districtName"`     //区
+	InstallLocation string    `gorm:"type:varchar(100)" json:"installLocation"` //安装位置
+	PhotoUrl        string    `gorm:"type:varchar(255)" json:"photoUrl"`        //供电箱照片地址
+	Remark          string    `gorm:"type:varchar(1000)" json:"remark"`         //备注
+	TenantId        string    `gorm:"type:varchar(12)" json:"tenantId"`         //租户id
+	CreateTime      time.Time `gorm:"type:datetime" json:"createTime"`          //新增时间
+	CreateUser      string    `gorm:"type:varchar(60)" json:"createUser"`       //新增记录操作用户ID
+	UpdateTime      time.Time `gorm:"type:datetime" json:"updateTime"`          //修改时间
+	UpdateUser      string    `gorm:"type:varchar(60)" json:"updateUser"`       //修改用户
+	IsDeleted       int       `gorm:"type:int;default 0" json:"isDeleted"`      //是否删除 0=未删除,1=删除
+	Threshold       int       `gorm:"type:int" json:"threshold"`                //阈值设定：告警百分比%
+}
+
+func (Garbage) TableName() string {
+	return "t_dev_garbage"
+}
+
+func (c Garbage) Delete() error {
+	return GDb.Model(&c).Where("id = ?", c.ID).Updates(map[string]interface{}{"update_time": c.UpdateTime,
+		"update_user": c.UpdateUser, "is_deleted": c.IsDeleted}).Error
+}
+
+func (c Garbage) IsExistedBySN() bool {
+	var count = 0
+	_ = GDb.Model(&c).Where("  device_sn = ? and is_deleted = ?",
+		c.DeviceSN, c.IsDeleted).Count(&count).Error
+	return count > 0
+}
+
+func (c Garbage) IsExistedByNameAndCode() bool {
+	var devices []Garbage
+	err := GDb.Model(&c).Where(" device_sn = ? and is_deleted = ?",
+		c.DeviceSN, c.IsDeleted).Find(&devices).Error
+	//如果查询不到，返回相应的错误
+	if gorm.IsRecordNotFoundError(err) {
+		return false
+	}
+	for _, d := range devices {
+		if d.ID != c.ID {
+			return true
+		}
+	}
+	return false
+}
+
+func (c *Garbage) Create() error {
+	return GDb.Model(&c).Save(&c).Error
+}
+
+func (c *Garbage) Update() error {
+	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
+}
+
+func (c *Garbage) GetDevice() error {
+	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
+	return err
+}
+
+func (c Garbage) GetDevices(offset, limit int) ([]Garbage, error) {
+	var devices []Garbage
+	err := GDb.Model(&c).Where(" device_name like ? ", "%"+c.DeviceName+"%").Offset(offset).Limit(limit).Find(&devices).Error
+	return devices, err
+}
+
+func (c Garbage) GetAllDevices() ([]*Garbage, error) {
+	var devices []*Garbage
+	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	return devices, err
+}

app/model/garbage.go

@@ -0,0 +1,15 @@
+package model
+
+import "iot_manager_service/app/dao"
+
+type RsqGarbageList struct {
+	Records []dao.Garbage `json:"records"` //记录列表
+	Current int           `json:"current"` //当前分页
+	Size    int           `json:"size"`    //每页数量
+	Pages   int           `json:"pages"`   //总页数
+	Total   int           `json:"total"`   //总数
+}
+
+type ReqGarbageRemove struct {
+	IDs int `json:"ids"` //分组编码
+}

app/service/garbageService.go

@@ -0,0 +1,103 @@
+package service
+
+import (
+	"fmt"
+	"iot_manager_service/app/dao"
+	"iot_manager_service/app/utils"
+	"time"
+)
+
+var GarbageService = new(garbageService)
+
+type garbageService struct{}
+
+func (s *garbageService) Get(id int) (*dao.Garbage, *utils.Errors) {
+	// 创建查询实例
+	device := &dao.Garbage{
+		ID: id,
+	}
+	err := device.GetDevice()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	return device, nil
+
+}
+
+func (s *garbageService) CreateOrUpdate(req dao.Garbage) *utils.Errors {
+	// 创建查询实例
+	device := req
+	if req.ID == 0 {
+		device.CreateTime = time.Now()
+		device.CreateUser = "TODO" // todo: 使用登录态
+		if device.IsExistedBySN() {
+			fmt.Printf("Create GetDeviceID err \n")
+			return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+		}
+		if err := device.Create(); err != nil {
+			fmt.Printf("Create err = %s \n", err.Error())
+			return utils.FailResponse(err.Error(), nil)
+		}
+		return utils.SuccessResponse(utils.Succeeded, nil)
+	}
+	device.UpdateUser = "TODO" // todo: 使用登录态
+	device.UpdateTime = time.Now()
+	if device.IsExistedByNameAndCode() {
+		return utils.ParamsInvalidResponse("编码不能重复，请重新填写！", nil)
+	}
+
+	if err := device.Update(); err != nil {
+		fmt.Printf("Update err = %s \n", err.Error())
+		return utils.FailResponse(err.Error(), nil)
+	}
+
+	//todo operation record
+	return utils.SuccessResponse(utils.Succeeded, nil)
+}
+func (s *garbageService) List(searchValue string, current, size int) ([]dao.Garbage, *utils.Errors) {
+	device := dao.Garbage{}
+	if searchValue != "" {
+		device.DeviceSN = searchValue
+		device.DeviceName = searchValue
+	}
+
+	offset := (current - 1) * size
+	limit := size
+	devices, err := device.GetDevices(offset, limit)
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+	return devices, nil
+}
+func (s *garbageService) Remove(id int) *utils.Errors {
+	// 创建查询实例
+	device := &dao.Garbage{
+		ID:         id,
+		IsDeleted:  1,
+		UpdateUser: "TODO", // todo 使用登录态
+		UpdateTime: time.Now(),
+	}
+	//todo
+	// service.garbageWayService.CountRelation()
+
+	//todo operation record
+	err := device.Delete()
+	if err != nil {
+		return utils.FailResponse(err.Error(), nil)
+	}
+	return nil
+}
+
+func (s *garbageService) GetList() ([]*dao.Garbage, *utils.Errors) {
+	// todo use redis cache
+	device := &dao.Garbage{
+		TenantId:  "000000", // todo 使用登录态
+		IsDeleted: 0,
+	}
+	devices, err := device.GetAllDevices()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+
+	return devices, nil
+}