Browse Source

修复锁的bug

pull/216/head
zhangxin 2 years ago
parent
commit
2aa8d8ac17
3 changed files with 5 additions and 3 deletions
  1. +2
    -2
      models/channel/ReleaseTask.go
  2. +0
    -1
      services/pln/implments/CustOrder.service.impl.go
  3. +3
    -0
      services/pln/implments/CustOrderLogic.service.impl.go

+ 2
- 2
models/channel/ReleaseTask.go View File

@ -14,7 +14,7 @@ type ReleaseTaskChannel struct {
func NewReleaseChannel() *ReleaseTaskChannel {
return &ReleaseTaskChannel{
c: make(chan plnModel.CustOrder, 50),
c: make(chan plnModel.CustOrder, 100),
}
}
@ -48,11 +48,11 @@ func (c *ReleaseTaskChannel) Close() {
func (c *ReleaseTaskChannel) Read() (data plnModel.CustOrder, ok bool, err error) {
c.mutex.Lock()
defer c.mutex.Unlock()
if c.closed {
err = errors.New("管道已关闭")
return
}
c.mutex.Unlock()
data, ok = <- c.c
return
}


+ 0
- 1
services/pln/implments/CustOrder.service.impl.go View File

@ -1815,7 +1815,6 @@ func (impl *CustOrderServiceImplement) AutoScheduler(user *global.User, session
return nil, grmi.NewBusinessError("保存客户订单数量失败, 错误:" + err.Error())
}
returnCustOrderLi = append(returnCustOrderLi, *custOrder)
}
return returnCustOrderLi, nil
}

+ 3
- 0
services/pln/implments/CustOrderLogic.service.impl.go View File

@ -20,6 +20,7 @@ import (
model "LAPP_ACURA_MOM_BACKEND/models/pln"
omSvr "LAPP_ACURA_MOM_BACKEND/services/om"
"LAPP_ACURA_MOM_BACKEND/utils"
"fmt"
"github.com/360EntSecGroup-Skylar/excelize/v2"
uuid "github.com/iris-contrib/go.uuid"
"sort"
@ -270,11 +271,13 @@ func (impl *CustOrderServiceImplement) AnalysisPlanFromExcel(user *global.User,
plantNr := user.PlantNr
channel, exist := common.ReleaseTaskChannel[plantNr]
if !exist {
fmt.Println("通道不存在")
return nil
}
for _, custOrder := range releaseCustOrderLi {
err = channel.SendData(custOrder)
if err != nil {
fmt.Println("发送数据出错:" + err.Error())
return nil
}
}


Loading…
Cancel
Save