Browse Source

添加自定义表单数据表

syh 4 years ago
parent
commit
0e24a324eb
26 changed files with 1307 additions and 25 deletions
  1. 234 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActCustomFormController.java
  2. 234 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActFormDataController.java
  3. 234 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActFormFieldController.java
  4. 234 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ActFormPorcessController.java
  5. 34 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/ActCustomForm.java
  6. 35 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormData.java
  7. 34 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormField.java
  8. 33 0
      module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormPorcess.java
  9. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/ActCustomFormMapper.java
  10. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormDataMapper.java
  11. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormFieldMapper.java
  12. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormPorcessMapper.java
  13. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActCustomFormMapper.xml
  14. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormDataMapper.xml
  15. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormFieldMapper.xml
  16. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormPorcessMapper.xml
  17. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IActCustomFormService.java
  18. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IActFormDataService.java
  19. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IActFormFieldService.java
  20. 14 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IActFormPorcessService.java
  21. 18 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActCustomFormServiceImpl.java
  22. 18 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormDataServiceImpl.java
  23. 18 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormFieldServiceImpl.java
  24. 18 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormPorcessServiceImpl.java
  25. 2 1
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyAgentService.java
  26. 29 24
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyAgentServiceImpl.java

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

@@ -0,0 +1,234 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.entity.ActCustomForm;
+import cn.com.ctop.common.module.service.IActCustomFormService;
+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
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="自定义表单信息")
+@RestController
+@RequestMapping("/ctop/actCustomForm")
+public class ActCustomFormController {
+	@Autowired
+	private IActCustomFormService actCustomFormService;
+
+	/**
+	  * 分页列表查询
+	 * @param actCustomForm
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单信息-分页列表查询", notes="自定义表单信息-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ActCustomForm>> queryPageList(ActCustomForm actCustomForm,
+													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													  HttpServletRequest req) {
+		Result<IPage<ActCustomForm>> result = new Result<>();
+		QueryWrapper<ActCustomForm> queryWrapper = QueryGenerator.initQueryWrapper(actCustomForm, req.getParameterMap());
+		Page<ActCustomForm> page = new Page<ActCustomForm>(pageNo, pageSize);
+		IPage<ActCustomForm> pageList = actCustomFormService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param actCustomForm
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单信息-添加", notes="自定义表单信息-添加")
+	@PostMapping(value = "/add")
+	public Result<ActCustomForm> add(@RequestBody ActCustomForm actCustomForm) {
+		Result<ActCustomForm> result = new Result<>();
+		try {
+			actCustomFormService.save(actCustomForm);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param actCustomForm
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单信息-编辑", notes="自定义表单信息-编辑")
+	@PutMapping(value = "/edit")
+	public Result<ActCustomForm> edit(@RequestBody ActCustomForm actCustomForm) {
+		Result<ActCustomForm> result = new Result<ActCustomForm>();
+		ActCustomForm actCustomFormEntity = actCustomFormService.getById(actCustomForm.getId());
+		if(actCustomFormEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = actCustomFormService.updateById(actCustomForm);
+			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 {
+			actCustomFormService.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<ActCustomForm> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<ActCustomForm> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.actCustomFormService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单信息-通过id查询", notes="自定义表单信息-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ActCustomForm> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<ActCustomForm> result = new Result<>();
+		ActCustomForm actCustomForm = actCustomFormService.getById(id);
+		if(actCustomForm==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(actCustomForm);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<ActCustomForm> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              ActCustomForm actCustomForm = JSON.parseObject(deString, ActCustomForm.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(actCustomForm, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<ActCustomForm> pageList = actCustomFormService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "自定义表单信息列表");
+      mv.addObject(NormalExcelConstants.CLASS, ActCustomForm.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<ActCustomForm> listActCustomForms = ExcelImportUtil.importExcel(file.getInputStream(), ActCustomForm.class, params);
+              actCustomFormService.saveBatch(listActCustomForms);
+              return Result.ok("文件导入成功!数据行数:" + listActCustomForms.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("文件导入失败!");
+  }
+
+}

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

@@ -0,0 +1,234 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.entity.ActFormData;
+import cn.com.ctop.common.module.service.IActFormDataService;
+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
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="自定义表单存储数据")
+@RestController
+@RequestMapping("/ctop/actFormData")
+public class ActFormDataController {
+	@Autowired
+	private IActFormDataService actFormDataService;
+
+	/**
+	  * 分页列表查询
+	 * @param actFormData
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单存储数据-分页列表查询", notes="自定义表单存储数据-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ActFormData>> queryPageList(ActFormData actFormData,
+													@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													HttpServletRequest req) {
+		Result<IPage<ActFormData>> result = new Result<>();
+		QueryWrapper<ActFormData> queryWrapper = QueryGenerator.initQueryWrapper(actFormData, req.getParameterMap());
+		Page<ActFormData> page = new Page<ActFormData>(pageNo, pageSize);
+		IPage<ActFormData> pageList = actFormDataService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param actFormData
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单存储数据-添加", notes="自定义表单存储数据-添加")
+	@PostMapping(value = "/add")
+	public Result<ActFormData> add(@RequestBody ActFormData actFormData) {
+		Result<ActFormData> result = new Result<>();
+		try {
+			actFormDataService.save(actFormData);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param actFormData
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单存储数据-编辑", notes="自定义表单存储数据-编辑")
+	@PutMapping(value = "/edit")
+	public Result<ActFormData> edit(@RequestBody ActFormData actFormData) {
+		Result<ActFormData> result = new Result<ActFormData>();
+		ActFormData actFormDataEntity = actFormDataService.getById(actFormData.getId());
+		if(actFormDataEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = actFormDataService.updateById(actFormData);
+			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 {
+			actFormDataService.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<ActFormData> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<ActFormData> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.actFormDataService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单存储数据-通过id查询", notes="自定义表单存储数据-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ActFormData> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<ActFormData> result = new Result<>();
+		ActFormData actFormData = actFormDataService.getById(id);
+		if(actFormData==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(actFormData);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<ActFormData> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              ActFormData actFormData = JSON.parseObject(deString, ActFormData.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(actFormData, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<ActFormData> pageList = actFormDataService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "自定义表单存储数据列表");
+      mv.addObject(NormalExcelConstants.CLASS, ActFormData.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<ActFormData> listActFormDatas = ExcelImportUtil.importExcel(file.getInputStream(), ActFormData.class, params);
+              actFormDataService.saveBatch(listActFormDatas);
+              return Result.ok("文件导入成功!数据行数:" + listActFormDatas.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("文件导入失败!");
+  }
+
+}

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

@@ -0,0 +1,234 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.entity.ActFormField;
+import cn.com.ctop.common.module.service.IActFormFieldService;
+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
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="自定义表单字段信息")
+@RestController
+@RequestMapping("/ctop/actFormField")
+public class ActFormFieldController {
+	@Autowired
+	private IActFormFieldService actFormFieldService;
+
+	/**
+	  * 分页列表查询
+	 * @param actFormField
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单字段信息-分页列表查询", notes="自定义表单字段信息-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ActFormField>> queryPageList(ActFormField actFormField,
+													 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													 HttpServletRequest req) {
+		Result<IPage<ActFormField>> result = new Result<>();
+		QueryWrapper<ActFormField> queryWrapper = QueryGenerator.initQueryWrapper(actFormField, req.getParameterMap());
+		Page<ActFormField> page = new Page<>(pageNo, pageSize);
+		IPage<ActFormField> pageList = actFormFieldService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param actFormField
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单字段信息-添加", notes="自定义表单字段信息-添加")
+	@PostMapping(value = "/add")
+	public Result<ActFormField> add(@RequestBody ActFormField actFormField) {
+		Result<ActFormField> result = new Result<>();
+		try {
+			actFormFieldService.save(actFormField);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param actFormField
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单字段信息-编辑", notes="自定义表单字段信息-编辑")
+	@PutMapping(value = "/edit")
+	public Result<ActFormField> edit(@RequestBody ActFormField actFormField) {
+		Result<ActFormField> result = new Result<ActFormField>();
+		ActFormField actFormFieldEntity = actFormFieldService.getById(actFormField.getId());
+		if(actFormFieldEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = actFormFieldService.updateById(actFormField);
+			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 {
+			actFormFieldService.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<ActFormField> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<ActFormField> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.actFormFieldService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单字段信息-通过id查询", notes="自定义表单字段信息-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ActFormField> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<ActFormField> result = new Result<>();
+		ActFormField actFormField = actFormFieldService.getById(id);
+		if(actFormField==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(actFormField);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<ActFormField> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              ActFormField actFormField = JSON.parseObject(deString, ActFormField.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(actFormField, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<ActFormField> pageList = actFormFieldService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "自定义表单字段信息列表");
+      mv.addObject(NormalExcelConstants.CLASS, ActFormField.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<ActFormField> listActFormFields = ExcelImportUtil.importExcel(file.getInputStream(), ActFormField.class, params);
+              actFormFieldService.saveBatch(listActFormFields);
+              return Result.ok("文件导入成功!数据行数:" + listActFormFields.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("文件导入失败!");
+  }
+
+}

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

@@ -0,0 +1,234 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.entity.ActFormPorcess;
+import cn.com.ctop.common.module.service.IActFormPorcessService;
+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
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Slf4j
+@Api(tags="自定义表单关联流程信息")
+@RestController
+@RequestMapping("/ctop/actFormPorcess")
+public class ActFormPorcessController {
+	@Autowired
+	private IActFormPorcessService actFormPorcessService;
+
+	/**
+	  * 分页列表查询
+	 * @param actFormPorcess
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单关联流程信息-分页列表查询", notes="自定义表单关联流程信息-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ActFormPorcess>> queryPageList(ActFormPorcess actFormPorcess,
+													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   HttpServletRequest req) {
+		Result<IPage<ActFormPorcess>> result = new Result<>();
+		QueryWrapper<ActFormPorcess> queryWrapper = QueryGenerator.initQueryWrapper(actFormPorcess, req.getParameterMap());
+		Page<ActFormPorcess> page = new Page<>(pageNo, pageSize);
+		IPage<ActFormPorcess> pageList = actFormPorcessService.page(page, queryWrapper);
+		result.setSuccess(true);
+		result.setResult(pageList);
+		return result;
+	}
+
+	/**
+	  *   添加
+	 * @param actFormPorcess
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单关联流程信息-添加", notes="自定义表单关联流程信息-添加")
+	@PostMapping(value = "/add")
+	public Result<ActFormPorcess> add(@RequestBody ActFormPorcess actFormPorcess) {
+		Result<ActFormPorcess> result = new Result<>();
+		try {
+			actFormPorcessService.save(actFormPorcess);
+			result.success("添加成功!");
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+			result.error500("操作失败");
+		}
+		return result;
+	}
+
+	/**
+	  *  编辑
+	 * @param actFormPorcess
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单关联流程信息-编辑", notes="自定义表单关联流程信息-编辑")
+	@PutMapping(value = "/edit")
+	public Result<ActFormPorcess> edit(@RequestBody ActFormPorcess actFormPorcess) {
+		Result<ActFormPorcess> result = new Result<ActFormPorcess>();
+		ActFormPorcess actFormPorcessEntity = actFormPorcessService.getById(actFormPorcess.getId());
+		if(actFormPorcessEntity==null) {
+			result.error500("未找到对应实体");
+		}else {
+			boolean ok = actFormPorcessService.updateById(actFormPorcess);
+			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 {
+			actFormPorcessService.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<ActFormPorcess> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		Result<ActFormPorcess> result = new Result<>();
+		if(ids==null || "".equals(ids.trim())) {
+			result.error500("参数不识别!");
+		}else {
+			this.actFormPorcessService.removeByIds(Arrays.asList(ids.split(",")));
+			result.success("删除成功!");
+		}
+		return result;
+	}
+
+	/**
+	  * 通过id查询
+	 * @param id
+	 * @return
+	 */
+	@ApiOperation(value="自定义表单关联流程信息-通过id查询", notes="自定义表单关联流程信息-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<ActFormPorcess> queryById(@RequestParam(name="id",required=true) String id) {
+		Result<ActFormPorcess> result = new Result<>();
+		ActFormPorcess actFormPorcess = actFormPorcessService.getById(id);
+		if(actFormPorcess==null) {
+			result.error500("未找到对应实体");
+		}else {
+			result.setResult(actFormPorcess);
+			result.setSuccess(true);
+		}
+		return result;
+	}
+
+  /**
+      * 导出excel
+   *
+   * @param request
+   * @param response
+   */
+  @RequestMapping(value = "/exportXls")
+  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+      // Step.1 组装查询条件
+      QueryWrapper<ActFormPorcess> queryWrapper = null;
+      try {
+          String paramsStr = request.getParameter("paramsStr");
+          if (oConvertUtils.isNotEmpty(paramsStr)) {
+              String deString = URLDecoder.decode(paramsStr, "UTF-8");
+              ActFormPorcess actFormPorcess = JSON.parseObject(deString, ActFormPorcess.class);
+              queryWrapper = QueryGenerator.initQueryWrapper(actFormPorcess, request.getParameterMap());
+          }
+      } catch (UnsupportedEncodingException e) {
+          e.printStackTrace();
+      }
+
+      //Step.2 AutoPoi 导出Excel
+      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+      List<ActFormPorcess> pageList = actFormPorcessService.list(queryWrapper);
+      //导出文件名称
+      mv.addObject(NormalExcelConstants.FILE_NAME, "自定义表单关联流程信息列表");
+      mv.addObject(NormalExcelConstants.CLASS, ActFormPorcess.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<ActFormPorcess> listActFormPorcesss = ExcelImportUtil.importExcel(file.getInputStream(), ActFormPorcess.class, params);
+              actFormPorcessService.saveBatch(listActFormPorcesss);
+              return Result.ok("文件导入成功!数据行数:" + listActFormPorcesss.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("文件导入失败!");
+  }
+
+}

+ 34 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/ActCustomForm.java

@@ -0,0 +1,34 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 自定义表单信息
+ * @author jeecg-boot
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_act_custom_form")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_act_custom_form对象", description="自定义表单信息")
+public class ActCustomForm {
+
+	@TableId(type = IdType.AUTO)
+	private Long id;
+	private String name;
+	private String text;
+	private String userId;
+	private Integer status;
+	private Date createTime;
+	private Date updateTime;
+}

+ 35 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormData.java

@@ -0,0 +1,35 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 自定义表单存储数据
+ * @author jeecg-boot
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_act_form_data")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_act_form_data对象", description="自定义表单存储数据")
+public class ActFormData {
+
+	@TableId(type = IdType.AUTO)
+	private Long id;
+	private Long formId;
+	private String processId;
+	private String key;
+	private String value;
+	private Integer status;
+	private Date createTime;
+	private Date updateTime;
+}

+ 34 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormField.java

@@ -0,0 +1,34 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 自定义表单字段信息
+ * @author jeecg-boot
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_act_form_field")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_act_form_field对象", description="自定义表单字段信息")
+public class ActFormField {
+
+	@TableId(type = IdType.AUTO)
+	private Long id;
+	private Long formId;
+	private String key;
+	private String type;
+	private Integer status;
+	private Date createTime;
+	private Date updateTime;
+}

+ 33 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/ActFormPorcess.java

@@ -0,0 +1,33 @@
+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 lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * 自定义表单关联流程信息
+ * @author jeecg-boot
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_act_form_porcess")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_act_form_porcess对象", description="自定义表单关联流程信息")
+public class ActFormPorcess {
+
+	@TableId(type = IdType.AUTO)
+	private Long id;
+	private Long formId;
+	private String processId;
+	private Integer status;
+	private Date createTime;
+	private Date updateTime;
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/ActCustomFormMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.ActCustomForm;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 自定义表单信息
+ * @author: jeecg-boot
+ * @date:   2020-08-25
+ * @cersion: V1.0
+ */
+public interface ActCustomFormMapper extends BaseMapper<ActCustomForm> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormDataMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.ActFormData;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 自定义表单存储数据
+ * @author: jeecg-boot
+ * @date:   2020-08-25
+ * @cersion: V1.0
+ */
+public interface ActFormDataMapper extends BaseMapper<ActFormData> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormFieldMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.ActFormField;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 自定义表单字段信息
+ * @author: jeecg-boot
+ * @date:   2020-08-25
+ * @cersion: V1.0
+ */
+public interface ActFormFieldMapper extends BaseMapper<ActFormField> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/ActFormPorcessMapper.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.mapper;
+
+import cn.com.ctop.common.module.entity.ActFormPorcess;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 自定义表单关联流程信息
+ * @author: jeecg-boot
+ * @date:   2020-08-25
+ * @cersion: V1.0
+ */
+public interface ActFormPorcessMapper extends BaseMapper<ActFormPorcess> {
+
+}

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActCustomFormMapper.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.ActCustomFormMapper">
+
+</mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormDataMapper.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.ActFormDataMapper">
+
+</mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormFieldMapper.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.ActFormFieldMapper">
+
+</mapper>

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/ActFormPorcessMapper.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.ActFormPorcessMapper">
+
+</mapper>

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IActCustomFormService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.ActCustomForm;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 自定义表单信息
+ * @Author: jeecg-boot
+ * @Date:   2020-08-25
+ * @Version: V1.0
+ */
+public interface IActCustomFormService extends IService<ActCustomForm> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IActFormDataService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.ActFormData;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 自定义表单存储数据
+ * @Author: jeecg-boot
+ * @Date:   2020-08-25
+ * @Version: V1.0
+ */
+public interface IActFormDataService extends IService<ActFormData> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IActFormFieldService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.ActFormField;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 自定义表单字段信息
+ * @Author: jeecg-boot
+ * @Date:   2020-08-25
+ * @Version: V1.0
+ */
+public interface IActFormFieldService extends IService<ActFormField> {
+
+}

+ 14 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IActFormPorcessService.java

@@ -0,0 +1,14 @@
+package cn.com.ctop.common.module.service;
+
+import cn.com.ctop.common.module.entity.ActFormPorcess;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 自定义表单关联流程信息
+ * @Author: jeecg-boot
+ * @Date:   2020-08-25
+ * @Version: V1.0
+ */
+public interface IActFormPorcessService extends IService<ActFormPorcess> {
+
+}

+ 18 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActCustomFormServiceImpl.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.ActCustomForm;
+import cn.com.ctop.common.module.mapper.ActCustomFormMapper;
+import cn.com.ctop.common.module.service.IActCustomFormService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 自定义表单信息
+ * @author jeecg-boot
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Service
+public class ActCustomFormServiceImpl extends ServiceImpl<ActCustomFormMapper, ActCustomForm> implements IActCustomFormService {
+
+}

+ 18 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormDataServiceImpl.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.ActFormData;
+import cn.com.ctop.common.module.mapper.ActFormDataMapper;
+import cn.com.ctop.common.module.service.IActFormDataService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 自定义表单存储数据
+ * @author jeecg-boot
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Service
+public class ActFormDataServiceImpl extends ServiceImpl<ActFormDataMapper, ActFormData> implements IActFormDataService {
+
+}

+ 18 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormFieldServiceImpl.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.ActFormField;
+import cn.com.ctop.common.module.mapper.ActFormFieldMapper;
+import cn.com.ctop.common.module.service.IActFormFieldService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 自定义表单字段信息
+ * @author jeecg-boot
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Service
+public class ActFormFieldServiceImpl extends ServiceImpl<ActFormFieldMapper, ActFormField> implements IActFormFieldService {
+
+}

+ 18 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/ActFormPorcessServiceImpl.java

@@ -0,0 +1,18 @@
+package cn.com.ctop.common.module.service.impl;
+
+import cn.com.ctop.common.module.entity.ActFormPorcess;
+import cn.com.ctop.common.module.mapper.ActFormPorcessMapper;
+import cn.com.ctop.common.module.service.IActFormPorcessService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 自定义表单关联流程信息
+ * @author jeecg-boot
+ * @date   2020-08-25
+ * @version V1.0
+ */
+@Service
+public class ActFormPorcessServiceImpl extends ServiceImpl<ActFormPorcessMapper, ActFormPorcess> implements IActFormPorcessService {
+
+}

+ 2 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/IKuaishouReportDailyAgentService.java

@@ -1,5 +1,6 @@
 package cn.com.ctop.kuaishou.modules.report.service;
 
+import cn.com.ctop.kuaishou.modules.report.entity.KuaiShouDailyAgent;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgent;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -12,7 +13,7 @@ import java.util.List;
  * @version V1.0
  */
 public interface IKuaishouReportDailyAgentService extends IService<KuaishouReportDailyAgent> {
-    void replaceBatch(List<KuaishouReportDailyAgent> list);
+    void replaceBatch(List<KuaiShouDailyAgent> list);
     void getReport(String startDate,String endDate);
     boolean getAccount(int currentPage);
 }

+ 29 - 24
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaishouReportDailyAgentServiceImpl.java

@@ -3,9 +3,11 @@ package cn.com.ctop.kuaishou.modules.report.service.impl;
 import cn.com.ctop.common.module.utils.Base64Utils;
 import cn.com.ctop.common.module.utils.ChaojiyingUtils;
 import cn.com.ctop.common.module.utils.HttpUtils2;
+import cn.com.ctop.kuaishou.modules.report.entity.KuaiShouDailyAgent;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouAgentAccount;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgent;
 import cn.com.ctop.kuaishou.modules.report.entity.KuaishouReportDailyAgentSum;
+import cn.com.ctop.kuaishou.modules.report.mapper.KuaiShouDailyAgentMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouAgentAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAgentMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAgentSumMapper;
@@ -48,7 +50,7 @@ import java.util.*;
 @Service
 public class KuaishouReportDailyAgentServiceImpl extends ServiceImpl<KuaishouReportDailyAgentMapper, KuaishouReportDailyAgent> implements IKuaishouReportDailyAgentService {
     @Autowired
-    private KuaishouReportDailyAgentMapper kuaishouReportDailyAgentMapper;
+    private KuaiShouDailyAgentMapper kuaiShouDailyAgentMapper;
     @Autowired
     private KuaishouReportDailyAgentSumMapper kuaishouReportDailyAgentSumMapper;
     @Autowired
@@ -59,8 +61,10 @@ public class KuaishouReportDailyAgentServiceImpl extends ServiceImpl<KuaishouRep
     private String kuaishouAgentImage;
 
     @Override
-    public void replaceBatch(List<KuaishouReportDailyAgent> list) {
-        kuaishouReportDailyAgentMapper.replaceBatch(list);
+    public void replaceBatch(List<KuaiShouDailyAgent> list) {
+        for(KuaiShouDailyAgent agent:list){
+            kuaiShouDailyAgentMapper.insert(agent);
+        }
     }
 
     private void tapPoint(WebDriver driver, Integer x, Integer y) {
@@ -239,7 +243,7 @@ public class KuaishouReportDailyAgentServiceImpl extends ServiceImpl<KuaishouRep
     public void getReport(String startDate, String endDate) {
         try {
             if (!loginAgent()) {
-                return;
+                return; 
             }
             String currentDate = startDate;
             Map<String, String> headerMap = new HashMap<>();
@@ -262,7 +266,7 @@ public class KuaishouReportDailyAgentServiceImpl extends ServiceImpl<KuaishouRep
                 if (code == 1) {
                     Iterator<JsonNode> iterator1 = resultNode.get("data").elements();
                     int i = 0;
-                    List<KuaishouReportDailyAgent> reportList = new ArrayList<>();
+                    List<KuaiShouDailyAgent> reportList = new ArrayList<>();
                     while (iterator1.hasNext()) {
                         JsonNode dataNode = iterator1.next();
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -288,26 +292,27 @@ public class KuaishouReportDailyAgentServiceImpl extends ServiceImpl<KuaishouRep
                             kuaishouReportDailyAgentSumMapper.delete(queryWrapper);
                             kuaishouReportDailyAgentSumMapper.insert(kuaishouReportDailyAgentSum);
                         } else {
-                            KuaishouReportDailyAgent kuaishouReportDailyAgent = new KuaishouReportDailyAgent();
-                            kuaishouReportDailyAgent.setAccountId(dataNode.get("accountId").asInt());
-                            kuaishouReportDailyAgent.setAdvertiserCreateTime(new Date(dataNode.get("createTime").asLong()));
-                            kuaishouReportDailyAgent.setAdvertiserName(dataNode.get("accountName").asText());
-                            kuaishouReportDailyAgent.setBalance(dataNode.get("totalBalanceDouble").decimalValue());
+                            KuaiShouDailyAgent kuaishouReportDailyAgent = new KuaiShouDailyAgent();
+                            kuaishouReportDailyAgent.setAccountId(dataNode.get("accountId").asLong());
+//                            kuaishouReportDailyAgent.setAdvertiserCreateTime(new Date(dataNode.get("createTime").asLong()));
+                            kuaishouReportDailyAgent.setAccountName(dataNode.get("accountName").asText());
+                            kuaishouReportDailyAgent.setTotalBalanceInYuan(dataNode.get("totalBalanceDouble").decimalValue());
                             // kuaishouReportDailyAgent.setConvertClickRate(dataNode.get("actionbarClickRatio").decimalValue());
-                            kuaishouReportDailyAgent.setConvertCount(dataNode.get("actionbarClick").asInt());
-                            kuaishouReportDailyAgent.setCost(dataNode.get("totalChargedInYuan").decimalValue());
-                            kuaishouReportDailyAgent.setCostCampaignCount(dataNode.get("chargedCampaignCount").asInt());
-                            kuaishouReportDailyAgent.setDate(dataNode.get("dateTime").asText());
-                            kuaishouReportDailyAgent.setFengmianClickCount(dataNode.get("adPhotoClick").asInt());
-                            kuaishouReportDailyAgent.setFengmianClickRate(dataNode.get("clickRatio").asText());
-                            kuaishouReportDailyAgent.setFengmianShowCount(dataNode.get("impression").asInt());
-                            kuaishouReportDailyAgent.setFandianCost(dataNode.get("rebateRealChargedInYuan").decimalValue());
-                            kuaishouReportDailyAgent.setJiliCost(dataNode.get("directRebateRealChargedInYuan").decimalValue());
-                            kuaishouReportDailyAgent.setKid(dataNode.get("userId").asInt());
-                            kuaishouReportDailyAgent.setKuangfanCost(dataNode.get("contractRebateRealChargedInYuan").decimalValue());
-                            kuaishouReportDailyAgent.setSucaiShowCount(dataNode.get("click").asInt());
-                            kuaishouReportDailyAgent.setXianjinCost(dataNode.get("realChargedInYuan").decimalValue());
-                            kuaishouReportDailyAgent.setXinyongCost(dataNode.get("creditRealChargedInYuan").decimalValue());
+                            kuaishouReportDailyAgent.setAdItemClick(dataNode.get("actionbarClick").asLong());
+                            kuaishouReportDailyAgent.setTotalChargedInYuan(dataNode.get("totalChargedInYuan").decimalValue());
+                            kuaishouReportDailyAgent.setChargedCampaignCount(dataNode.get("chargedCampaignCount").asLong());
+                            kuaishouReportDailyAgent.setDateTime(dataNode.get("dateTime").asText());
+                            kuaishouReportDailyAgent.setAdPhotoClick(dataNode.get("adPhotoClick").asLong());
+                            kuaishouReportDailyAgent.setPhotoClickRatio(dataNode.get("clickRatio").asText());
+                            kuaishouReportDailyAgent.setAdPhotoImpression(dataNode.get("impression").asLong());
+                            kuaishouReportDailyAgent.setTotalRebateRealChargedInYuan(dataNode.get("rebateRealChargedInYuan").decimalValue());
+                            kuaishouReportDailyAgent.setDirectRebateRealChargedInYuan(dataNode.get("directRebateRealChargedInYuan").decimalValue());
+                            //猜测可能是agentId
+                            kuaishouReportDailyAgent.setAgentId(14L);
+                            kuaishouReportDailyAgent.setContractRebateRealChargedInYuan(dataNode.get("contractRebateRealChargedInYuan").decimalValue());
+                            kuaishouReportDailyAgent.setAdItemImpression(dataNode.get("click").asLong());
+                            kuaishouReportDailyAgent.setRealChargedInYuan(dataNode.get("realChargedInYuan").decimalValue());
+                            kuaishouReportDailyAgent.setCreditRealChargedInYuan(dataNode.get("creditRealChargedInYuan").decimalValue());
                             reportList.add(kuaishouReportDailyAgent);
                         }
                         i++;