变压器的剩余两个接口remove，getList

app/controller/transformerController.go

@@ -71,7 +71,24 @@ func (c *transformerCtl) CreateOrUpdate(ctx *gin.Context) {
 }
 
 func (c *transformerCtl) Remove(ctx *gin.Context) {
+	var req *model.ReqTransformerRemove
+	if err := ctx.ShouldBindJSON(&req); err != nil {
+		ctx.JSON(http.StatusOK, utils.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	err := service.TransformerService.Remove(req.IDs)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, nil))
 }
 
 func (c *transformerCtl) GetList(ctx *gin.Context) {
+	devices, err := service.TransformerService.GetList()
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	ctx.JSON(http.StatusOK, utils.SuccessResponse(utils.Succeeded, devices))
 }

app/dao/transformerDao.go

@@ -33,7 +33,8 @@ func (Transformer) TableName() string {
 }
 
 func (c Transformer) Delete() error {
-	return GDb.Model(&c).Updates(map[string]interface{}{"state": 0}).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 Transformer) IsExistedByCode() bool {
@@ -62,20 +63,24 @@ func (c Transformer) IsExistedByNameAndCode() bool {
 func (c *Transformer) Create() error {
 	return GDb.Model(&c).Save(&c).Error
 }
+
 func (c *Transformer) Update() error {
 	return GDb.Model(&c).Where(" id = ? ", c.ID).Update(&c).Error
 }
 
-func (c Transformer) GetCameraDevice() error {
-	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
-	return err
-}
 func (c *Transformer) GetDevice() error {
 	err := GDb.Model(&c).Where(" id = ? ", c.ID).Scan(&c).Error
 	return err
 }
+
 func (c Transformer) GetDevices(offset, limit int) ([]Transformer, error) {
 	var devices []Transformer
 	err := GDb.Model(&c).Where(" trans_name like ? ", "%"+c.TransName+"%").Offset(offset).Limit(limit).Find(&devices).Error
 	return devices, err
 }
+
+func (c Transformer) GetAllDevices() ([]*Transformer, error) {
+	var devices []*Transformer
+	err := GDb.Model(&c).Where(" tenant_id = ? and is_deleted = ? ", c.TenantId, c.IsDeleted).Scan(&devices).Error
+	return devices, err
+}

app/model/transformer.go

@@ -9,3 +9,7 @@ type RsqTransformerList struct {
 	Pages   int               `json:"pages"`   //总页数
 	Total   int               `json:"total"`   //总数
 }
+
+type ReqTransformerRemove struct {
+	IDs int `json:"ids"` //分组编码
+}

app/service/transformerService.go

@@ -27,7 +27,6 @@ func (s *transformerService) Get(id int) (*dao.Transformer, *utils.Errors) {
 func (s *transformerService) CreateOrUpdate(req dao.Transformer) *utils.Errors {
 	// 创建查询实例
 	device := req
-
 	if req.ID == 0 {
 		device.CreateTime = time.Now()
 		device.CreateUser = "TODO" // todo: 使用登录态
@@ -70,3 +69,35 @@ func (s *transformerService) List(searchValue string, current, size int) ([]dao.
 	}
 	return devices, nil
 }
+func (s *transformerService) Remove(id int) *utils.Errors {
+	// 创建查询实例
+	device := &dao.Transformer{
+		ID:         id,
+		IsDeleted:  1,
+		UpdateUser: "TODO", // todo 使用登录态
+		UpdateTime: time.Now(),
+	}
+	//todo
+	// service.transformerService.CountRelation()
+
+	//todo operation record
+	err := device.Delete()
+	if err != nil {
+		return utils.FailResponse(err.Error(), nil)
+	}
+	return nil
+}
+
+func (s *transformerService) GetList() ([]*dao.Transformer, *utils.Errors) {
+	// todo use redis cache
+	device := &dao.Transformer{
+		TenantId:  "000000", // todo 使用登录态
+		IsDeleted: 0,
+	}
+	devices, err := device.GetAllDevices()
+	if err != nil {
+		return nil, utils.FailResponse(err.Error(), nil)
+	}
+
+	return devices, nil
+}