Преглед изворни кода

修改账户日报拉取数据时间周期

songyh пре 3 година
родитељ
комит
e2c85177ee

+ 0 - 235
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/JhsBakendDataController.java

@@ -1,235 +0,0 @@
-package org.jeecg.modules.ctop.controller;
-
-import cn.com.ctop.common.module.utils.QueryGenerator;
-import com.alibaba.excel.event.AnalysisEventListener;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.ctop.entity.JhsBakendData;
-import org.jeecg.modules.ctop.service.IJhsBakendDataService;
-import org.jeecg.modules.excelutil.ExcelUtils;
-import org.jeecg.modules.excelutil.JhsBakendDataExcelListener;
-import org.jeecg.modules.excelutil.entity.JhsBakendDataEntity;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
- /**
- * 聚划算后端数据
- * @author jeecg-boot
- * @date   2020-09-07
- * @version V1.0
- */
-@Slf4j
-@Api(tags="聚划算后端数据")
-@RestController
-@RequestMapping("/okr/jhsBakendData")
-public class JhsBakendDataController {
-	@Autowired
-	private IJhsBakendDataService jhsBakendDataService;
-
-	/**
-	  * 分页列表查询
-	 * @param jhsBakendData
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@GetMapping(value = "/list")
-	public Result<IPage<JhsBakendData>> queryPageList(JhsBakendData jhsBakendData,
-													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-													  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-													  HttpServletRequest req) {
-		Result<IPage<JhsBakendData>> result = new Result<>();
-		QueryWrapper<JhsBakendData> queryWrapper = QueryGenerator.initQueryWrapper(jhsBakendData, req.getParameterMap());
-		Page<JhsBakendData> page = new Page<JhsBakendData>(pageNo, pageSize);
-		IPage<JhsBakendData> pageList = jhsBakendDataService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-
-	/**
-	  *   添加
-	 * @param jhsBakendData
-	 * @return
-	 */
-	@ApiOperation(value="聚划算后端数据-添加", notes="聚划算后端数据-添加")
-	@PostMapping(value = "/add")
-	public Result<JhsBakendData> add(@RequestBody JhsBakendData jhsBakendData) {
-		Result<JhsBakendData> result = new Result<>();
-		try {
-			jhsBakendDataService.save(jhsBakendData);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-
-	/**
-	  *  编辑
-	 * @param jhsBakendData
-	 * @return
-	 */
-	@ApiOperation(value="聚划算后端数据-编辑", notes="聚划算后端数据-编辑")
-	@PutMapping(value = "/edit")
-	public Result<JhsBakendData> edit(@RequestBody JhsBakendData jhsBakendData) {
-		Result<JhsBakendData> result = new Result<JhsBakendData>();
-		JhsBakendData jhsBakendDataEntity = jhsBakendDataService.getById(jhsBakendData.getId());
-		if(jhsBakendDataEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = jhsBakendDataService.updateById(jhsBakendData);
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@ApiOperation(value="聚划算后端数据-通过id删除", notes="聚划算后端数据-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			jhsBakendDataService.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@ApiOperation(value="聚划算后端数据-批量删除", notes="聚划算后端数据-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<JhsBakendData> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<JhsBakendData> result = new Result<>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.jhsBakendDataService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@ApiOperation(value="聚划算后端数据-通过id查询", notes="聚划算后端数据-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<JhsBakendData> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<JhsBakendData> result = new Result<>();
-		JhsBakendData jhsBakendData = jhsBakendDataService.getById(id);
-		if(jhsBakendData==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(jhsBakendData);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<JhsBakendData> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              JhsBakendData jhsBakendData = JSON.parseObject(deString, JhsBakendData.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(jhsBakendData, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<JhsBakendData> pageList = jhsBakendDataService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "聚划算后端数据列表");
-      mv.addObject(NormalExcelConstants.CLASS, JhsBakendData.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("聚划算后端数据列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-	  //1.读Excel
-	  MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-	  Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-	  for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-		  FileInputStream fis = null;
-		  try {
-			  MultipartFile file = entity.getValue();
-			  fis = (FileInputStream) file.getInputStream();
-			  AnalysisEventListener listener = new JhsBakendDataExcelListener();
-			  Boolean flag = ExcelUtils.readExcel(fis, JhsBakendDataEntity.class, listener);
-		  } catch (Exception e) {
-			  e.printStackTrace();
-		  } finally {
-			  if (fis != null) {
-				  try {
-					  fis.close();
-				  } catch (IOException e) {
-					  e.printStackTrace();
-				  }
-			  }
-		  }
-	  }
-	  return Result.ok("文件导入成功!");
-  }
-
-}

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/BytedanceCustomerDdTbtjData.java

@@ -34,4 +34,5 @@ public class BytedanceCustomerDdTbtjData {
 	private Date createTime;
 	/**updateTime*/
 	private Date updateTime;
+
 }

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/JhsBakendData.java

@@ -52,4 +52,5 @@ public class JhsBakendData {
 
 	public JhsBakendData() {
 	}
+
 }

+ 0 - 152
jeecg-boot-module-system/src/main/java/org/jeecg/modules/media/vue/MediaList.vue

@@ -1,152 +0,0 @@
-<template>
-    <a-card :bordered="false">
-
-        <!-- 查询区域 -->
-        <div class="table-page-search-wrapper">
-            <a-form layout="inline">
-                <a-row :gutter="24">
-
-                    <a-col :md="6" :sm="8">
-                        <a-form-item label="媒体名称">
-                            <a-input placeholder="请输入媒体名称" v-model="queryParam.name"></a-input>
-                        </a-form-item>
-                    </a-col>
-</template>
-<a-col :md="6" :sm="8">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-</a-col>
-
-</a-row>
-</a-form>
-</div>
-
-<!-- 操作按钮区域 -->
-<div class="table-operator">
-    <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-    <a-button type="primary" icon="download" @click="handleExportXls('媒体表')">导出</a-button>
-    <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
-              @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-    </a-upload>
-    <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-            <a-menu-item key="1" @click="batchDel">
-                <a-icon type="delete"/>
-                删除
-            </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-            <a-icon type="down"/>
-        </a-button>
-    </a-dropdown>
-</div>
-
-<!-- table区域-begin -->
-<div>
-    <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{
-        selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-    </div>
-
-    <a-table
-            ref="table"
-            size="middle"
-            bordered
-            rowKey="id"
-            :columns="columns"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :loading="loading"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-            @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-    </a-table>
-</div>
-<!-- table区域-end -->
-
-<!-- 表单区域 -->
-<media-modal ref="modalForm" @ok="modalFormOk"></media-modal>
-</a-card>
-</template>
-
-<script>
-    import MediaModal from './modules/MediaModal'
-    import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-
-    export default {
-        name: "MediaList",
-        mixins: [JeecgListMixin],
-        components: {
-            MediaModal
-        },
-        data() {
-            return {
-                description: '媒体表管理页面',
-                // 表头
-                columns: [
-                    {
-                        title: '#',
-                        dataIndex: '',
-                        key: 'rowIndex',
-                        width: 60,
-                        align: "center",
-                        customRender: function (t, r, index) {
-                            return parseInt(index) + 1;
-                        }
-                    },
-                    {
-                        title: '媒体名称',
-                        align: "center",
-                        dataIndex: 'name'
-                    },
-                    {
-                        title: '操作',
-                        dataIndex: 'action',
-                        align: "center",
-                        scopedSlots: {customRender: 'action'},
-                    }
-                ],
-                url: {
-                    list: "/media/media/list",
-                    delete: "/media/media/delete",
-                    deleteBatch: "/media/media/deleteBatch",
-                    exportXlsUrl: "media/media/exportXls",
-                    importExcelUrl: "media/media/importExcel",
-                },
-            }
-        },
-        computed: {
-            importExcelUrl: function () {
-                return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-            }
-        },
-        methods: {}
-    }
-</script>
-<style scoped>
-    @import '~@assets/less/common.less'
-</style>

+ 0 - 124
jeecg-boot-module-system/src/main/java/org/jeecg/modules/media/vue/modules/MediaModal.vue

@@ -1,124 +0,0 @@
-<template>
-    <a-modal
-            :title="title"
-            :width="800"
-            :visible="visible"
-            :confirmLoading="confirmLoading"
-            @ok="handleOk"
-            @cancel="handleCancel"
-            cancelText="关闭">
-
-        <a-spin :spinning="confirmLoading">
-            <a-form :form="form">
-
-                <a-form-item
-                        :labelCol="labelCol"
-                        :wrapperCol="wrapperCol"
-                        label="媒体名称">
-                    <a-input placeholder="请输入媒体名称" v-decorator="['name', validatorRules.name ]"/>
-                </a-form-item>
-
-            </a-form>
-        </a-spin>
-    </a-modal>
-</template>
-
-<script>
-    import {httpAction} from '@/api/manage'
-    import pick from 'lodash.pick'
-    import moment from "moment"
-
-    export default {
-        name: "MediaModal",
-        data() {
-            return {
-                title: "操作",
-                visible: false,
-                model: {},
-                labelCol: {
-                    xs: {span: 24},
-                    sm: {span: 5},
-                },
-                wrapperCol: {
-                    xs: {span: 24},
-                    sm: {span: 16},
-                },
-
-                confirmLoading: false,
-                form: this.$form.createForm(this),
-                validatorRules: {
-                    name: {rules: [{required: true, message: '请输入媒体名称!'}]},
-                },
-                url: {
-                    add: "/media/media/add",
-                    edit: "/media/media/edit",
-                },
-            }
-        },
-        created() {
-        },
-        methods: {
-            add() {
-                this.edit({});
-            },
-            edit(record) {
-                this.form.resetFields();
-                this.model = Object.assign({}, record);
-                this.visible = true;
-                this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'name'))
-                    //时间格式化
-                });
-
-            },
-            close() {
-                this.$emit('close');
-                this.visible = false;
-            },
-            handleOk() {
-                const that = this;
-                // 触发表单验证
-                this.form.validateFields((err, values) => {
-                    if (!err) {
-                        that.confirmLoading = true;
-                        let httpurl = '';
-                        let method = '';
-                        if (!this.model.id) {
-                            httpurl += this.url.add;
-                            method = 'post';
-                        } else {
-                            httpurl += this.url.edit;
-                            method = 'put';
-                        }
-                        let formData = Object.assign(this.model, values);
-                        //时间格式化
-
-                        console.log(formData)
-                        httpAction(httpurl, formData, method).then((res) => {
-                            if (res.success) {
-                                that.$message.success(res.message);
-                                that.$emit('ok');
-                            } else {
-                                that.$message.warning(res.message);
-                            }
-                        }).finally(() => {
-                            that.confirmLoading = false;
-                            that.close();
-                        })
-
-
-                    }
-                })
-            },
-            handleCancel() {
-                this.close()
-            },
-
-
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-
-</style>

+ 0 - 131
jeecg-boot-module-system/src/main/java/org/jeecg/modules/media/vue/modules/MediaModal__Style#Drawer.vue

@@ -1,131 +0,0 @@
-<template>
-    <a-drawer
-            :title="title"
-            :width="800"
-            placement="right"
-            :closable="false"
-            @close="close"
-            :visible="visible"
-    >
-
-        <a-spin :spinning="confirmLoading">
-            <a-form :form="form">
-
-                <a-form-item
-                        :labelCol="labelCol"
-                        :wrapperCol="wrapperCol"
-                        label="媒体名称">
-                    <a-input placeholder="请输入媒体名称" v-decorator="['name', validatorRules.name ]"/>
-                </a-form-item>
-
-            </a-form>
-        </a-spin>
-        <a-button type="primary" @click="handleOk">确定</a-button>
-        <a-button type="primary" @click="handleCancel">取消</a-button>
-    </a-drawer>
-</template>
-
-<script>
-    import {httpAction} from '@/api/manage'
-    import pick from 'lodash.pick'
-    import moment from "moment"
-
-    export default {
-        name: "MediaModal",
-        data() {
-            return {
-                title: "操作",
-                visible: false,
-                model: {},
-                labelCol: {
-                    xs: {span: 24},
-                    sm: {span: 5},
-                },
-                wrapperCol: {
-                    xs: {span: 24},
-                    sm: {span: 16},
-                },
-
-                confirmLoading: false,
-                form: this.$form.createForm(this),
-                validatorRules: {
-                    name: {rules: [{required: true, message: '请输入媒体名称!'}]},
-                },
-                url: {
-                    add: "/media/media/add",
-                    edit: "/media/media/edit",
-                },
-            }
-        },
-        created() {
-        },
-        methods: {
-            add() {
-                this.edit({});
-            },
-            edit(record) {
-                this.form.resetFields();
-                this.model = Object.assign({}, record);
-                this.visible = true;
-                this.$nextTick(() => {
-                    this.form.setFieldsValue(pick(this.model, 'name'))
-                    //时间格式化
-                });
-
-            },
-            close() {
-                this.$emit('close');
-                this.visible = false;
-            },
-            handleOk() {
-                const that = this;
-                // 触发表单验证
-                this.form.validateFields((err, values) => {
-                    if (!err) {
-                        that.confirmLoading = true;
-                        let httpurl = '';
-                        let method = '';
-                        if (!this.model.id) {
-                            httpurl += this.url.add;
-                            method = 'post';
-                        } else {
-                            httpurl += this.url.edit;
-                            method = 'put';
-                        }
-                        let formData = Object.assign(this.model, values);
-                        //时间格式化
-
-                        console.log(formData)
-                        httpAction(httpurl, formData, method).then((res) => {
-                            if (res.success) {
-                                that.$message.success(res.message);
-                                that.$emit('ok');
-                            } else {
-                                that.$message.warning(res.message);
-                            }
-                        }).finally(() => {
-                            that.confirmLoading = false;
-                            that.close();
-                        })
-
-
-                    }
-                })
-            },
-            handleCancel() {
-                this.close()
-            },
-
-
-        }
-    }
-</script>
-
-<style lang="less" scoped>
-    /** Button按钮间距 */
-    .ant-btn {
-        margin-left: 30px;
-        margin-bottom: 30px;
-        float: right;
-    }
-</style>

+ 1 - 1
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/BytedanceVideoReportMapper.xml

@@ -16,7 +16,7 @@
         t1.material_name AS materialName,
         t1.project_name AS projectName,
         t1.material_create_time AS createTime,
-        sum (t1.material_show) as showMaterial,
+        sum(t1.material_show) as showMaterial,
         ${filed}
         FROM
         etl_report_bytedance_video t1