edb_data_calculate_nhcc.go 18 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610
  1. package models
  2. import (
  3. "errors"
  4. "fmt"
  5. "github.com/beego/beego/v2/client/orm"
  6. "github.com/shopspring/decimal"
  7. "hongze/hongze_edb_lib/utils"
  8. "strings"
  9. "time"
  10. )
  11. // EdbDataCalculateNhcc 拟合残差数据结构体
  12. type EdbDataCalculateNhcc struct {
  13. EdbDataId int `orm:"column(edb_data_id);pk"`
  14. EdbInfoId int
  15. EdbCode string
  16. DataTime string
  17. Value float64
  18. Status int
  19. CreateTime time.Time
  20. ModifyTime time.Time
  21. DataTimestamp int64
  22. }
  23. // NhccDate 拟合残差的开始、结束日期
  24. type NhccDate struct {
  25. StartDate time.Time
  26. EndDate time.Time
  27. }
  28. // AddCalculateNhcc 新增拟合残差数据
  29. func AddCalculateNhcc(req *EdbInfoCalculateBatchSaveReq, firstEdbInfo, secondEdbInfo *EdbInfo, edbCode, uniqueCode string, nhccDate NhccDate, sysUserId int, sysUserRealName string) (edbInfo *EdbInfo, err error) {
  30. o := orm.NewOrm()
  31. to, err := o.Begin()
  32. if err != nil {
  33. return
  34. }
  35. defer func() {
  36. if err != nil {
  37. fmt.Println("AddCalculateNhcc,Err:" + err.Error())
  38. _ = to.Rollback()
  39. } else {
  40. _ = to.Commit()
  41. }
  42. }()
  43. if req.EdbInfoId <= 0 {
  44. edbInfo = &EdbInfo{
  45. SourceName: "拟合残差",
  46. Source: utils.DATA_SOURCE_CALCULATE_NHCC,
  47. EdbCode: edbCode,
  48. EdbName: req.EdbName,
  49. EdbNameSource: req.EdbName,
  50. Frequency: req.Frequency,
  51. Unit: req.Unit,
  52. StartDate: firstEdbInfo.StartDate,
  53. EndDate: firstEdbInfo.EndDate,
  54. ClassifyId: req.ClassifyId,
  55. SysUserId: sysUserId,
  56. SysUserRealName: sysUserRealName,
  57. UniqueCode: uniqueCode,
  58. CreateTime: time.Now(),
  59. ModifyTime: time.Now(),
  60. CalculateFormula: req.Formula,
  61. EdbType: 2,
  62. }
  63. newEdbInfoId, tmpErr := to.Insert(edbInfo)
  64. if tmpErr != nil {
  65. err = tmpErr
  66. return
  67. }
  68. edbInfo.EdbInfoId = int(newEdbInfoId)
  69. } else {
  70. edbInfo, err = GetEdbInfoById(req.EdbInfoId)
  71. if err != nil {
  72. return
  73. }
  74. //查询
  75. tmpEdbInfo, tmpErr := GetEdbInfoById(edbInfo.EdbInfoId)
  76. if tmpErr != nil {
  77. err = tmpErr
  78. return
  79. }
  80. tmpEdbInfo.EdbName = req.EdbName
  81. tmpEdbInfo.ClassifyId = req.ClassifyId
  82. tmpEdbInfo.Frequency = req.Frequency
  83. tmpEdbInfo.Unit = req.Unit
  84. tmpEdbInfo.CalculateFormula = req.Formula
  85. edbInfo = tmpEdbInfo
  86. //删除指标数据
  87. dataTableName := GetEdbDataTableName(utils.DATA_SOURCE_CALCULATE_NHCC)
  88. fmt.Println("dataTableName:" + dataTableName)
  89. deleteSql := ` DELETE FROM %s WHERE edb_info_id=? `
  90. deleteSql = fmt.Sprintf(deleteSql, dataTableName)
  91. _, err = to.Raw(deleteSql, req.EdbInfoId).Exec()
  92. if err != nil {
  93. return
  94. }
  95. //删除指标关系
  96. sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id=? `
  97. _, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
  98. }
  99. //关联关系
  100. var existItemA, existItemB *EdbInfoCalculateMapping
  101. //第一个指标
  102. {
  103. existItemA = &EdbInfoCalculateMapping{
  104. EdbInfoCalculateMappingId: 0,
  105. EdbInfoId: edbInfo.EdbInfoId,
  106. Source: edbInfo.Source,
  107. SourceName: edbInfo.SourceName,
  108. EdbCode: edbInfo.EdbCode,
  109. FromEdbInfoId: firstEdbInfo.EdbInfoId,
  110. FromEdbCode: firstEdbInfo.EdbCode,
  111. FromEdbName: firstEdbInfo.EdbName,
  112. FromSource: firstEdbInfo.Source,
  113. FromSourceName: firstEdbInfo.SourceName,
  114. FromTag: "A",
  115. MoveValue: req.EdbInfoIdArr[0].MoveValue,
  116. Sort: 1,
  117. CreateTime: time.Now(),
  118. ModifyTime: time.Now(),
  119. }
  120. insertId, tmpErr := to.Insert(existItemA)
  121. if tmpErr != nil {
  122. err = tmpErr
  123. return
  124. }
  125. existItemA.EdbInfoCalculateMappingId = int(insertId)
  126. }
  127. //第二个指标
  128. {
  129. existItemB = &EdbInfoCalculateMapping{
  130. EdbInfoCalculateMappingId: 0,
  131. EdbInfoId: edbInfo.EdbInfoId,
  132. Source: edbInfo.Source,
  133. SourceName: edbInfo.SourceName,
  134. EdbCode: edbInfo.EdbCode,
  135. FromEdbInfoId: secondEdbInfo.EdbInfoId,
  136. FromEdbCode: secondEdbInfo.EdbCode,
  137. FromEdbName: secondEdbInfo.EdbName,
  138. FromSource: secondEdbInfo.Source,
  139. FromSourceName: secondEdbInfo.SourceName,
  140. FromTag: "B",
  141. MoveValue: req.EdbInfoIdArr[1].MoveValue,
  142. Sort: 1,
  143. CreateTime: time.Now(),
  144. ModifyTime: time.Now(),
  145. }
  146. insertId, tmpErr := to.Insert(existItemB)
  147. if tmpErr != nil {
  148. err = tmpErr
  149. return
  150. }
  151. existItemB.EdbInfoCalculateMappingId = int(insertId)
  152. }
  153. //拼接数据
  154. err = refreshAllCalculateNhcc(to, edbInfo, existItemA, existItemB, nhccDate)
  155. return
  156. }
  157. // EditCalculateNhcc 编辑拟合残差数据
  158. func EditCalculateNhcc(req *EdbInfoCalculateBatchEditReq, edbInfo, firstEdbInfo, secondEdbInfo *EdbInfo, nhccDate NhccDate) (err error) {
  159. o := orm.NewOrm()
  160. to, err := o.Begin()
  161. if err != nil {
  162. return
  163. }
  164. defer func() {
  165. if err != nil {
  166. fmt.Println("EditCalculateNhcc,Err:" + err.Error())
  167. _ = to.Rollback()
  168. } else {
  169. _ = to.Commit()
  170. }
  171. }()
  172. nowEdbInfo := *edbInfo // 现在的指标信息
  173. //修改指标信息
  174. edbInfo.EdbName = req.EdbName
  175. edbInfo.EdbNameSource = req.EdbName
  176. edbInfo.Frequency = req.Frequency
  177. edbInfo.Unit = req.Unit
  178. edbInfo.ClassifyId = req.ClassifyId
  179. edbInfo.CalculateFormula = req.Formula
  180. edbInfo.ModifyTime = time.Now()
  181. _, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime")
  182. if err != nil {
  183. return
  184. }
  185. var existCondition string
  186. var existPars []interface{}
  187. existCondition += " AND edb_info_id=? "
  188. existPars = append(existPars, edbInfo.EdbInfoId)
  189. //查询出所有的关联指标
  190. existList, err := GetEdbInfoCalculateListByCondition(existCondition, existPars)
  191. if err != nil {
  192. err = fmt.Errorf("判断指标是否改变失败,Err:" + err.Error())
  193. return
  194. }
  195. var existItemA, existItemB *EdbInfoCalculateMapping
  196. for _, existItem := range existList {
  197. if existItem.FromTag == "A" {
  198. existItemA = existItem
  199. } else if existItem.FromTag == "B" {
  200. existItemB = existItem
  201. }
  202. }
  203. // 是否需要删除数据重新计算
  204. isNeedCalculateData := false
  205. // 如果截止日期变更,那么需要重新计算
  206. if req.Formula != nowEdbInfo.CalculateFormula {
  207. isNeedCalculateData = true
  208. }
  209. //第一个指标数据
  210. {
  211. // 如果指标变了,那么需要删除关系,并重新计算
  212. if existItemA.FromEdbInfoId != firstEdbInfo.EdbInfoId || existItemA.MoveValue != req.EdbInfoIdArr[0].MoveValue {
  213. //删除之前的A指标关联关系
  214. sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? and from_edb_info_id = ?`
  215. _, err = to.Raw(sql, edbInfo.EdbInfoId, existItemA.FromEdbInfoId).Exec()
  216. if err != nil {
  217. err = fmt.Errorf("删除拼接日期之前的指标关联关系失败,Err:" + err.Error())
  218. return
  219. }
  220. //添加新的指标关系
  221. {
  222. existItemA = &EdbInfoCalculateMapping{
  223. EdbInfoCalculateMappingId: 0,
  224. EdbInfoId: edbInfo.EdbInfoId,
  225. Source: edbInfo.Source,
  226. SourceName: edbInfo.SourceName,
  227. EdbCode: edbInfo.EdbCode,
  228. FromEdbInfoId: firstEdbInfo.EdbInfoId,
  229. FromEdbCode: firstEdbInfo.EdbCode,
  230. FromEdbName: firstEdbInfo.EdbName,
  231. FromSource: firstEdbInfo.Source,
  232. FromSourceName: firstEdbInfo.SourceName,
  233. FromTag: "A",
  234. MoveValue: req.EdbInfoIdArr[0].MoveValue,
  235. Sort: 1,
  236. CreateTime: time.Now(),
  237. ModifyTime: time.Now(),
  238. }
  239. insertId, tmpErr := to.Insert(existItemA)
  240. if tmpErr != nil {
  241. err = tmpErr
  242. return
  243. }
  244. existItemA.EdbInfoCalculateMappingId = int(insertId)
  245. isNeedCalculateData = true
  246. }
  247. }
  248. }
  249. //第二个指标数据
  250. {
  251. // 如果指标变了,那么需要删除关系,并重新计算
  252. if existItemB.FromEdbInfoId != secondEdbInfo.EdbInfoId || existItemB.MoveValue != req.EdbInfoIdArr[1].MoveValue {
  253. //删除之前的B指标关联关系
  254. sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? and from_edb_info_id = ?`
  255. _, err = to.Raw(sql, edbInfo.EdbInfoId, existItemB.FromEdbInfoId).Exec()
  256. if err != nil {
  257. err = fmt.Errorf("删除拼接日期之后的指标关联关系失败,Err:" + err.Error())
  258. return
  259. }
  260. // 添加新的指标关联关系
  261. existItemB = &EdbInfoCalculateMapping{
  262. EdbInfoCalculateMappingId: 0,
  263. EdbInfoId: edbInfo.EdbInfoId,
  264. Source: edbInfo.Source,
  265. SourceName: edbInfo.SourceName,
  266. EdbCode: edbInfo.EdbCode,
  267. FromEdbInfoId: secondEdbInfo.EdbInfoId,
  268. FromEdbCode: secondEdbInfo.EdbCode,
  269. FromEdbName: secondEdbInfo.EdbName,
  270. FromSource: secondEdbInfo.Source,
  271. FromSourceName: secondEdbInfo.SourceName,
  272. FromTag: "B",
  273. MoveValue: req.EdbInfoIdArr[1].MoveValue,
  274. Sort: 2,
  275. CreateTime: time.Now(),
  276. ModifyTime: time.Now(),
  277. }
  278. insertId, tmpErr := to.Insert(existItemB)
  279. if tmpErr != nil {
  280. err = tmpErr
  281. return
  282. }
  283. existItemA.EdbInfoCalculateMappingId = int(insertId)
  284. isNeedCalculateData = true
  285. }
  286. }
  287. // 如果需要重新计算,那么先删除所有的指标数据,然后再重新计算
  288. if isNeedCalculateData {
  289. // 删除之前所有的指标数据
  290. tableName := GetEdbDataTableName(edbInfo.Source)
  291. sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? `, tableName)
  292. _, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
  293. if err != nil {
  294. err = fmt.Errorf("删除历史数据失败,Err:" + err.Error())
  295. return
  296. }
  297. err = refreshAllCalculateNhcc(to, edbInfo, existItemA, existItemB, nhccDate)
  298. }
  299. return
  300. }
  301. // RefreshAllCalculateNhcc 刷新所有 拟合残差 数据
  302. func RefreshAllCalculateNhcc(edbInfo *EdbInfo) (err error) {
  303. o := orm.NewOrm()
  304. to, err := o.Begin()
  305. defer func() {
  306. if err != nil {
  307. fmt.Println("RefreshAllCalculateNhcc,Err:" + err.Error())
  308. _ = to.Rollback()
  309. } else {
  310. _ = to.Commit()
  311. }
  312. }()
  313. //查询关联指标信息
  314. var existCondition string
  315. var existPars []interface{}
  316. existCondition += " AND edb_info_id=? "
  317. existPars = append(existPars, edbInfo.EdbInfoId)
  318. existList, err := GetEdbInfoCalculateListByCondition(existCondition, existPars)
  319. if err != nil {
  320. err = fmt.Errorf("判断指标是否改变失败,Err:" + err.Error())
  321. return
  322. }
  323. var existItemA, existItemB *EdbInfoCalculateMapping
  324. for _, existItem := range existList {
  325. if existItem.FromTag == "A" {
  326. existItemA = existItem
  327. } else if existItem.FromTag == "B" {
  328. existItemB = existItem
  329. }
  330. }
  331. timeList := strings.Split(edbInfo.CalculateFormula, ",")
  332. startDate, err := time.ParseInLocation(utils.FormatDate, timeList[0], time.Local)
  333. if err != nil {
  334. return
  335. }
  336. endDate, err := time.ParseInLocation(utils.FormatDate, timeList[1], time.Local)
  337. if err != nil {
  338. return
  339. }
  340. if endDate.Sub(startDate).Hours() < 48 {
  341. return
  342. }
  343. nhccDate := NhccDate{
  344. StartDate: startDate,
  345. EndDate: endDate,
  346. }
  347. // 刷新数据
  348. err = refreshAllCalculateNhcc(to, edbInfo, existItemA, existItemB, nhccDate)
  349. return
  350. }
  351. // refreshAllCalculateNhcc 刷新所有 拟合残差 数据
  352. func refreshAllCalculateNhcc(to orm.TxOrmer, edbInfo *EdbInfo, existItemA, existItemB *EdbInfoCalculateMapping, nhccDate NhccDate) (err error) {
  353. //查询当前指标现有的数据
  354. var condition string
  355. var pars []interface{}
  356. condition += " AND edb_info_id=? "
  357. pars = append(pars, edbInfo.EdbInfoId)
  358. var dataList []*EdbDataCalculateNhcc
  359. sql := ` SELECT * FROM edb_data_calculate_nhcc WHERE edb_info_id=? ORDER BY data_time DESC `
  360. _, err = to.Raw(sql, edbInfo.EdbInfoId).QueryRows(&dataList)
  361. if err != nil {
  362. return err
  363. }
  364. var dateArr []string
  365. dataMap := make(map[string]*EdbDataCalculateNhcc)
  366. removeDataTimeMap := make(map[string]int) //需要移除的日期数据
  367. for _, v := range dataList {
  368. dateArr = append(dateArr, v.DataTime)
  369. dataMap[v.DataTime] = v
  370. removeDataTimeMap[v.DataTime] = 1
  371. }
  372. addDataList := make([]*EdbDataCalculateNhcc, 0)
  373. //第一个指标
  374. aDataList := make([]EdbInfoSearchData, 0)
  375. aDataMap := make(map[string]float64)
  376. {
  377. var condition string
  378. var pars []interface{}
  379. condition += " AND edb_info_id=? "
  380. pars = append(pars, existItemA.FromEdbInfoId)
  381. //第一个指标的数据列表
  382. firstDataList, tmpErr := GetEdbDataListAllByTo(to, condition, pars, existItemA.FromSource, 0)
  383. if tmpErr != nil {
  384. return tmpErr
  385. }
  386. aDataList, aDataMap = handleNhccData(firstDataList, existItemA.MoveValue)
  387. }
  388. //第二个指标
  389. bDataList := make([]EdbInfoSearchData, 0)
  390. bDataMap := make(map[string]float64)
  391. {
  392. condition = ``
  393. pars = make([]interface{}, 0)
  394. condition += " AND edb_info_id = ? "
  395. pars = append(pars, edbInfo.CalculateFormula, existItemB.FromEdbInfoId)
  396. //第二个指标的数据列表
  397. secondDataList, tmpErr := GetEdbDataListAllByTo(to, condition, pars, existItemB.FromSource, 0)
  398. if tmpErr != nil {
  399. return tmpErr
  400. }
  401. bDataList, bDataMap = handleNhccData(secondDataList, existItemB.MoveValue)
  402. }
  403. // 计算线性方程公式
  404. var a, b float64
  405. {
  406. coordinateData := make([]Coordinate, 0)
  407. for i := nhccDate.StartDate; i.Before(nhccDate.EndDate) || i.Equal(nhccDate.EndDate); i.AddDate(0, 0, 1) {
  408. dateStr := i.Format(utils.FormatDate)
  409. xValue, ok := aDataMap[dateStr]
  410. if !ok {
  411. err = errors.New("指标A日期:" + dateStr + "数据异常,导致计算线性方程是失败")
  412. return
  413. }
  414. yValue, ok := bDataMap[dateStr]
  415. if !ok {
  416. err = errors.New("指标B日期:" + dateStr + "数据异常,导致计算线性方程是失败")
  417. return
  418. }
  419. tmpCoordinate := Coordinate{
  420. X: xValue,
  421. Y: yValue,
  422. }
  423. coordinateData = append(coordinateData, tmpCoordinate)
  424. }
  425. a, b = getLinearResult(coordinateData)
  426. }
  427. //fmt.Println("a:", a, ";======b:", b)
  428. //计算B’
  429. newBDataMap := make(map[string]float64)
  430. {
  431. //B’=aA+b
  432. aDecimal := decimal.NewFromFloat(a)
  433. bDecimal := decimal.NewFromFloat(b)
  434. for _, aData := range aDataList {
  435. xDecimal := decimal.NewFromFloat(aData.Value)
  436. val, _ := aDecimal.Mul(xDecimal).Add(bDecimal).RoundCeil(4).Float64()
  437. newBDataMap[aData.DataTime] = val
  438. }
  439. }
  440. // Delta=B-B‘
  441. for _, bData := range bDataList {
  442. currDate := bData.DataTime
  443. //校验待删除日期数据里面是否存在该元素,如果存在的话,那么移除该元素
  444. if _, ok := removeDataTimeMap[currDate]; ok {
  445. delete(removeDataTimeMap, currDate)
  446. }
  447. b2Val, ok := newBDataMap[currDate]
  448. if !ok {
  449. // 如果B`不存在数据,那么就退出当前循环
  450. continue
  451. }
  452. bDecimal := decimal.NewFromFloat(bData.Value)
  453. b2Decimal := decimal.NewFromFloat(b2Val)
  454. val, _ := bDecimal.Sub(b2Decimal).RoundCeil(4).Float64()
  455. // 判断之前有没有该数据
  456. existData, ok := dataMap[currDate]
  457. if !ok { //不存在那么就添加吧
  458. currentDate, _ := time.Parse(utils.FormatDate, currDate)
  459. timestamp := currentDate.UnixNano() / 1e6
  460. edbDataNhcc := &EdbDataCalculateNhcc{
  461. EdbInfoId: edbInfo.EdbInfoId,
  462. EdbCode: edbInfo.EdbCode,
  463. DataTime: currDate,
  464. Value: val,
  465. Status: 1,
  466. CreateTime: time.Now(),
  467. ModifyTime: time.Now(),
  468. DataTimestamp: timestamp,
  469. }
  470. addDataList = append(addDataList, edbDataNhcc)
  471. } else {
  472. // 如果有的话,还需要判断值是否一致,一致则不处理,不一致则修改
  473. if existData.Value != val {
  474. existData.Value = val
  475. _, err = to.Update(existData, "Value")
  476. if err != nil {
  477. return
  478. }
  479. }
  480. }
  481. }
  482. //删除已经不存在的累计同比拼接指标数据(由于同比值当日的数据删除了)
  483. {
  484. removeDateList := make([]string, 0)
  485. for dateTime := range removeDataTimeMap {
  486. removeDateList = append(removeDateList, dateTime)
  487. }
  488. removeNum := len(removeDateList)
  489. if removeNum > 0 {
  490. //如果拼接指标变更了,那么需要删除所有的指标数据
  491. tableName := GetEdbDataTableName(edbInfo.Source)
  492. sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (`+utils.GetOrmInReplace(removeNum)+`) `, tableName)
  493. _, err = to.Raw(sql, edbInfo.EdbInfoId, removeDateList).Exec()
  494. if err != nil {
  495. err = fmt.Errorf("删除不存在的拟合残差指标数据失败,Err:" + err.Error())
  496. return
  497. }
  498. }
  499. }
  500. //数据入库
  501. if len(addDataList) > 0 {
  502. _, tmpErr := to.InsertMulti(len(addDataList), addDataList)
  503. if tmpErr != nil {
  504. err = tmpErr
  505. return
  506. }
  507. }
  508. return
  509. }
  510. // handleNhccData 处理拟合残差需要的数据
  511. func handleNhccData(dataList []*EdbInfoSearchData, moveDay int) (newDataList []EdbInfoSearchData, dateDataMap map[string]float64) {
  512. dateMap := make(map[time.Time]float64)
  513. var minDate, maxDate time.Time
  514. //dateList := make([]string, 0)
  515. for _, v := range dataList {
  516. currDate, _ := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
  517. if minDate.IsZero() || currDate.Before(minDate) {
  518. minDate = currDate
  519. }
  520. if maxDate.IsZero() || currDate.After(maxDate) {
  521. maxDate = currDate
  522. }
  523. dateMap[currDate] = v.Value
  524. }
  525. // 处理领先、滞后数据
  526. newDateMap := make(map[time.Time]float64)
  527. for currDate, value := range dateMap {
  528. newDate := currDate.AddDate(0, 0, moveDay)
  529. newDateMap[newDate] = value
  530. }
  531. minDate = minDate.AddDate(0, 0, moveDay)
  532. maxDate = maxDate.AddDate(0, 0, moveDay)
  533. // 开始变频
  534. dayNum := utils.GetTimeSubDay(minDate, maxDate)
  535. for i := 0; i <= dayNum; i++ {
  536. currDate := minDate.AddDate(0, 0, i)
  537. tmpValue, ok := newDateMap[currDate]
  538. if !ok {
  539. //找不到数据,那么就用前面的数据吧
  540. tmpValue = newDataList[len(newDataList)-1].Value
  541. }
  542. tmpData := EdbInfoSearchData{
  543. //EdbDataId: 0,
  544. DataTime: currDate.Format(utils.FormatDate),
  545. Value: tmpValue,
  546. }
  547. dateDataMap[tmpData.DataTime] = tmpData.Value
  548. newDataList = append(newDataList, tmpData)
  549. }
  550. return
  551. }