Browse Source

数据拆分 增加代理商选项

yumeng 3 năm trước cách đây
mục cha
commit
c3edb9e8ed

+ 57 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/entity/AgentConfig.java

@@ -0,0 +1,57 @@
+package cn.com.ctop.common.module.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 代理商配置
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2022-05-17
+ */
+@Data
+@TableName("ctop_agent_config")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_agent_config对象", description = "代理商配置")
+public class AgentConfig {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * agentCode
+     */
+    @Excel(name = "agentCode", width = 15)
+    @ApiModelProperty(value = "agentCode")
+    private Long agentCode;
+    /**
+     * agentName
+     */
+    @Excel(name = "agentName", width = 15)
+    @ApiModelProperty(value = "agentName")
+    private String agentName;
+    /**
+     * createTime
+     */
+    @ApiModelProperty(value = "createTime")
+    private Date createTime;
+    /**
+     * updateTime
+     */
+    @ApiModelProperty(value = "updateTime")
+    private Date updateTime;
+}

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/entity/Project.java

@@ -150,4 +150,9 @@ public class Project {
     //深度转化目标
     @TableField(exist = false)
     private JSONArray deepConversionTypeArray;
+
+    private Long agentCode;
+    @TableField(exist = false)
+    private String agentCode_dictText;
+
 }

+ 15 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/AgentConfigMapper.java

@@ -0,0 +1,15 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.AgentConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 代理商配置
+ *
+ * @author jeecg-boot
+ * 2022-05-17
+ * @version V1.0
+ */
+public interface AgentConfigMapper extends BaseMapper<AgentConfig> {
+
+}

+ 5 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/mapper/xml/AgentConfigMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.com.ctop.common.module.mapper.AgentConfigMapper">
+
+</mapper>

+ 18 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/IAgentConfigService.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.AgentConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * 代理商配置
+ *
+ * @author jeecg-boot
+ * 2022-05-17
+ * @version V1.0
+ */
+public interface IAgentConfigService extends IService<AgentConfig> {
+
+    Map<Long, String> getAgentMap();
+}

+ 41 - 0
jeecg-boot-module-system/src/main/java/cn/com/ctop/common/module/service/impl/AgentConfigServiceImpl.java

@@ -0,0 +1,41 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.AgentConfig;
+import cn.com.ctop.common.module.mapper.AgentConfigMapper;
+import cn.com.ctop.common.module.service.IAgentConfigService;
+import cn.com.ctop.common.module.utils.Check;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代理商配置
+ *
+ * @author jeecg-boot
+ * 2022-05-17
+ * @version V1.0
+ */
+@Service
+public class AgentConfigServiceImpl extends ServiceImpl<AgentConfigMapper, AgentConfig> implements IAgentConfigService {
+    @Autowired
+    private AgentConfigMapper agentConfigMapper;
+
+    @Override
+    public Map<Long, String> getAgentMap() {
+        Map<Long, String> agentMap = new HashMap<>();
+        QueryWrapper<AgentConfig> queryWrapper = new QueryWrapper();
+        List<AgentConfig> agentConfigs = agentConfigMapper.selectList(queryWrapper);
+        if (!Check.isNull(agentConfigs)) {
+            for (AgentConfig agentConfig : agentConfigs) {
+                agentMap.put(agentConfig.getAgentCode(), agentConfig.getAgentName());
+            }
+        }
+
+        return agentMap;
+    }
+}

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

@@ -0,0 +1,241 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.entity.AgentConfig;
+import cn.com.ctop.common.module.service.IAgentConfigService;
+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.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+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.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代理商配置
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2022-05-17
+ */
+@Slf4j
+@Api(tags = "代理商配置")
+@RestController
+@RequestMapping("/agent/agentConfig")
+public class AgentConfigController {
+    @Autowired
+    private IAgentConfigService agentConfigService;
+
+    /**
+     * 分页列表查询
+     *
+     * @param agentConfig
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @ApiOperation(value = "代理商配置-分页列表查询", notes = "代理商配置-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<AgentConfig>> queryPageList(AgentConfig agentConfig,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        Result<IPage<AgentConfig>> result = new Result<>();
+        QueryWrapper<AgentConfig> queryWrapper = QueryGenerator.initQueryWrapper(agentConfig, req.getParameterMap());
+        Page<AgentConfig> page = new Page<AgentConfig>(pageNo, pageSize);
+        IPage<AgentConfig> pageList = agentConfigService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param agentConfig
+     * @return
+     */
+    @ApiOperation(value = "代理商配置-添加", notes = "代理商配置-添加")
+    @PostMapping(value = "/add")
+    public Result<AgentConfig> add(@RequestBody AgentConfig agentConfig) {
+        Result<AgentConfig> result = new Result<>();
+        try {
+            agentConfigService.save(agentConfig);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param agentConfig
+     * @return
+     */
+    @ApiOperation(value = "代理商配置-编辑", notes = "代理商配置-编辑")
+    @PutMapping(value = "/edit")
+    public Result<AgentConfig> edit(@RequestBody AgentConfig agentConfig) {
+        Result<AgentConfig> result = new Result<AgentConfig>();
+        AgentConfig agentConfigEntity = agentConfigService.getById(agentConfig.getId());
+        if (agentConfigEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = agentConfigService.updateById(agentConfig);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "代理商配置-通过id删除", notes = "代理商配置-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id") String id) {
+        try {
+            agentConfigService.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<AgentConfig> deleteBatch(@RequestParam(name = "ids") String ids) {
+        Result<AgentConfig> result = new Result<>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.agentConfigService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @ApiOperation(value = "代理商配置-通过id查询", notes = "代理商配置-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<AgentConfig> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<AgentConfig> result = new Result<>();
+        AgentConfig agentConfig = agentConfigService.getById(id);
+        if (agentConfig == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(agentConfig);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<AgentConfig> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                AgentConfig agentConfig = JSON.parseObject(deString, AgentConfig.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(agentConfig, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<AgentConfig> pageList = agentConfigService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "代理商配置列表");
+        mv.addObject(NormalExcelConstants.CLASS, AgentConfig.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) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<AgentConfig> listAgentConfigs = ExcelImportUtil.importExcel(file.getInputStream(), AgentConfig.class, params);
+                agentConfigService.saveBatch(listAgentConfigs);
+                return Result.ok("文件导入成功!数据行数:" + listAgentConfigs.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

+ 15 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/TransferAccountServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.ctop.service.impl;
 
 import cn.com.ctop.common.module.entity.Project;
+import cn.com.ctop.common.module.service.IAgentConfigService;
 import cn.com.ctop.common.module.service.IProductService;
 import cn.com.ctop.common.module.service.ISupplierListService;
 import cn.com.ctop.common.module.service.ISysUserService;
@@ -43,6 +44,8 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
     private IProductService productService;
     @Autowired
     private ISupplierListService supplierListService;
+    @Autowired
+    private IAgentConfigService agentConfigService;
 
     @Override
     public List<JSONObject> selectCost(Long accountId, String startDate, String endDate) {
@@ -55,6 +58,7 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
         return transferAccountMapper.getAccountQuarterDetail(accountId, startDate, endDate);
     }
 
+
     @Override
     public List<Project> getTransferInfoListByList(List<Project> records) {
         if (Check.isNull(records)) {
@@ -119,6 +123,9 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
             }
         }
 
+
+        Map<Long, String> agentMap = agentConfigService.getAgentMap();
+
         for (Project project : records) {
             if (!Check.isNullMap(advertiserMap)) {
                 project.setAdvertiserId_dictText(advertiserMap.get(project.getAdvertiserId()));
@@ -137,12 +144,18 @@ public class TransferAccountServiceImpl extends ServiceImpl<TransferAccountMappe
             if (!Check.isNullMap(supplierMap)) {
                 project.setSupplierCode_dictText(supplierMap.get(project.getSupplierCode()));
             }
-            if (!Check.isNull(project.getOcpxActionType())&&!project.getOcpxActionType().isEmpty()) {
+            if (!Check.isNull(project.getOcpxActionType()) && !project.getOcpxActionType().isEmpty()) {
                 project.setOcpxActionTypeArray(JSONArray.parseArray(project.getOcpxActionType()));
             }
-            if (!Check.isNull(project.getDeepConversionType())&&!project.getDeepConversionType().isEmpty()) {
+            if (!Check.isNull(project.getDeepConversionType()) && !project.getDeepConversionType().isEmpty()) {
                 project.setDeepConversionTypeArray(JSONArray.parseArray(project.getDeepConversionType()));
             }
+            if (!Check.isNullMap(agentMap)) {
+                if (!Check.isNull(project.getAgentCode())) {
+                    project.setAgentCode_dictText(agentMap.get(project.getAgentCode()));
+                }
+
+            }
         }
         return records;
     }