diff --git a/main.go b/main.go index db99bee..39226f1 100644 --- a/main.go +++ b/main.go @@ -35,9 +35,9 @@ func (p *program) Stop(s service.Service) error { func main() { svcConfig := &service.Config{ - Name: "MDSMOM", - DisplayName: "MDSMOM", - Description: "this is MDSMOM", + Name: "LAPP_MDS_MOM", + DisplayName: "LAPP_MDS_MOM", + Description: "this is LAPP_MDS_MOM", } prg := &program{} @@ -76,22 +76,28 @@ func imain() { defer glog.Flush() fmt.Println(baseDir) - baseDir = utils.EnsureDir(baseDir) + baseDir,err := utils.GetCurrentPath(baseDir) + if err != nil { + fmt.Printf("failed to get time location: %v\n", err) + return + } fmt.Println(baseDir) pathLogDir := filepath.Join(baseDir, "glog") fmt.Println(pathLogDir) glog.DefaultInit(true, pathLogDir) glog.Infoln("启动日志", "InitDB return success") - var err error utils.TimezoneLocation, err = time.LoadLocation("Asia/Shanghai") if err != nil { fmt.Printf("failed to get time location: %v\n", err) return } //加载配置 - path := utils.EnsureDir("conf/config.yaml") - + path,err := utils.GetCurrentPath("conf/config.yaml") + if err != nil { + fmt.Printf("failed to get time location: %v\n", err) + return + } err = conf.ReadYamlConfig(path) if err != nil { fmt.Printf("failed to read yaml config due to: %v", err) diff --git a/services/ap/implments/CustDemandVerHead.service.impl.go b/services/ap/implments/CustDemandVerHead.service.impl.go index 666eb74..a1c7ff1 100644 --- a/services/ap/implments/CustDemandVerHead.service.impl.go +++ b/services/ap/implments/CustDemandVerHead.service.impl.go @@ -741,6 +741,9 @@ func (impl *CustDemandVerHeadServiceImplement) ImportFile(user *global.User, cus if err != nil { return err } + if mInfo.DemandStartDateMode != "W"{ + return grmi.NewBusinessError("客户模型类型只支持周(W)模型!") + } //数据长度:保存多少周的数据 lenData := mInfo.DemandWeeks //第一步:读取文件,构造一个map数组