Merge branch 'mobile_ETA_1.9' into debug

# Conflicts:
#	models/data_manage/chart_info.go
#	services/data/edb_data.go

controllers/data_manage/manual.go

@@ -0,0 +1,43 @@
+package data_manage
+
+import (
+	"eta/eta_mobile/controllers"
+	"eta/eta_mobile/models"
+	"eta/eta_mobile/services/data"
+)
+
+// 手工数据管理
+type ManualController struct {
+	controllers.BaseAuthController
+}
+
+// @Title 手工数据权限用户搜索
+// @Description 手工数据权限用户搜索
+// @Param   KeyWord   query   string  false       "关键词搜索"
+// @Success 200 {object} data_manage.ManualSysUser
+// @router /manual/sysuser/search [get]
+func (this *ManualController) ManualSysUserSearch() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.Ret = 408
+		return
+	}
+	keyWord := this.GetString("KeyWord")
+	list, err := data.GetManualSysUser(keyWord)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,Err:" + err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = list
+}
+

controllers/ppt_v2_group.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"eta/eta_mobile/models"
 	"eta/eta_mobile/services/ppt"
+	"strings"
 )
 
 type PptV2GroupController struct {
@@ -535,3 +536,39 @@ func (this *PptV2GroupController) PptList() {
 	br.Data = data
 	return
 }
+
+// ListSearch
+// @Title 我的/公开PPT搜索
+// @Description 我的/公开PPT搜索
+// @Param   Keyword		query  string	true	"关键字"
+// @Success 200 {object} models.RespGroupPptList
+// @router /ppt/search [get]
+func (this *PptV2GroupController) ListSearch() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+	keyword := this.GetString("Keyword")
+	keyword = strings.TrimSpace(keyword)
+
+	data, err := ppt.SearchPptList(sysUser.AdminId, keyword)
+	if err != nil {
+		br.Msg = err.Error()
+		return
+	}
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "查询成功"
+	br.Data = data
+}

models/data_manage/chart_info.go

@@ -2652,7 +2652,6 @@ type EdbDateConfDateChange struct {
 	ChangeType   int    `description:"日期变换类型1日期位移，2指定频率"`
 }
 
-
 // 自定义右轴指标
 type SeasonRightAxis struct {
 	IndicatorType int     `description:"右轴指标类型 1:左轴指标同比，2:指标库，3:预测指标 "`
@@ -2755,4 +2754,73 @@ type MaxMinLimitsData struct {
 	DataTimestamp int64   `description:"数据日期时间戳"`
 	MaxValue      float64 `description:"最大值"`
 	MinValue      float64 `description:"最小值"`
+}
+
+func getThsHfEdbDataListByMongo(source, subSource, edbInfoId int, startDate, endDate string) (list []*EdbDataList, err error) {
+	list = make([]*EdbDataList, 0)
+
+	mogDataObj := mgo.EdbDataThsHf{}
+	// 构建查询条件
+	queryConditions := bson.M{
+		"edb_info_id": edbInfoId,
+	}
+
+	// 数据日期
+	dateCondition, err := mgo.BuildDateCondition(startDate, endDate)
+	if err != nil {
+		return
+	}
+	if len(dateCondition) > 0 {
+		queryConditions["data_time"] = dateCondition
+	}
+
+	// 获取列表数据
+	tmpDataList, tmpErr := mogDataObj.GetAllDataList(queryConditions, []string{"data_time"})
+	if tmpErr != nil {
+		err = tmpErr
+		return
+	}
+	for k, v := range tmpDataList {
+		list = append(list, &EdbDataList{
+			EdbDataId:     k + 1,
+			EdbInfoId:     v.EdbInfoId,
+			DataTime:      v.DataTime.Format(utils.FormatDate),
+			DataTimestamp: v.DataTimestamp,
+			Value:         v.Value,
+		})
+	}
+	return
+}
+
+func getThsHfEdbDataListMinAndMaxByMongo(source, subSource, edbInfoId int, startDate, endDate string) (minData, maxData float64, err error) {
+	mogDataObj := mgo.EdbDataThsHf{}
+	// 构建查询条件
+	queryConditions := bson.M{
+		"edb_info_id": edbInfoId,
+	}
+	// 日期
+	dateCondition, err := mgo.BuildDateCondition(startDate, endDate)
+	if err != nil {
+		return
+	}
+	if len(dateCondition) > 0 {
+		queryConditions["data_time"] = dateCondition
+	}
+
+	pipeline := []bson.M{
+		{"$match": queryConditions},
+		{"$group": bson.M{
+			"_id":       nil,
+			"min_value": bson.M{"$min": "$value"},
+			"max_value": bson.M{"$max": "$value"},
+		}},
+		{"$project": bson.M{"_id": 0}}, // 可选，如果不需要_id字段
+	}
+	result, err := mogDataObj.GetEdbInfoMaxAndMinInfo(pipeline)
+	if err != nil {
+		return
+	}
+	minData = result.MinValue
+	maxData = result.MaxValue
+	return
 }

models/data_manage/manual.go

@@ -0,0 +1,34 @@
+package data_manage
+
+import "github.com/beego/beego/v2/client/orm"
+
+type ManualSysUser struct {
+	ItemId   int    `description:"部门/组/用户 id"`
+	ItemName string `description:"部门/组/用户 名称"`
+	Children []*ManualSysUser
+}
+
+type ManualClassifyEdbInfoCount struct {
+	ClassifyId int
+	Total      int
+}
+
+func GetManualClassifyEdbInfoCount() (items []*ManualClassifyEdbInfoCount, err error) {
+	sql := ` SELECT a.classify_id,COUNT(1) AS total FROM edbdata_classify AS a
+			INNER JOIN edbinfo AS b ON a.classify_id=b.classify_id
+			WHERE a.is_show=1
+			GROUP BY a.classify_id `
+	o := orm.NewOrmUsingDB("edb")
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+// GetManualEdbInfoCountByClassifyId 根据手工指标分类id获取指标数
+func GetManualEdbInfoCountByClassifyId(classifyId int) (total int, err error) {
+	sql := ` SELECT COUNT(1) AS total FROM edbdata_classify AS a
+			INNER JOIN edbinfo AS b ON a.classify_id=b.classify_id
+			WHERE a.is_show=1 AND b.classify_id = ?`
+	o := orm.NewOrmUsingDB("edb")
+	err = o.Raw(sql, classifyId).QueryRow(&total)
+	return
+}

routers/commentsRouter.go

@@ -2797,6 +2797,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/data_manage:ManualController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/data_manage:ManualController"],
+        beego.ControllerComments{
+            Method: "ManualSysUserSearch",
+            Router: `/manual/sysuser/search`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mobile/controllers/data_manage:MyChartController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/data_manage:MyChartController"],
         beego.ControllerComments{
             Method: "MyChartAdd",
@@ -4966,6 +4975,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers:PptV2GroupController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers:PptV2GroupController"],
+        beego.ControllerComments{
+            Method: "ListSearch",
+            Router: `/ppt/search`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mobile/controllers:PptV2GroupController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers:PptV2GroupController"],
         beego.ControllerComments{
             Method: "SharePpt",

routers/router.go

@@ -153,6 +153,7 @@ func init() {
 				&data_manage.PredictEdbInfoController{},
 				&data_manage.ChartThemeController{},
 				&data_manage_permission.DataMangePermissionController{},
+				&data_manage.ManualController{},
 			),
 		),
 		web.NSNamespace("/my_chart",

services/data/edb_data.go

@@ -666,4 +666,48 @@ func GetEdbDataTbzForSeason(frequency string, tmpDataList []*data_manage.EdbData
 	}
 
 	return
-}
+}
+
+func getThsHfPageDataByMongo(edbInfoId, source, subSource int, endDataTime string, startSize, pageSize int) (dataCount int, dataList []*data_manage.EdbData, err error) {
+	dataList = make([]*data_manage.EdbData, 0)
+
+	mogDataObj := mgo.EdbDataThsHf{}
+	// 构建查询条件
+	queryConditions := bson.M{
+		"edb_info_id": edbInfoId,
+	}
+
+	// 结束日期
+	dateCondition, err := mgo.BuildDateCondition("", endDataTime)
+	if err != nil {
+		return
+	}
+	if len(dateCondition) > 0 {
+		queryConditions["data_time"] = dateCondition
+	}
+
+	// 获取数据总量
+	tmpCount, tmpErr := mogDataObj.GetCountDataList(queryConditions)
+	if tmpErr != nil && tmpErr.Error() != utils.ErrNoRow() {
+		err = tmpErr
+		return
+	}
+	dataCount = int(tmpCount)
+
+	// 获取列表数据
+	tmpDataList, tmpErr := mogDataObj.GetPageDataList(queryConditions, int64(startSize), int64(pageSize), []string{"-data_time"})
+	if tmpErr != nil {
+		err = tmpErr
+		return
+	}
+	for k, v := range tmpDataList {
+		dataList = append(dataList, &data_manage.EdbData{
+			EdbDataId: k + 1,
+			EdbInfoId: v.EdbInfoId,
+			DataTime:  v.DataTime.Format(utils.FormatDate),
+			Value:     v.Value,
+		})
+	}
+
+	return
+}

services/data/manual.go

@@ -0,0 +1,84 @@
+package data
+
+import (
+	"eta/eta_mobile/models/data_manage"
+	"eta/eta_mobile/models/system"
+	"eta/eta_mobile/utils"
+	"fmt"
+)
+
+func GetManualSysUser(keyWord string) (list []*data_manage.ManualSysUser, err error) {
+	//departmentId := 1
+	list = make([]*data_manage.ManualSysUser, 0)
+	departmentItems, err := system.GetSysDepartmentAll()
+	if err != nil {
+		return list, err
+	}
+	for _, dv := range departmentItems {
+		department := new(data_manage.ManualSysUser)
+		department.ItemId = dv.DepartmentId * 10000
+		department.ItemName = dv.DepartmentName
+
+		fmt.Println(department.ItemId, department.ItemName)
+		//GetSysuserList
+
+		var condition string
+		var pars []interface{}
+
+		if keyWord != "" {
+			condition += ` AND (real_name LIKE ? OR admin_name LIKE ? OR mobile LIKE ? )  `
+			pars = utils.GetLikeKeywordPars(pars, keyWord, 3)
+		}
+		sysUsers, err := system.GetSysUserItems(condition, pars)
+		if err != nil {
+			return list, err
+		}
+
+		groups, err := system.GetSysGroupByDepartmentId(dv.DepartmentId)
+		if err != nil {
+			return list, err
+		}
+		dg := make([]*data_manage.ManualSysUser, 0)
+		for _, v := range groups {
+			group := new(data_manage.ManualSysUser)
+			group.ItemId = v.DepartmentId * 100000
+			group.ItemName = v.GroupName
+
+			for _, sv := range sysUsers {
+				user := new(data_manage.ManualSysUser)
+				user.ItemId = sv.AdminId
+				user.ItemName = sv.RealName
+				if sv.GroupId == v.GroupId {
+					group.Children = append(group.Children, user)
+				}
+			}
+			if len(group.Children) > 0 {
+				dg = append(dg, group)
+			}
+		}
+
+		if len(groups) <= 0 {
+			group := new(data_manage.ManualSysUser)
+			group.ItemId = dv.DepartmentId * 100000
+			group.ItemName = "无分组"
+
+			for _, sv := range sysUsers {
+				user := new(data_manage.ManualSysUser)
+				user.ItemId = sv.AdminId
+				user.ItemName = sv.RealName
+				if sv.DepartmentId == dv.DepartmentId && sv.GroupId == 0 {
+					group.Children = append(group.Children, user)
+				}
+			}
+			if len(group.Children) > 0 {
+				dg = append(dg, group)
+			}
+		}
+
+		if len(dg) > 0 {
+			department.Children = dg
+			list = append(list, department)
+		}
+	}
+	return
+}

services/ppt/ppt_group.go

@@ -1744,3 +1744,51 @@ func GetPptList(adminId int, keyword string) (ret models.RespGroupPptList, err e
 	ret.Total = len(list)
 	return
 }
+
+
+// SearchPptList PPT搜索(我的/公开PPT)
+func SearchPptList(adminId int, keyword string) (ret models.RespGroupPptList, err error) {
+	list := make([]*models.RespGroupPptListItem, 0)
+	ret.List = list
+
+	var condition string
+	var pars []interface{}
+
+	// 公开的PPT或是我的非公开PPT
+	condition += ` AND (is_share = 1 OR (admin_id = ? AND is_share = 0)) `
+	pars = append(pars, adminId)
+
+	if keyword != `` {
+		kw := fmt.Sprint("%", keyword, "%")
+		condition += ` AND (title LIKE ? OR admin_real_name LIKE ? ) `
+		pars = append(pars, kw, kw)
+	}
+	pptList, err := models.GetAllPptV2List(condition, pars)
+
+	if len(pptList) <= 0 {
+		return
+	}
+
+	for _, v := range pptList {
+		tmpV := &models.RespGroupPptListItem{
+			GroupPptId:    int64(v.PptId),
+			PptId:         int64(v.PptId),
+			TemplateType:  v.TemplateType,
+			BackgroundImg: v.BackgroundImg,
+			Title:         v.Title,
+			PptCreateTime: v.CreateTime.Format(utils.FormatDateTime),
+			AdminId:       v.AdminId,
+			AdminRealName: v.AdminRealName,
+			PptVersion:    v.PptVersion,
+			IsSingleShare: v.IsShare,
+			PptxUrl:       v.PptxUrl,
+			ReportId:      v.ReportId,
+			ReportCode:    v.ReportCode,
+		}
+		list = append(list, tmpV)
+	}
+
+	ret.List = list
+	ret.Total = len(list)
+	return
+}

services/smart_report.go

@@ -139,23 +139,27 @@ import asyncio
 from pyppeteer import launch
 
 @asyncio.coroutine
-def main():
+async def main():
     # 异步代码
-    browser = yield from launch({
+    browser = await launch({
         'executablePath': '%s',
         'headless': True,
         'args': ['--disable-infobars', '--no-sandbox']
     })
-    page = yield from browser.newPage()
-    yield from page.setViewport({
+    page = await browser.newPage()
+    await page.setViewport({
         'width': 1920,
         'height': 1080,
     })
-    yield from page.goto('%s', {
+    await page.goto('%s', {
         'waitUntil': 'networkidle0',
         'timeout': 1000000  # 设置超时时间为 100 秒
     })
-    yield from page.pdf({
+
+    # 在生成PDF之前等待2秒
+    await asyncio.sleep(5)
+
+    await page.pdf({
         'path': "%s",
         'printBackground': True,
         'format': "A2",
@@ -166,7 +170,7 @@ def main():
             'right': '10mm'
         }
     })
-    yield from browser.close()
+    await browser.close()
 
 # 创建事件循环
 loop = asyncio.get_event_loop()