yumeng преди 4 години
родител
ревизия
b546f80bde

+ 2 - 2
jeecg-boot-module-system/pom.xml

@@ -46,11 +46,11 @@
             <artifactId>jeecg-boot-base-common</artifactId>
             <version>2.0.2</version>
         </dependency>
-        <dependency>
+      <!--  <dependency>
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-module-activiti</artifactId>
             <version>2.2.0</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>cn.com.ctop</groupId>
             <artifactId>module-check</artifactId>

+ 0 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java

@@ -23,7 +23,6 @@ import java.net.UnknownHostException;
 @EnableSwagger2
 @SpringBootApplication(exclude = {org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
         org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration.class
-        ,org.activiti.spring.boot.SecurityAutoConfiguration.class
 })
 @ComponentScan(basePackages = {"cn.com.ctop", "org.jeecg"})
 @Configuration

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

@@ -1,3 +1,4 @@
+/*
 package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.entity.ActCustomForm;
@@ -35,12 +36,14 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
- /**
+ */
+/**
  * 自定义表单信息
  * @author jeecg-boot
  * @date   2020-08-25
  * @version V1.0
- */
+ *//*
+
 @Slf4j
 @Api(tags="自定义表单信息")
 @RestController
@@ -49,14 +52,16 @@ 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,
@@ -72,11 +77,13 @@ public class ActCustomFormController {
 		return result;
 	}
 
-	/**
+	*/
+/**
 	  *   添加
 	 * @param actCustomForm
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单信息-添加", notes="自定义表单信息-添加")
 	@PostMapping(value = "/add")
 	public Result<ActCustomForm> add(@RequestBody ActCustomForm actCustomForm) {
@@ -96,11 +103,13 @@ public class ActCustomFormController {
 		return result;
 	}
 
-	/**
+	*/
+/**
 	  *  编辑
 	 * @param actCustomForm
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单信息-编辑", notes="自定义表单信息-编辑")
 	@PutMapping(value = "/edit")
 	public Result<ActCustomForm> edit(@RequestBody ActCustomForm actCustomForm) {
@@ -118,11 +127,13 @@ public class ActCustomFormController {
 		return result;
 	}
 
-	/**
+	*/
+/**
 	  *   通过id删除
 	 * @param id
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单信息-通过id删除", notes="自定义表单信息-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
@@ -135,11 +146,13 @@ public class ActCustomFormController {
 		return Result.ok("删除成功!");
 	}
 
-	/**
+	*/
+/**
 	  *  批量删除
 	 * @param ids
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单信息-批量删除", notes="自定义表单信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<ActCustomForm> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -153,11 +166,13 @@ public class ActCustomFormController {
 		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) {
@@ -172,12 +187,14 @@ public class ActCustomFormController {
 		return result;
 	}
 
-  /**
+  */
+/**
       * 导出excel
    *
    * @param request
    * @param response
-   */
+   *//*
+
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
       // Step.1 组装查询条件
@@ -204,13 +221,15 @@ public class ActCustomFormController {
       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;
@@ -240,3 +259,4 @@ public class ActCustomFormController {
   }
 
 }
+*/

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

@@ -1,3 +1,4 @@
+/*
 package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.entity.ActFormData;
@@ -32,12 +33,14 @@ 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
@@ -46,14 +49,16 @@ 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,
@@ -69,11 +74,13 @@ public class ActFormDataController {
 		return result;
 	}
 
-	/**
+	*/
+/**
 	  *   添加
 	 * @param actFormData
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单存储数据-添加", notes="自定义表单存储数据-添加")
 	@PostMapping(value = "/add")
 	public Result<ActFormData> add(@RequestBody ActFormData actFormData) {
@@ -89,11 +96,13 @@ public class ActFormDataController {
 		return result;
 	}
 
-	/**
+	*/
+/**
 	  *  编辑
 	 * @param actFormData
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单存储数据-编辑", notes="自定义表单存储数据-编辑")
 	@PutMapping(value = "/edit")
 	public Result<ActFormData> edit(@RequestBody ActFormData actFormData) {
@@ -111,11 +120,13 @@ public class ActFormDataController {
 		return result;
 	}
 
-	/**
+	*/
+/**
 	  *   通过id删除
 	 * @param id
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单存储数据-通过id删除", notes="自定义表单存储数据-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
@@ -128,11 +139,13 @@ public class ActFormDataController {
 		return Result.ok("删除成功!");
 	}
 
-	/**
+	*/
+/**
 	  *  批量删除
 	 * @param ids
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单存储数据-批量删除", notes="自定义表单存储数据-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<ActFormData> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -146,11 +159,13 @@ public class ActFormDataController {
 		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) {
@@ -165,12 +180,14 @@ public class ActFormDataController {
 		return result;
 	}
 
-  /**
+  */
+/**
       * 导出excel
    *
    * @param request
    * @param response
-   */
+   *//*
+
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
       // Step.1 组装查询条件
@@ -197,13 +214,15 @@ public class ActFormDataController {
       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;
@@ -233,3 +252,4 @@ public class ActFormDataController {
   }
 
 }
+*/

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

@@ -1,3 +1,4 @@
+/*
 package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.entity.ActCustomForm;
@@ -16,8 +17,10 @@ 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.jeecg.modules.activiti.entity.ActZprocess;
-import org.jeecg.modules.activiti.service.IActZprocessService;
+*/
+/*import org.jeecg.modules.activiti.entity.ActZprocess;
+import org.jeecg.modules.activiti.service.IActZprocessService;*//*
+
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -39,12 +42,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
- /**
+ */
+/**
  * 自定义表单关联流程信息
  * @author jeecg-boot
  * @date   2020-08-25
  * @version V1.0
- */
+ *//*
+
 @Slf4j
 @Api(tags="自定义表单关联流程信息")
 @RestController
@@ -77,14 +82,16 @@ public class ActFormPorcessController {
 		actFormPorcessService.save(actFormPorcess);
 		return result;
 	}
-	/**
+	*/
+/**
 	  * 分页列表查询
 	 * @param actFormPorcess
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单关联流程信息-分页列表查询", notes="自定义表单关联流程信息-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<ActFormPorcess>> queryPageList(ActFormPorcess actFormPorcess,
@@ -100,11 +107,13 @@ public class ActFormPorcessController {
 		return result;
 	}
 
-	/**
+	*/
+/**
 	  *   添加
 	 * @param actFormPorcess
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单关联流程信息-添加", notes="自定义表单关联流程信息-添加")
 	@PostMapping(value = "/add")
 	public Result<ActFormPorcess> add(@RequestBody ActFormPorcess actFormPorcess) {
@@ -119,11 +128,13 @@ public class ActFormPorcessController {
 		return result;
 	}
 
-	/**
+	*/
+/**
 	  *  编辑
 	 * @param actFormPorcess
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单关联流程信息-编辑", notes="自定义表单关联流程信息-编辑")
 	@PutMapping(value = "/edit")
 	public Result<ActFormPorcess> edit(@RequestBody ActFormPorcess actFormPorcess) {
@@ -141,11 +152,13 @@ public class ActFormPorcessController {
 		return result;
 	}
 
-	/**
+	*/
+/**
 	  *   通过id删除
 	 * @param id
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单关联流程信息-通过id删除", notes="自定义表单关联流程信息-通过id删除")
 	@DeleteMapping(value = "/delete")
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
@@ -158,11 +171,13 @@ public class ActFormPorcessController {
 		return Result.ok("删除成功!");
 	}
 
-	/**
+	*/
+/**
 	  *  批量删除
 	 * @param ids
 	 * @return
-	 */
+	 *//*
+
 	@ApiOperation(value="自定义表单关联流程信息-批量删除", notes="自定义表单关联流程信息-批量删除")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<ActFormPorcess> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -176,11 +191,13 @@ public class ActFormPorcessController {
 		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) {
@@ -195,12 +212,14 @@ public class ActFormPorcessController {
 		return result;
 	}
 
-  /**
+  */
+/**
       * 导出excel
    *
    * @param request
    * @param response
-   */
+   *//*
+
   @RequestMapping(value = "/exportXls")
   public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
       // Step.1 组装查询条件
@@ -227,13 +246,15 @@ public class ActFormPorcessController {
       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;
@@ -263,3 +284,4 @@ public class ActFormPorcessController {
   }
 
 }
+*/

+ 3 - 3
jeecg-boot-module-system/src/main/resources/application-dev.yml

@@ -135,9 +135,9 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
-          username: root
-          password: root
+          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
+          username: hcst
+          password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:

+ 8 - 2
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -13,6 +13,7 @@ import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouDailyReportTaskServic
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouHistoryReportTaskService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.graphql.service.IKuaishouWebInterfaceService;
+import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouCostGroupService;
 import cn.com.ctop.kuaishou.modules.report.service.IKuaishouReportDailyAgentService;
 import cn.com.ctop.oa.modules.service.IWechatCheckinDataService;
@@ -58,6 +59,8 @@ public class SampleTest {
 
     @Autowired
     private ICtopOauthTokenService tokenService;
+    @Autowired
+    private KuaishouReportDailyAccountMapper reportDailyAccountMapper;
 
     @Test
     public void loadBytedanceCreativeData() {
@@ -76,7 +79,10 @@ public class SampleTest {
 
     @Test
     public void loadKuaishouCookie() {
-        List<BindAccountLogin> list = bindAccountLoginService.getListByParams(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_PY, 1);
+        reportDailyAccountMapper.loadAccountDailyReport(23212L, "D://report2//8206288_1.csv");
+
+
+       /* List<BindAccountLogin> list = bindAccountLoginService.getListByParams(CtopAdConstant.PLATFORM_TYPE_KUAISHOU_PY, 1);
         if (list != null && !list.isEmpty()) {
             int i = 0;
             for (BindAccountLogin login : list) {
@@ -85,7 +91,7 @@ public class SampleTest {
                     i++;
                 }
             }
-        }
+        }*/
     }
 
     static ExecutorService executorService = null;

+ 1 - 1
pom.xml

@@ -16,7 +16,7 @@
     <modules>
         <module>jeecg-boot-base-common</module>
         <module>module-common</module>
-        <module>jeecg-boot-module-activiti</module>
+      <!--  <module>jeecg-boot-module-activiti</module>-->
         <module>module-crawler</module>
         <module>module-kuaishou</module>
         <module>module-toutiao</module>