ソースを参照

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-boot

zhaoxian 4 年 前
コミット
cc62e3e744
100 ファイル変更2076 行追加4049 行削除
  1. 0 12
      jeecg-boot-module-system/pom.xml
  2. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/PerformanceSaleServiceImpl.java
  3. 20 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/constants/MaterialType.java
  4. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/constants/PutSystem.java
  5. 86 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/DesignerCommitProcessCtrl.java
  6. 85 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/OperatorApprovalProcessCtrl.java
  7. 135 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformFileCtrl.java
  8. 193 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformMaterialCtrl.java
  9. 40 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformOperateRecordCtrl.java
  10. 75 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformOrderCtrl.java
  11. 50 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformQueryOtherCtrl.java
  12. 95 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/entity/PlatformMaterial.java
  13. 30 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/entity/PlatformOperateRecord.java
  14. 111 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/entity/PlatformOrder.java
  15. 27 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/PlatformMaterialMapper.java
  16. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/PlatformOperateRecordMapper.java
  17. 13 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/PlatformOrderMapper.java
  18. 47 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/PlatformQueryOtherMapper.java
  19. 126 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/xml/PlatformMaterialMapper.xml
  20. 18 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/xml/PlatformOperateRecordMapper.xml
  21. 8 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/xml/PlatformOrderMapper.xml
  22. 127 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/xml/PlatformQueryOtherMapper.xml
  23. 43 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformMaterialService.java
  24. 16 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformOperateRecordService.java
  25. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformOrderService.java
  26. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformQueryOtherService.java
  27. 57 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformMaterialServiceImpl.java
  28. 26 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformOperateRecordServiceImpl.java
  29. 125 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformOrderServiceImpl.java
  30. 94 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformQueryOtherServiceImpl.java
  31. 10 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/CodeBuilder.java
  32. 53 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/DictHandler.java
  33. 18 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/JsonArrayUtil.java
  34. 83 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/OperateRecordHandler.java
  35. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/OptimizerConfig.java
  36. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/Performance.java
  37. 3 3
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/PerformanceMapper.java
  38. 2 3
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/xml/PerformanceMapper.xml
  39. 5 5
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IPerformanceService.java
  40. 7 7
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceServiceImpl.java
  41. 1 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/SalePerformanceDetailServiceImpl.java
  42. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/DesignerCostDetailVO.java
  43. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/OptimizerCostDetailVO.java
  44. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/OptimizerVO.java
  45. 1 1
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/UserPerformanceDetailVO.java
  46. 0 181
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/performanceappraisal/controller/OptimizerRoleInfoController.java
  47. 1 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
  48. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
  49. 1 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/IWpsFileService.java
  50. 5 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileServiceImpl.java
  51. 2 2
      jeecg-boot-module-system/src/main/resources/application-prod.yml
  52. 2 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/SysUserMapper.java
  53. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml
  54. 5 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java
  55. 96 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
  56. 2 2
      module-job-kuaishou/src/main/resources/application-prod.yml
  57. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouVideoGetController.java
  58. 1 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouGroupTarget.java
  59. 2 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouGroupTargetMapper.xml
  60. 16 8
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/BatchServiceImpl.java
  61. 5 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupServiceImpl.java
  62. 3 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/AccountReportMapper.xml
  63. 2 2
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/DailyReportMapper.xml
  64. 6 4
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaiShouYiCheReportServiceImpl.java
  65. 0 40
      module-media/pom.xml
  66. 4 17
      module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/ByteDanceVideoReportDailyMapper.xml
  67. 0 66
      performance-appraisal/pom.xml
  68. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/controller/AccountVideoQuarterInfoController.java
  69. 0 153
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/entity/AccountVideoQuarterInfo.java
  70. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/mapper/AccountVideoQuarterInfoMapper.java
  71. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/mapper/xml/AccountVideoQuarterInfoMapper.xml
  72. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/service/IAccountVideoQuarterInfoService.java
  73. 0 20
      performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/service/impl/AccountVideoQuarterInfoServiceImpl.java
  74. 0 261
      performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/controller/HuananVideoReportController.java
  75. 0 17
      performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/dto/HuananVideoReportDTO.java
  76. 0 121
      performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/entity/HuananVideoReport.java
  77. 0 24
      performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/mapper/HuananVideoReportMapper.java
  78. 0 301
      performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/mapper/xml/HuananVideoReportMapper.xml
  79. 0 17
      performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/service/IHuananVideoReportService.java
  80. 0 65
      performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/service/impl/HuananVideoReportServiceImpl.java
  81. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/controller/PerformanceAccountController.java
  82. 0 113
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/entity/PerformanceAccount.java
  83. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/mapper/PerformanceAccountMapper.java
  84. 0 5
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/mapper/xml/PerformanceAccountMapper.xml
  85. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/service/IPerformanceAccountService.java
  86. 0 20
      performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/service/impl/PerformanceAccountServiceImpl.java
  87. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/OptimizerConfigController.java
  88. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceConfigController.java
  89. 0 244
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceController.java
  90. 0 326
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceOptimizerController.java
  91. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/RolePerformancRraiseController.java
  92. 0 248
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/RolePerformanceCommissionController.java
  93. 0 81
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/OptimizerRoleInfo.java
  94. 0 63
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/PerformanceConfig.java
  95. 0 102
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/PerformanceOptimizer.java
  96. 0 85
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformancRraise.java
  97. 0 78
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformanceCommission.java
  98. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/OptimizerConfigMapper.java
  99. 0 15
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/OptimizerRoleInfoMapper.java
  100. 0 0
      performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/PerformanceConfigMapper.java

+ 0 - 12
jeecg-boot-module-system/pom.xml

@@ -63,12 +63,6 @@
         </dependency>
         <dependency>
             <groupId>cn.com.ctop</groupId>
-            <artifactId>module-media</artifactId>
-            <version>2.0.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
             <artifactId>module-common</artifactId>
             <version>2.0.2</version>
         </dependency>
@@ -85,12 +79,6 @@
         </dependency>
         <dependency>
             <groupId>cn.com.ctop</groupId>
-            <artifactId>performance-appraisal</artifactId>
-            <version>2.0.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
             <artifactId>module-oa</artifactId>
             <version>2.0.2</version>
             <scope>compile</scope>

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

@@ -4,13 +4,12 @@ import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
-
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IPerformanceSaleService;
 import org.jeecg.modules.performance.entity.SalePerformanceDetail;
+import org.jeecg.modules.performance.service.IPerformanceService;
 import org.jeecg.modules.performance.service.ISalePerformanceDetailService;
 import org.jeecg.modules.system.entity.SysUserRole;
 import org.jeecg.modules.system.service.ISysUserRoleService;

+ 20 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/constants/MaterialType.java

@@ -0,0 +1,20 @@
+package org.jeecg.modules.orderplatform.constants;
+
+import lombok.Getter;
+
+@Getter
+public enum MaterialType {
+
+    REAL   (1,"真人"),
+    CUT    (2,"剪辑"),
+    GROUP  (3,"组合");
+
+    MaterialType(int key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    private final int key;
+    private final String value;
+}
+

+ 19 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/constants/PutSystem.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.orderplatform.constants;
+
+import lombok.Getter;
+
+@Getter
+public enum  PutSystem {
+
+    IOS      (1,"IOS"),
+    ANDROID  (2,"安卓"),
+    NO_LIMIT (3,"不限");
+
+    PutSystem(int key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    private final int key;
+    private final String value;
+}

+ 86 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/DesignerCommitProcessCtrl.java

@@ -0,0 +1,86 @@
+package org.jeecg.modules.orderplatform.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
+import org.jeecg.modules.orderplatform.entity.PlatformOrder;
+import org.jeecg.modules.orderplatform.service.IPlatformMaterialService;
+import org.jeecg.modules.orderplatform.service.IPlatformOrderService;
+import org.jeecg.modules.orderplatform.util.OperateRecordHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/platform/designer")
+public class DesignerCommitProcessCtrl {
+
+    @Autowired
+    private IPlatformOrderService platformOrderService;
+
+    @Autowired
+    private IPlatformMaterialService platformMaterialService;
+
+    @Autowired
+    private OperateRecordHandler operateRecordHandler;
+
+    /**
+     * 设计组长接单,根据订单中的物料数量按类型发起物料审批流程
+     */
+    @PostMapping(value = "/accept")
+    public Result<Object> accept(@RequestBody PlatformOrder platformOrder) {
+        Result<Object> result = new Result<>();
+        //订单状态->制作中
+        platformOrder.setOrderStatus(1);
+        boolean ok = platformOrderService.updateById(platformOrder);
+        if (ok) {
+            //自动分发订单,生成物料审批流程
+            platformOrderService.generateMaterials(platformOrder);
+            operateRecordHandler.Approval(platformOrder.getOrderCode(),"ACCEPT_ORDER");
+            result.success("接单成功!");
+        }else {
+            result.error500("订单接单失败,请联系管理员!");
+        }
+
+        return result;
+    }
+
+    /**
+     *  设计组长驳回订单,说明驳回理由
+     */
+    @PostMapping("/reject")
+    public Result<Object> reject(@RequestBody PlatformOrder platformOrder) {
+        Result<Object> result = new Result<>();
+        //订单状态->驳回,可重新提交
+        platformOrder.setOrderStatus(2);
+        boolean ok = platformOrderService.updateById(platformOrder);
+        if (ok) {
+            operateRecordHandler.Approval(platformOrder.getOrderCode(),"REJECT_ORDER");
+            result.success("订单已被驳回!");
+        }else {
+            result.error500("订单驳回失败,请联系管理员!");
+        }
+        return result;
+    }
+
+    /**
+     *   设计组长派单,指定编导、拍摄、剪辑
+     */
+    @PostMapping("/assign")
+    public Result<Object> assign(@RequestBody PlatformMaterial platformMaterial) {
+        Result<Object> result = new Result<>();
+        //物料状态->脚本待上传
+        platformMaterial.setMaterialStatus(1);
+        platformMaterial.setScriptStatus(0);
+        boolean ok = platformMaterialService.updateById(platformMaterial);
+        if (ok) {
+            result.success("物料派单成功!");
+        }else {
+            result.error500("物料派单成功,请联系管理员!");
+        }
+        return result;
+    }
+}

+ 85 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/OperatorApprovalProcessCtrl.java

@@ -0,0 +1,85 @@
+package org.jeecg.modules.orderplatform.controller;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.orderplatform.entity.PlatformOrder;
+import org.jeecg.modules.orderplatform.service.IPlatformOrderService;
+import org.jeecg.modules.orderplatform.util.OperateRecordHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import static org.jeecg.modules.orderplatform.util.CodeBuilder.generateCode;
+
+@Slf4j
+@RestController
+@RequestMapping("/platform/operator")
+public class OperatorApprovalProcessCtrl {
+
+    @Autowired
+    private IPlatformOrderService platformOrderService;
+
+    @Autowired
+    private OperateRecordHandler operateRecordHandler;
+
+    /**
+     * 运营下单
+     */
+    @PostMapping(value = "/payout")
+    public Result<PlatformOrder> payout(@RequestBody PlatformOrder platformOrder) {
+        Result<PlatformOrder> result = new Result<>();
+        try {
+            //订单状态->订单开启
+            platformOrder.setOrderStatus(0);
+            platformOrder.setOrderCode(generateCode());
+            boolean save = platformOrderService.save(platformOrder);
+            if (save) {
+                operateRecordHandler.Submit(platformOrder.getOrderCode(), "PAYOUT");
+                result.setResult(platformOrderService.queryByCode(platformOrder.getOrderCode()));
+                result.success("下单成功!");
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("下单失败");
+        }
+        return result;
+    }
+
+    /**
+     * 驳回修改后重新发起订单
+     */
+    @PostMapping(value = "/rePayout")
+    public Result<PlatformOrder> rePayout(@RequestBody PlatformOrder platformOrder) {
+        Result<PlatformOrder> result = new Result<PlatformOrder>();
+        platformOrder.setOrderStatus(0);
+        boolean ok = platformOrderService.updateById(platformOrder);
+        if (ok) {
+            operateRecordHandler.Submit(platformOrder.getOrderCode(), "PAYOUT");
+            result.success("订单重新提交成功!");
+        }else {
+            result.error500("订单重新提交异常,请联系管理员");
+        }
+
+        return result;
+    }
+
+    /**
+     * 订单发起人可以将订单作废
+     */
+    @PostMapping(value = "/destroy")
+    public Result<Object> destroy(@RequestBody PlatformOrder platformOrder) {
+        Result<Object> result = new Result<>();
+        //订单状态->订单作废
+        platformOrder.setOrderStatus(-1);
+        boolean ok = platformOrderService.updateById(platformOrder);
+        if (ok) {
+            operateRecordHandler.Approval(platformOrder.getOrderCode(), "DESTROY_ORDER");
+            result.success("接单已销毁!");
+        } else {
+            result.error500("订单销毁失败,请联系管理员!");
+        }
+        return result;
+    }
+}

+ 135 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformFileCtrl.java

@@ -0,0 +1,135 @@
+package org.jeecg.modules.orderplatform.controller;
+
+import cn.com.ctop.common.module.service.IMaterialInfoService;
+import cn.com.ctop.common.module.utils.CosUtils;
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
+import org.jeecg.modules.orderplatform.service.IPlatformMaterialService;
+import org.jeecg.modules.orderplatform.util.OperateRecordHandler;
+import org.jeecg.modules.wps.entity.WpsFile;
+import org.jeecg.modules.wps.service.IWpsFileService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 文件处理接口
+ */
+@Slf4j
+@RestController
+@RequestMapping("/platform/file")
+public class PlatformFileCtrl {
+
+    @Autowired
+    private IWpsFileService wpsFileService;
+
+    @Autowired
+    private IMaterialInfoService materialInfoService;
+
+    @Autowired
+    private IPlatformMaterialService platformMaterialService;
+
+    @Autowired
+    private OperateRecordHandler operateRecordHandler;
+
+    /**
+     * 新建订单上传附件
+     */
+    @PostMapping("/uploadAttachment")
+    public Result<Map<String, Object>> uploadAttachment(@RequestParam("file") MultipartFile file,
+                                                        @RequestParam("projectId") Long projectId) {
+        Result<Map<String, Object>> result = new Result<>();
+        if (file.isEmpty() || !((file.getOriginalFilename().endsWith(".zip") || file.getOriginalFilename().endsWith(".rar") || file.getOriginalFilename().endsWith(".7z")))) {
+            result.error500("请上传正确的压缩文件");
+        } else {
+            String fileName = file.getOriginalFilename() + "_" + projectId + "_" + System.currentTimeMillis();
+            InputStream inputStream = null;
+            try {
+                inputStream = file.getInputStream();
+            } catch (IOException e) {
+                log.error("工作台下单附件上传异常");
+            }
+            String attachmentPath = "attachment/zip/" + DateUtils.date2Str() + "/";
+            CosUtils.uploadFileByInputStream(inputStream, attachmentPath, fileName);
+            Map<String, Object> detail = new HashMap<>();
+            detail.put("attachmentName", fileName);
+            detail.put("attachmentUrl", "https://media-1301855440.cos.ap-chongqing.myqcloud.com/" + attachmentPath + fileName);
+            result.setResult(detail);
+        }
+        return result;
+    }
+
+    /**
+     * 编导上传脚本
+     */
+    @PostMapping("/uploadScript")
+    public Result<Object> uploadScript(@RequestParam("file") MultipartFile file,
+                                       @RequestParam("materialId") Long materialId,
+                                       @RequestParam("projectId") Long projectId) {
+        Result<Object> result = new Result<>();
+        try {
+            LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            // 脚本上传成功需要返回脚本id,更新物料表,更新完成后去更新脚本库的绑定项目
+            WpsFile wpsFile = wpsFileService.uploadFile(file, user.getId());
+            if (null == wpsFile) {
+                result.error500("脚本上传失败");
+                return result;
+            }
+            //物料状态->脚本已上传,待审核
+            PlatformMaterial platformMaterial = new PlatformMaterial();
+            platformMaterial.setId(materialId);
+            platformMaterial.setMaterialStatus(2);
+            platformMaterial.setScriptStatus(1);
+            platformMaterial.setScriptId(wpsFile.getId());
+            boolean save = platformMaterialService.updateById(platformMaterial);
+            if (save) {
+                // 更新脚本库的绑定项目
+                wpsFile.setProjectId(projectId);
+                //  Todo 暂时兼容题库
+                wpsFile.setIsScript(0);
+                wpsFileService.updateById(wpsFile);
+                operateRecordHandler.Submit(platformMaterialService.getById(materialId).getMaterialCode(), "SCRIPT");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * 剪辑上传视频
+     * Todo 在下单制正式上线后,这个接口会改造
+     */
+    @PostMapping("/uploadVideo")
+    public Result<Object> uploadVideo(@RequestBody JSONObject requestBody) {
+        Result<Object> result = new Result<>();
+        String videoId = materialInfoService.platformUploadVideo(requestBody);
+        if (videoId.isEmpty()) {
+            result.error500("同步素材库失败,请联系管理员");
+        } else {
+            //物料状态->视频已上传,待审核
+            PlatformMaterial platformMaterial = new PlatformMaterial();
+            platformMaterial.setId(requestBody.getLong("materialId"));
+            platformMaterial.setMaterialStatus(5);
+            platformMaterial.setVideoStatus(1);
+            platformMaterial.setVideoId(videoId);
+            boolean save = platformMaterialService.updateById(platformMaterial);
+            if (save) {
+                operateRecordHandler.Submit(platformMaterialService.getById(requestBody.getString("materialId")).getMaterialCode(), "VIDEO");
+                result.success("同步素材库成功");
+            }
+        }
+        return result;
+    }
+
+}

+ 193 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformMaterialCtrl.java

@@ -0,0 +1,193 @@
+package org.jeecg.modules.orderplatform.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
+import org.jeecg.modules.orderplatform.service.IPlatformMaterialService;
+import org.jeecg.modules.orderplatform.service.IPlatformOrderService;
+import org.jeecg.modules.orderplatform.util.DictHandler;
+import org.jeecg.modules.orderplatform.util.OperateRecordHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 物料审批流程
+ */
+@Slf4j
+@RestController
+@RequestMapping("/platform/material")
+public class PlatformMaterialCtrl {
+
+    @Autowired
+    private IPlatformMaterialService platformMaterialService;
+
+    @Autowired
+    private IPlatformOrderService platformOrderService;
+
+    @Autowired
+    private OperateRecordHandler operateRecordHandler;
+
+    @Autowired
+    DictHandler dictHandler;
+
+    /**
+     * 根据orderCode查询关联物料
+     */
+    @GetMapping(value = "/listByOrderCode")
+    public Result<PageInfo<PlatformMaterial>> listByOrderCode(PlatformMaterial platformMaterial,
+                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                         HttpServletRequest req) {
+        Result<PageInfo<PlatformMaterial>> result = new Result<>();
+        QueryWrapper<PlatformMaterial> queryWrapper = new QueryWrapper<>();
+        queryWrapper.setEntity(platformMaterial);
+        PageHelper.startPage(pageNo,pageSize);
+        List<PlatformMaterial> platformMaterialList= platformMaterialService.list(queryWrapper);
+        result.setSuccess(true);
+        result.setResult(new PageInfo<>(dictHandler.dictHandlerMaterial(platformMaterialList)));
+        return result;
+    }
+
+    /**
+     * 根据设计查询我参与的物料列表
+     */
+    @GetMapping(value = "/listByRole")
+    public Result<PageInfo<JSONObject>> listByRole(@RequestParam String designUserId,
+                                                   @RequestParam String materialStatus,
+                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        Result<PageInfo<JSONObject>> result = new Result<>();
+        PageHelper.startPage(pageNo, pageSize);
+        List<JSONObject> jsonObjectList = platformMaterialService.queryMaterialsByDesignUserId(materialStatus, designUserId);
+        result.setResult(new PageInfo<>(jsonObjectList));
+        result.setSuccess(true);
+        return result;
+    }
+
+    /**
+     * 运营查询需要自己审批的订单
+     */
+    @GetMapping(value = "/listByOperatorUserId")
+    public Result<PageInfo<JSONObject>> listByOperatorUserId(@RequestParam String operatorUserId,
+                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+        Result<PageInfo<JSONObject>> result = new Result<>();
+        PageHelper.startPage(pageNo, pageSize);
+        List<JSONObject> jsonObjectList = platformMaterialService.queryMaterialsByOperatorUserId(operatorUserId);
+        result.setResult(new PageInfo<>(jsonObjectList));
+        result.setSuccess(true);
+        return result;
+    }
+
+
+    /**
+     * 运营审核脚本
+     */
+    @PostMapping(value = "/script/accept")
+    public Result<Object> acceptScript(@RequestBody PlatformMaterial platformMaterial) {
+        Result<Object> result = new Result<>();
+        //物料状态->脚本通过,视频待上传
+        platformMaterial.setMaterialStatus(4);
+        platformMaterial.setScriptStatus(3);
+        platformMaterial.setVideoStatus(0);
+        boolean ok = platformMaterialService.updateById(platformMaterial);
+        if (ok) {
+            operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"ACCEPT_SCRIPT");
+            result.success("脚本审核通过!");
+        } else {
+            result.error500("脚本审核失败!请联系管理员");
+        }
+        return result;
+    }
+
+    //驳回脚本,驳回理由必填
+    @PostMapping(value = "/script/reject")
+    public Result<Object> rejectScript(@RequestBody PlatformMaterial platformMaterial) {
+        Result<Object> result = new Result<>();
+        //物料状态->脚本被驳回,可以重新提交
+        platformMaterial.setMaterialStatus(3);
+        platformMaterial.setScriptStatus(2);
+        boolean ok = platformMaterialService.updateById(platformMaterial);
+        if (ok) {
+            operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"REJECT_SCRIPT");
+            result.success("脚本已驳回!");
+        } else {
+            result.error500("脚本驳回失败!请联系管理员");
+        }
+        return result;
+    }
+
+    /**
+     * 脚本详情页
+     */
+    @GetMapping(value = "/scriptDetail")
+    public Result<JSONObject> scriptDetail(String scriptId) {
+        Result<JSONObject> result = new Result<>();
+        JSONObject scriptDetail = platformMaterialService.queryScriptDetailById(scriptId);
+        result.setResult(scriptDetail);
+        result.setSuccess(true);
+        return result;
+    }
+
+    /**
+     * 运营审核视频
+     */
+    @PostMapping(value = "/video/accept")
+    public Result<Object> acceptVideo(@RequestBody PlatformMaterial platformMaterial) {
+        Result<Object> result = new Result<>();
+        //物料状态->视频审核通过
+        platformMaterial.setMaterialStatus(7);
+        platformMaterial.setVideoStatus(3);
+        boolean ok = platformMaterialService.updateById(platformMaterial);
+        if (ok) {
+            //更新订单的素材完成数
+            boolean order = platformOrderService.updateOrderFinishAmount(platformMaterial.getOrderCode());
+            if (order) {
+                operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"ACCEPT_VIDEO");
+                //修改素材库审核状态
+                platformMaterialService.updateMaterialStatusById(platformMaterial.getVideoId());
+                result.success("视频审核通过!");
+            }
+        } else {
+            result.error500("视频审核失败!请联系管理员");
+        }
+        return result;
+    }
+
+    //驳回视频,驳回理由必填
+    @PostMapping(value = "/video/reject")
+    public Result<Object> rejectVideo(@RequestBody PlatformMaterial platformMaterial) {
+        Result<Object> result = new Result<>();
+        //物料状态->视频被驳回,可以重新提交
+        platformMaterial.setMaterialStatus(6);
+        platformMaterial.setVideoStatus(2);
+        boolean ok = platformMaterialService.updateById(platformMaterial);
+        if (ok) {
+            operateRecordHandler.Approval(platformMaterial.getMaterialCode(),"REJECT_VIDEO");
+            result.success("视频已驳回!");
+        } else {
+            result.error500("视频驳回失败!请联系管理员");
+        }
+        return result;
+    }
+
+    /**
+     * 视频详情页
+     */
+    @GetMapping(value = "/videoDetail")
+    public Result<JSONObject> videoDetail(String videoId) {
+        Result<JSONObject> result = new Result<>();
+        JSONObject scriptDetail = platformMaterialService.queryVideoDetailById(videoId);
+        result.setResult(scriptDetail);
+        result.setSuccess(true);
+        return result;
+    }
+
+}

+ 40 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformOperateRecordCtrl.java

@@ -0,0 +1,40 @@
+package org.jeecg.modules.orderplatform.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
+import org.jeecg.common.api.vo.Result;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecg.modules.orderplatform.service.IPlatformOperateRecordService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 下单制操作记录
+ */
+
+@Slf4j
+@RestController
+@RequestMapping("/platform/operateRecord")
+public class PlatformOperateRecordCtrl {
+
+	@Autowired
+	private IPlatformOperateRecordService platformOperateRecordService;
+
+	/**
+	 * 操作记录查询
+	 */
+	@GetMapping(value = "/createDesc")
+
+	public Result<PageInfo<JSONObject>> queryPageList() {
+		Result<PageInfo<JSONObject>> result = new Result<>();
+		List<JSONObject> operateRecordList= platformOperateRecordService.PageByCreateDesc();
+		result.setSuccess(true);
+		result.setResult(new PageInfo<>(operateRecordList));
+		return result;
+	}
+}

+ 75 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformOrderCtrl.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.orderplatform.controller;
+
+import cn.com.ctop.common.module.entity.SysUser;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.orderplatform.entity.PlatformOrder;
+import org.jeecg.modules.orderplatform.service.IPlatformOrderService;
+
+import org.jeecg.modules.orderplatform.util.DictHandler;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * 运营下单
+ */
+@Slf4j
+@RestController
+@RequestMapping("/platform/order")
+public class PlatformOrderCtrl {
+
+	@Autowired
+	private IPlatformOrderService platformOrderService;
+
+	@Autowired
+	ISysUserService sysUserService;
+
+	@Autowired
+	DictHandler dictHandler;
+	/**
+	  * 查询
+	 */
+	@GetMapping(value = "/listByCreatorOrDesignLeader")
+	public Result<PageInfo<PlatformOrder>> queryPageList(PlatformOrder platformOrder,
+														 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														 HttpServletRequest req) {
+		Result<PageInfo<PlatformOrder>> result = new Result<>();
+		QueryWrapper<PlatformOrder> queryWrapper = new QueryWrapper<>();
+		//发起人精准匹配
+		if((null!=platformOrder.getCreateByName())){
+			SysUser sysUser=sysUserService.getUserByRealName(platformOrder.getCreateByName());
+			if(null!=sysUser){
+				platformOrder.setCreateBy(sysUser.getId());
+			}
+		}
+		queryWrapper.setEntity(platformOrder);
+		queryWrapper.orderByDesc("update_time");
+		PageHelper.startPage(pageNo,pageSize);
+		List<PlatformOrder> platformOrderList= platformOrderService.list(queryWrapper);
+		result.setSuccess(true);
+		result.setResult(new PageInfo<>(dictHandler.dictHandlerOrders(platformOrderList)));
+		return result;
+	}
+
+
+	/**
+	  * 订单详情页
+	 */
+	@GetMapping(value = "/queryById")
+	public Result<PlatformOrder> queryById(@RequestParam Long id) {
+		Result<PlatformOrder> result = new Result<>();
+		PlatformOrder platformOrder = platformOrderService.getById(id);
+		result.setResult(dictHandler.dictHandlerOrder(platformOrder));
+		result.setSuccess(true);
+		return result;
+	}
+}

+ 50 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/controller/PlatformQueryOtherCtrl.java

@@ -0,0 +1,50 @@
+package org.jeecg.modules.orderplatform.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.orderplatform.service.IPlatformQueryOtherService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@RestController
+@RequestMapping("/platform/query")
+public class PlatformQueryOtherCtrl {
+
+    @Autowired
+    IPlatformQueryOtherService platformQueryOtherService;
+
+    @GetMapping(value = "/designLeader")
+    public Result<List<JSONObject>> queryPageList() {
+        Result<List<JSONObject>> result = new Result<>();
+        result.setSuccess(true);
+        result.setResult(platformQueryOtherService.getAllDesignLeader());
+        return result;
+    }
+
+
+    @GetMapping(value = "/identity")
+    public Result<JSONObject> identity() {
+        Result<JSONObject> result = new Result<>();
+        result.setSuccess(true);
+        result.setResult(platformQueryOtherService.queryIdentity());
+        return result;
+    }
+
+    @GetMapping(value ="/jobContent")
+    public Result<Map<String,Object>> jobContent() {
+        Result<Map<String,Object>> result = new Result<>();
+        Map<String,Object> jobContent =new HashMap<>();
+        jobContent.put("operatorJobContent",platformQueryOtherService.operatorJobContent());
+        jobContent.put("designLeaderJobContent",platformQueryOtherService.designLeaderJobContent());
+        jobContent.put("designJobContent",platformQueryOtherService.designJobContent());
+        result.setSuccess(true);
+        result.setResult(jobContent);
+        return result;
+    }
+}

+ 95 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/entity/PlatformMaterial.java

@@ -0,0 +1,95 @@
+package org.jeecg.modules.orderplatform.entity;
+
+import java.util.Date;
+
+import cn.com.ctop.common.module.annotation.Dict;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+/**
+ * 物料审批流程
+ */
+@Data
+@TableName("ctop_platform_material")
+public class PlatformMaterial {
+    
+	/**id*/
+	@TableId(type = IdType.AUTO)
+	private Long id;
+
+	/**orderCode*/
+	private String orderCode;
+
+	/**关联项目*/
+	private Long projectId;
+
+	@TableField(exist = false)
+	private String projectName;
+
+	/**物料唯一标识*/
+	private String materialCode;
+
+	/**物料名*/
+	private String materialName;
+
+	/**materialType*/
+	private Integer materialType;
+
+	/**materialStatus*/
+	private Integer materialStatus;
+
+	/**脚本id*/
+	private String scriptId;
+
+	/**脚本审批状态*/
+	private Integer scriptStatus;
+
+	/**审批建议*/
+	private String scriptAdvise;
+
+	/**脚本上传人*/
+	private String scriptCreator;
+
+	/**脚本创建时间*/
+	private Date scriptCreateTime;
+
+	/**编导*/
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
+	private String plan;
+
+	@TableField(exist = false)
+	private String planName;
+
+	/**视频id*/
+	private String videoId;
+
+	/**视频审批状态*/
+	private Integer videoStatus;
+
+	/**视频审批建议*/
+	private String videoAdvise;
+
+	/**视频上传人*/
+	private String videoCreator;
+
+	/**视频创建时间*/
+	private Date videoCreateTime;
+
+	/**视频拍摄*/
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
+	private String shot;
+
+	@TableField(exist = false)
+	private String shotName;
+
+	/**视频剪辑*/
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
+	private String clip;
+
+	@TableField(exist = false)
+	private String clipName;
+}

+ 30 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/entity/PlatformOperateRecord.java

@@ -0,0 +1,30 @@
+package org.jeecg.modules.orderplatform.entity;
+
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 下单制操作记录
+ */
+@Data
+@TableName("ctop_platform_operate_record")
+public class PlatformOperateRecord {
+    
+	/**id*/
+	@TableId(type = IdType.AUTO)
+	private Integer id;
+	/**订单标识*/
+	private String orderCode;
+	/**素材标识*/
+	private String materialCode;
+	/**操作人*/
+	private String userId;
+	/**操作*/
+	private String operate;
+	/**执行时间*/
+	private Date createTime;
+}

+ 111 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/entity/PlatformOrder.java

@@ -0,0 +1,111 @@
+package org.jeecg.modules.orderplatform.entity;
+
+import java.util.Date;
+
+import cn.com.ctop.common.module.annotation.Dict;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import lombok.Data;
+
+
+/**
+ * 订单表
+ */
+@Data
+@TableName("ctop_platform_order")
+public class PlatformOrder {
+    
+	/**id*/
+	@TableId(type = IdType.AUTO)
+	private Long id;
+
+	/**订单唯一标识*/
+	private String orderCode;
+
+	/**订单标题*/
+	private String orderTitle;
+
+	/**设计组长*/
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
+	private String design;
+
+	@TableField(exist = false)
+	private String designName;
+
+    /**设计接单时间*/
+	private Date designPassTime;
+
+	/**订单状态*/
+	private Integer orderStatus;
+
+	/**投放系统*/
+	private String orderAdvice;
+
+	/**关联项目*/
+	@Dict(dictTable ="ctop_project",dicText = "project_name",dicCode = "id")
+	private Long project;
+
+	@TableField(exist = false)
+	private String projectName;
+
+	/**投放系统*/
+	private String sysName;
+
+	/**包名*/
+	private String sysPackage;
+
+	/**素材数量*/
+	private Integer materialAmount;
+
+	/**素材完成数量*/
+	private Integer materialFinishAmount;
+
+	/**物料最新上传时间*/
+	private Date materialFinishTime;
+
+	/**日均产量*/
+	private Integer materialAmountDay;
+
+	/**materialType*/
+	private Integer materialType;
+
+	/**真人数量*/
+	private Integer realAmount;
+
+	/**剪辑数量*/
+	private Integer cutAmount;
+
+	/**开始时间*/
+	private String startDate;
+
+	/**结束时间*/
+	private String endDate;
+
+	/**附件地址*/
+	private String attachmentUrl;
+
+	/**attachmentName*/
+	private String attachmentName;
+
+	/**订单备注*/
+	private String orderRemark;
+
+	/**订单创建人*/
+	@Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
+	private String createBy;
+
+	@TableField(exist = false)
+	private String createByName;
+
+	/**订单完成时间*/
+	private Date orderFinishTime;
+
+	/**创建时间*/
+	private Date createTime;
+
+	/**修改时间*/
+	private Date updateTime;
+}

+ 27 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/PlatformMaterialMapper.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.orderplatform.mapper;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
+
+import java.util.List;
+
+/**
+ * 物料审批流程
+ * @author: jeecg-boot
+ * @date:   2020-11-10
+ * @cersion: V1.0
+ */
+public interface PlatformMaterialMapper extends BaseMapper<PlatformMaterial> {
+
+    List<JSONObject> queryMaterialsByDesignUserId(@Param("materialStatus") JSONArray materialStatus, @Param("designUserId") String designUserId);
+
+    List<JSONObject> queryMaterialsByOperatorUserId(@Param("operatorUserId") String designUserId);
+
+    JSONObject queryScriptDetailById(@Param("scriptId") String scriptId);
+
+    JSONObject queryVideoDetailById(@Param("videoId") String videoId);
+
+}

+ 19 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/PlatformOperateRecordMapper.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.orderplatform.mapper;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.orderplatform.entity.PlatformOperateRecord;
+
+import java.util.List;
+
+/**
+ * 下单制操作记录
+ * @author: jeecg-boot
+ * @date:   2020-11-10
+ * @cersion: V1.0
+ */
+public interface PlatformOperateRecordMapper extends BaseMapper<PlatformOperateRecord> {
+
+    List<JSONObject> PageByCreateDesc();
+
+}

+ 13 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/PlatformOrderMapper.java

@@ -0,0 +1,13 @@
+package org.jeecg.modules.orderplatform.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.orderplatform.entity.PlatformOrder;
+
+/**
+ * 订单
+ * Created by JQ.bi on 2020.10.23
+ */
+public interface PlatformOrderMapper extends BaseMapper<PlatformOrder> {
+
+    PlatformOrder queryByCode(String code);
+}

+ 47 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/PlatformQueryOtherMapper.java

@@ -0,0 +1,47 @@
+package org.jeecg.modules.orderplatform.mapper;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
+
+import java.util.List;
+
+/**
+ * 下单制查询其他接口
+ */
+public interface PlatformQueryOtherMapper extends BaseMapper<PlatformMaterial> {
+
+    List<JSONObject> queryAllDesignLeader();
+
+    JSONObject queryIdentity(String currentLogon);
+
+    //设计参与物料、被驳回物料、指派给我的物料数量
+    int queryMaterialCountByDesignUserId(String userId, JSONArray materialStatus);
+
+    //运营待审核的物料
+    int queryMaterialCountByOperatorUserId(String userId);
+
+    //设计组长带指派的物料
+    int queryMaterialCountByDesign(String userId);
+
+    //设计组长待确定的订单
+    int queryOrderCountByDesign(String userId);
+
+    //运营我发起的订单
+    int queryNewOrderCountByOperator(String userId);
+
+    //运营被驳回的订单
+    int queryRejectOrderCountByOperator(String userId);
+
+    //已完成的订单
+    int queryFinishOrderCountByOperator(String userId);
+
+    //设计组长已完成的订单
+    int queryFinishOrderCountByDesign(String userId);
+
+    //设计组长全部订单
+    int queryAllOrderByDesign(String userId);
+
+
+}

+ 126 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/xml/PlatformMaterialMapper.xml

@@ -0,0 +1,126 @@
+<?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="org.jeecg.modules.orderplatform.mapper.PlatformMaterialMapper">
+
+    <select id="queryMaterialsByDesignUserId" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            t2.id as orderId,
+            t2.order_title as orderTitle,
+            (SELECT realname from sys_user where id=t2.create_by) as createBy,
+            (SELECT realname from sys_user where id=t2.design) as designLeader,
+            t2.start_date as startDate,
+            t2.end_date as endDate,
+            t2.attachment_url as attachmentUrl,
+            t2.attachment_name as attachmentName,
+            t2.order_remark as orderRemark,
+            (SELECT project_name from ctop_project where id=t1.project_id) as projectName,
+            t1.id as materialId,
+            t1.project_id as projectId,
+            t1.material_code as materialCode,
+            t1.material_name as materialName,
+            t1.material_type as materialType,
+            t1.material_status as materialStatus,
+            t1.script_id as scriptId,
+            t1.script_status  as scriptStatus,
+            t1.script_advise as scriptAdvise,
+            t1.video_id as videoId,
+            t1.video_status as videoStatus,
+            t1.video_advise as videoAdvise,
+            t1.shot,
+            (SELECT realname from sys_user where id=t1.shot) as shotName,
+            t1.clip,
+            (SELECT realname from sys_user where id=t1.clip) as clipName,
+            t1.plan,
+            (SELECT realname from sys_user where id=t1.plan) as planName
+        FROM
+            ctop_platform_material t1
+                LEFT JOIN ctop_platform_order t2 ON t1.order_code = t2.order_code
+        WHERE
+           t1.material_status in
+        <foreach item="item" index="index" collection="materialStatus"
+                 open="(" separator="," close=")">
+            #{item}
+        </foreach>
+           And (plan = #{designUserId}
+           OR clip = #{designUserId}
+           OR shot = #{designUserId})
+    </select>
+
+    <select id="queryMaterialsByOperatorUserId" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            t2.id as orderId,
+            t2.order_code as orderCode,
+            t2.order_title as orderTitle,
+            (SELECT realname from sys_user where id=t2.create_by) as createBy,
+            (SELECT realname from sys_user where id=t2.design) as designLeader,
+            t2.start_date as startDate,
+            t2.end_date as endDate,
+            t2.attachment_url as attachmentUrl,
+            t2.attachment_name as attachmentName,
+            t2.order_remark as orderRemark,
+            (SELECT project_name from ctop_project where id=t1.project_id) as projectName,
+            t1.id as materialId,
+            t1.material_code as materialCode,
+            t1.material_name as materialName,
+            t1.material_type as materialType,
+            t1.material_status as materialStatus,
+            t1.script_id as scriptId,
+            t1.script_status as scriptStatus,
+            t1.script_advise as scriptAdvise,
+            t1.video_id as videoId,
+            t1.video_status as videoStatus,
+            t1.video_advise as videoAdvise,
+            t1.shot,
+            (SELECT realname from sys_user where id=t1.shot) as shotName,
+            t1.clip,
+            (SELECT realname from sys_user where id=t1.shot) as clipName,
+            t1.plan,
+            (SELECT realname from sys_user where id=t1.plan) as planName
+        FROM
+            ctop_platform_material t1
+                LEFT JOIN ctop_platform_order t2 ON t1.order_code = t2.order_code
+        WHERE
+            t1.material_status in(2,5)
+          and t1.project_id in(SELECT DISTINCT project_id from ctop_project_member WHERE user_id=#{operatorUserId})
+    </select>
+
+    <select id="queryScriptDetailById" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            t1.script_id as scriptId,
+            t1.script_status as scriptStatus,
+            t1.script_advise as scriptAdvise,
+            (SELECT project_name from ctop_project where id=t1.project_id) as projectName,
+            t1.material_name as materialName,
+            (SELECT realname from sys_user where id=t1.plan) as planName,
+            t2.name as scriptName,
+            t2.download_url as url
+        FROM
+            ctop_platform_material t1
+            LEFT JOIN wps_file t2 ON t1.script_id = t2.id
+        where t2.id=#{scriptId}
+    </select>
+
+    <select id="queryVideoDetailById" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            t.code,
+            t.url,
+            t1.video_id as videoId,
+            t1.video_status as videoStatus,
+            t1.video_advise as videoAdvise,
+            t2.second,
+            t2.width,
+            t2.height,
+            t2.size,
+            (SELECT realname from sys_user where id=t3.clip_id limit 1) as clipName,
+            (SELECT realname from sys_user where id=t3.shot_id limit 1) as shotName,
+            (SELECT realname from sys_user where id=t3.plan_id limit 1) as planName,
+            (SELECT GROUP_CONCAT(tag_name) from ctop_material_tag_info where code=t.code) as tag,
+            (SELECT GROUP_CONCAT(url) from ctop_material_image_info where video_id=t.code) as imageUrl
+        FROM
+            ctop_material_info t
+                LEFT JOIN  ctop_platform_material t1 on t.id=t1.video_id
+                LEFT JOIN  ctop_material_parameter t2 ON t. CODE = t2.material_id
+                left join  ctop_material_ascription t3 on t.code=t3. material_id
+        where t.id=#{videoId}
+    </select>
+</mapper>

+ 18 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/xml/PlatformOperateRecordMapper.xml

@@ -0,0 +1,18 @@
+<?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="org.jeecg.modules.orderplatform.mapper.PlatformOperateRecordMapper">
+
+    <select id="PageByCreateDesc" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            (SELECT order_title from ctop_platform_order where order_code=t.order_code)  orderTitle,
+            (SELECT material_name from ctop_platform_material where material_code=t.material_code)  materialName,
+            (SELECT realname from sys_user where id=t.user_id) userName,
+            operate,
+            create_time as createTime
+        FROM
+            ctop_platform_operate_record t
+        ORDER BY
+            create_time DESC
+        LIMIT 50
+    </select>
+</mapper>

+ 8 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/xml/PlatformOrderMapper.xml

@@ -0,0 +1,8 @@
+<?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="org.jeecg.modules.orderplatform.mapper.PlatformOrderMapper">
+
+    <select id="queryByCode" resultType="org.jeecg.modules.orderplatform.entity.PlatformOrder">
+        select * from ctop_platform_order where order_code=#{code}
+    </select>
+</mapper>

+ 127 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/mapper/xml/PlatformQueryOtherMapper.xml

@@ -0,0 +1,127 @@
+<?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="org.jeecg.modules.orderplatform.mapper.PlatformQueryOtherMapper">
+
+    <select id="queryAllDesignLeader" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            t1.realname,
+            t1.id as userId
+        FROM
+            sys_user t1
+                LEFT JOIN sys_user_role t2 ON t1.id = t2.user_id
+                LEFT JOIN sys_role t3 ON t2.role_id = t3.id
+        where t3.role_code='designTeamLeader'
+    </select>
+
+    <select id="queryIdentity" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT
+            t.realname,
+            t2.role_name as roleName,
+            t4.depart_name as departName,
+            t6.area as area
+        FROM
+            sys_user t
+                LEFT JOIN sys_user_role t1 ON t.id = t1.user_id
+                LEFT JOIN sys_role t2 on t1.role_id=t2.id
+                LEFT JOIN sys_user_depart t3 on t.id = t3.user_id
+                LEFT JOIN sys_depart t4 on t3.dep_id=t4.id
+                LEFT JOIN user_company t5 on t.id=t5.user_id
+                LEFT JOIN sys_company t6 on t5.company_id=t6.company_id
+        where t.id=#{currentLogon}
+    </select>
+
+    <select id="queryMaterialCountByDesignUserId" resultType="java.lang.Integer">
+        SELECT
+        count(id)
+        FROM
+        ctop_platform_material
+        WHERE
+        material_status in
+        <foreach item="item" index="index" collection="materialStatus"
+                 open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        And (plan = #{userId}
+        OR clip = #{userId}
+        OR shot = #{userId})
+    </select>
+
+    <select id="queryMaterialCountByOperatorUserId" resultType="java.lang.Integer">
+        SELECT
+            count(id)
+        FROM
+            ctop_platform_material
+        WHERE
+            material_status in(2,5)
+          and project_id in(SELECT DISTINCT project_id from ctop_project_member WHERE user_id=#{operatorUserId})
+    </select>
+
+    <select id="queryMaterialCountByDesign" resultType="java.lang.Integer">
+        SELECT
+            count(t1.id)
+        FROM
+            ctop_platform_material t1
+                LEFT JOIN ctop_platform_order t2 ON t1.order_code = t2.order_code
+        WHERE
+            t2.design =#{userId}
+          AND t1.material_status = 0
+    </select>
+
+    <select id="queryOrderCountByDesign" resultType="java.lang.Integer">
+        SELECT
+            count(id)
+        FROM
+            ctop_platform_order
+        WHERE
+            design =#{userId}
+        and order_status=0
+    </select>
+
+    <select id="queryNewOrderCountByOperator" resultType="java.lang.Integer">
+        SELECT
+            count(id)
+        FROM
+            ctop_platform_order
+        WHERE
+            create_by =#{userId}
+    </select>
+
+    <select id="queryRejectOrderCountByOperator" resultType="java.lang.Integer">
+        SELECT
+            count(id)
+        FROM
+            ctop_platform_order
+        WHERE
+            create_by =#{userId}
+        and order_status=2
+    </select>
+
+    <select id="queryFinishOrderCountByOperator" resultType="java.lang.Integer">
+        SELECT
+            count(id)
+        FROM
+            ctop_platform_order
+        WHERE
+            create_by =#{userId}
+        and order_status=3
+    </select>
+
+    <select id="queryFinishOrderCountByDesign" resultType="java.lang.Integer">
+        SELECT
+            count(id)
+        FROM
+            ctop_platform_order
+        WHERE
+            design =#{userId}
+          and order_status=3
+    </select>
+
+    <select id="queryAllOrderByDesign" resultType="java.lang.Integer">
+        SELECT
+            count(id)
+        FROM
+            ctop_platform_order
+        WHERE
+            design =#{userId}
+    </select>
+</mapper>

+ 43 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformMaterialService.java

@@ -0,0 +1,43 @@
+package org.jeecg.modules.orderplatform.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
+
+import java.util.List;
+
+/**
+ * 物料审批流程
+ */
+public interface IPlatformMaterialService extends IService<PlatformMaterial> {
+
+    /**
+     *  设计参与的物料信息
+     *  逻辑是拿当前登录人userId查询物料列表的plan、clip、shot 取全集
+     */
+    List<JSONObject> queryMaterialsByDesignUserId(String materialStatus, String designUserId);
+
+    /**
+     *  运营需要审核的订单
+     *  查询逻辑先查当前登录人参与的项目,在通过项目关联订单物料查询出需要审批的物料流程
+     */
+    List<JSONObject> queryMaterialsByOperatorUserId(String operatorUserId);
+
+    /**
+     *  脚本详情页
+     *  根据脚本id关联脚本库、物料、订单信息
+     */
+    JSONObject queryScriptDetailById(String scriptId);
+
+    /**
+     *  视频详情页
+     *  根据视频id关联脚本库、物料、订单信息
+     */
+    JSONObject queryVideoDetailById(String videoId);
+
+    /**
+     *  视频审核通过后修改素材库审核状态
+     */
+    void updateMaterialStatusById(String id);
+
+}

+ 16 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformOperateRecordService.java

@@ -0,0 +1,16 @@
+package org.jeecg.modules.orderplatform.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.orderplatform.entity.PlatformOperateRecord;
+
+import java.util.List;
+
+/**
+ * 下单制操作记录
+ */
+public interface IPlatformOperateRecordService extends IService<PlatformOperateRecord> {
+
+    List<JSONObject> PageByCreateDesc();
+
+}

+ 19 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformOrderService.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.orderplatform.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.orderplatform.entity.PlatformOrder;
+
+/**
+ * 订单
+ */
+public interface IPlatformOrderService extends IService<PlatformOrder> {
+
+    //自动分发订单,生成物料审批流程
+    boolean generateMaterials(PlatformOrder platformOrder);
+
+    //更新订单素材完成数量
+    boolean updateOrderFinishAmount(String code);
+
+    //根据orderCode查询
+    PlatformOrder queryByCode(String code);
+}

+ 19 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/IPlatformQueryOtherService.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.orderplatform.service;
+
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IPlatformQueryOtherService {
+
+    List<JSONObject> getAllDesignLeader();
+
+    Map<String,Object> operatorJobContent();
+
+    Map<String,Object> designJobContent();
+
+    Map<String,Object> designLeaderJobContent();
+
+    JSONObject queryIdentity();
+}

+ 57 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformMaterialServiceImpl.java

@@ -0,0 +1,57 @@
+package org.jeecg.modules.orderplatform.service.impl;
+
+import cn.com.ctop.common.module.entity.MaterialInfo;
+import cn.com.ctop.common.module.service.IMaterialInfoService;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
+import org.jeecg.modules.orderplatform.mapper.PlatformMaterialMapper;
+import org.jeecg.modules.orderplatform.service.IPlatformMaterialService;
+import org.jeecg.modules.orderplatform.util.JsonArrayUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 物料审批流程
+ */
+@Service
+public class PlatformMaterialServiceImpl extends ServiceImpl<PlatformMaterialMapper, PlatformMaterial> implements IPlatformMaterialService {
+
+    @Autowired
+    PlatformMaterialMapper platformMaterialMapper;
+
+    @Autowired
+    IMaterialInfoService materialInfoService;
+
+    @Override
+    public List<JSONObject> queryMaterialsByDesignUserId(String materialStatus, String designUserId) {
+        JSONArray materialStatusJsonArray = JsonArrayUtil.Varchar2JSONArray(materialStatus);
+        return platformMaterialMapper.queryMaterialsByDesignUserId(materialStatusJsonArray, designUserId);
+    }
+
+    @Override
+    public List<JSONObject> queryMaterialsByOperatorUserId(String operatorUserId) {
+        return platformMaterialMapper.queryMaterialsByOperatorUserId(operatorUserId);
+    }
+
+    @Override
+    public JSONObject queryScriptDetailById(String scriptId) {
+        return platformMaterialMapper.queryScriptDetailById(scriptId);
+    }
+
+    @Override
+    public JSONObject queryVideoDetailById(String videoId) {
+        return platformMaterialMapper.queryVideoDetailById(videoId);
+    }
+
+    @Override
+    public void updateMaterialStatusById(String id) {
+        MaterialInfo materialInfo = new MaterialInfo();
+        materialInfo.setId(id);
+        materialInfo.setStatus(1);
+        materialInfoService.updateById(materialInfo);
+    }
+}

+ 26 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformOperateRecordServiceImpl.java

@@ -0,0 +1,26 @@
+package org.jeecg.modules.orderplatform.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.orderplatform.entity.PlatformOperateRecord;
+import org.jeecg.modules.orderplatform.mapper.PlatformOperateRecordMapper;
+import org.jeecg.modules.orderplatform.service.IPlatformOperateRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 下单制操作记录
+ */
+@Service
+public class PlatformOperateRecordServiceImpl extends ServiceImpl<PlatformOperateRecordMapper, PlatformOperateRecord> implements IPlatformOperateRecordService {
+
+    @Autowired
+    PlatformOperateRecordMapper platformOperateRecordMapper;
+
+    @Override
+    public List<JSONObject> PageByCreateDesc() {
+        return platformOperateRecordMapper.PageByCreateDesc();
+    }
+}

+ 125 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformOrderServiceImpl.java

@@ -0,0 +1,125 @@
+package org.jeecg.modules.orderplatform.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.orderplatform.constants.MaterialType;
+import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
+import org.jeecg.modules.orderplatform.entity.PlatformOrder;
+import org.jeecg.modules.orderplatform.mapper.PlatformOrderMapper;
+import org.jeecg.modules.orderplatform.service.IPlatformMaterialService;
+import org.jeecg.modules.orderplatform.service.IPlatformOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.jeecg.modules.orderplatform.util.CodeBuilder.generateCode;
+
+@Service
+public class PlatformOrderServiceImpl extends ServiceImpl<PlatformOrderMapper, PlatformOrder> implements IPlatformOrderService {
+
+    @Autowired
+    IPlatformMaterialService platFormMaterialService;
+
+    @Autowired
+    PlatformOrderMapper platformOrderMapper;
+
+    @Override
+    public boolean generateMaterials(PlatformOrder platformOrder) {
+        boolean result=false;
+        //全部为真人视频
+        if(MaterialType.REAL.getKey()==platformOrder.getMaterialType()){
+            result= generateRealMaterial(platformOrder,platformOrder.getMaterialAmount());
+        }
+        //全部为剪辑视频
+        else if(MaterialType.CUT.getKey()==platformOrder.getMaterialType()){
+            result= generateCutMaterial(platformOrder,platformOrder.getMaterialAmount());
+        }
+        //组合视频
+        else if(MaterialType.GROUP.getKey()==platformOrder.getMaterialType()){
+            boolean real=generateRealMaterial(platformOrder,platformOrder.getRealAmount());
+            boolean cut=generateCutMaterial(platformOrder,platformOrder.getCutAmount());
+            result= real&&cut;
+        }
+        return result;
+    }
+
+    @Override
+    public boolean updateOrderFinishAmount(String code) {
+        QueryWrapper<PlatformOrder> queryWrapper=new QueryWrapper<>();
+        queryWrapper.eq("order_code",code);
+        PlatformOrder platformOrder= this.getOne(queryWrapper);
+        platformOrder.setMaterialFinishAmount(platformOrder.getMaterialFinishAmount()+1);
+        platformOrder.setMaterialFinishTime(DateUtils.getDate());
+        if(platformOrder.getMaterialAmount()==platformOrder.getMaterialFinishAmount()+1){
+            platformOrder.setOrderStatus(3);
+            platformOrder.setOrderFinishTime(DateUtils.getDate());
+        }
+        return this.updateById(platformOrder);
+    }
+
+    @Override
+    public PlatformOrder queryByCode(String code) {
+        return platformOrderMapper.queryByCode(code);
+    }
+
+    /**
+     * 生成真人物料
+     */
+    private boolean generateRealMaterial(PlatformOrder platformOrder,int amount){
+        String orderCode=platformOrder.getOrderCode();
+        if(orderCode.isEmpty()){
+            return false;
+        }
+        Long projectId=platformOrder.getProject();
+        String orderTitle=platformOrder.getOrderTitle();
+        PlatformMaterial platformMaterial;
+        List<PlatformMaterial> batch=new ArrayList<>();
+        for(int i=0; i<amount ;i++){
+            platformMaterial=new PlatformMaterial();
+            platformMaterial.setOrderCode(orderCode);
+            platformMaterial.setProjectId(projectId);
+            platformMaterial.setMaterialType(MaterialType.REAL.getKey());
+            platformMaterial.setMaterialStatus(0);
+            platformMaterial.setScriptStatus(-1);
+            platformMaterial.setVideoStatus(-1);
+            //注入唯一标识物料code
+            platformMaterial.setMaterialCode(generateCode());
+            platformMaterial.setMaterialName(orderTitle+"-"+MaterialType.REAL.getValue()+(i+1));
+            batch.add(platformMaterial);
+        }
+        return platFormMaterialService.saveBatch(batch);
+    }
+
+    /**
+     * 生成真人物料
+     */
+    private boolean generateCutMaterial(PlatformOrder platformOrder,int amount){
+        String orderCode=platformOrder.getOrderCode();
+        if(orderCode.isEmpty()){
+            return false;
+        }
+        Long projectId=platformOrder.getProject();
+        String orderTitle=platformOrder.getOrderTitle();
+        PlatformMaterial platformMaterial;
+        List<PlatformMaterial> batch=new ArrayList<>();
+        for(int i=0; i<amount ;i++){
+            platformMaterial=new PlatformMaterial();
+            platformMaterial.setOrderCode(orderCode);
+            platformMaterial.setProjectId(projectId);
+            platformMaterial.setMaterialType(MaterialType.CUT.getKey());
+            platformMaterial.setMaterialStatus(0);
+            platformMaterial.setScriptStatus(-1);
+            platformMaterial.setVideoStatus(-1);
+            //注入唯一标识物料code
+            platformMaterial.setMaterialCode(generateCode());
+            platformMaterial.setMaterialName(orderTitle+"-"+MaterialType.CUT.getValue()+(i+1));
+            batch.add(platformMaterial);
+        }
+        return platFormMaterialService.saveBatch(batch);
+    }
+} 

+ 94 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/service/impl/PlatformQueryOtherServiceImpl.java

@@ -0,0 +1,94 @@
+package org.jeecg.modules.orderplatform.service.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.orderplatform.mapper.PlatformQueryOtherMapper;
+import org.jeecg.modules.orderplatform.service.IPlatformQueryOtherService;
+import org.jeecg.modules.orderplatform.util.JsonArrayUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class PlatformQueryOtherServiceImpl implements IPlatformQueryOtherService {
+
+    @Autowired
+    PlatformQueryOtherMapper platformQueryOtherMapper;
+
+    @Override
+    public List<JSONObject> getAllDesignLeader() {
+        return platformQueryOtherMapper.queryAllDesignLeader();
+    }
+
+    @Override
+    public Map<String, Object> operatorJobContent() {
+        Map<String, Object> result=new HashMap<>();
+        String currentLogon=getCurrentLogon();
+        //我发起的订单
+        result.put("newOrder",platformQueryOtherMapper.queryNewOrderCountByOperator(currentLogon));
+        //待审核的物料
+        result.put("toAuditMaterial",platformQueryOtherMapper.queryMaterialCountByOperatorUserId(currentLogon));
+        //已完成的订单
+        result.put("finishOrder",platformQueryOtherMapper.queryFinishOrderCountByOperator(currentLogon));
+        //被驳回的
+        result.put("rejectOrder",platformQueryOtherMapper.queryRejectOrderCountByOperator(currentLogon));
+        //全部订单
+        result.put("allOrder",platformQueryOtherMapper.queryNewOrderCountByOperator(currentLogon));
+
+        return result;
+
+    }
+
+    @Override
+    public Map<String, Object> designJobContent() {
+        Map<String, Object> result=new HashMap<>();
+        String currentLogon=getCurrentLogon();
+        //指派给我的物料(待完成)
+        result.put("myMaterial", getMaterialCountByDesignUserId(currentLogon,"1346"));
+        //被驳回的物料
+        result.put("rejectMaterial", getMaterialCountByDesignUserId(currentLogon,"36"));
+        //已完成的物料
+        result.put("finishMaterial", getMaterialCountByDesignUserId(currentLogon,"7"));
+        //全部物料
+        result.put("allMaterial", getMaterialCountByDesignUserId(currentLogon,"1234567"));
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> designLeaderJobContent() {
+        Map<String, Object> result=new HashMap<>();
+        String currentLogon=getCurrentLogon();
+        //待确定的订单
+        result.put("toDecided", platformQueryOtherMapper.queryOrderCountByDesign(currentLogon));
+        //带指派的物料
+        result.put("toPayOut", platformQueryOtherMapper.queryMaterialCountByDesign(currentLogon));
+        //指派给我的物料(待完成)
+        result.put("myMaterial", getMaterialCountByDesignUserId(currentLogon,"1234567"));
+        //被驳回的物料
+        result.put("rejectMaterial", getMaterialCountByDesignUserId(currentLogon,"36"));
+        //已完成订单
+        result.put("finishOrder", platformQueryOtherMapper.queryFinishOrderCountByDesign(currentLogon));
+        //全部订单
+        result.put("allOrder",platformQueryOtherMapper.queryAllOrderByDesign(currentLogon));
+        return result;
+    }
+
+    @Override
+    public JSONObject queryIdentity() {
+        return platformQueryOtherMapper.queryIdentity(getCurrentLogon());
+    }
+
+    private String getCurrentLogon(){
+        return ((LoginUser) SecurityUtils.getSubject().getPrincipal()).getId();
+    }
+
+    private int getMaterialCountByDesignUserId(String userId,String materialStatus){
+        JSONArray materialStatusJsonArray = JsonArrayUtil.Varchar2JSONArray(materialStatus);
+        return platformQueryOtherMapper.queryMaterialCountByDesignUserId(userId,materialStatusJsonArray);
+    }
+}

+ 10 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/CodeBuilder.java

@@ -0,0 +1,10 @@
+package org.jeecg.modules.orderplatform.util;
+
+import java.util.UUID;
+
+public class CodeBuilder {
+
+    public static String generateCode(){
+        return UUID.randomUUID().toString().replaceAll("-","");
+    }
+}

+ 53 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/DictHandler.java

@@ -0,0 +1,53 @@
+package org.jeecg.modules.orderplatform.util;
+
+import cn.com.ctop.common.module.service.IProjectService;
+import org.jeecg.modules.orderplatform.entity.PlatformMaterial;
+import org.jeecg.modules.orderplatform.entity.PlatformOrder;
+import org.jeecg.modules.system.service.ISysUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class DictHandler {
+
+    @Autowired
+    ISysUserService sysUserService;
+
+    @Autowired
+    IProjectService projectService;
+
+    public List<PlatformOrder> dictHandlerOrders(List<PlatformOrder> data){
+        data.forEach(platformOrder -> {
+            platformOrder.setDesignName(sysUserService.getById(platformOrder.getDesign()).getRealname());
+            platformOrder.setCreateByName(sysUserService.getById(platformOrder.getCreateBy()).getRealname());
+            platformOrder.setProjectName(projectService.getById(platformOrder.getProject()).getProjectName());
+        });
+        return data;
+    }
+
+    public PlatformOrder dictHandlerOrder(PlatformOrder data){
+        data.setDesignName(sysUserService.getById(data.getDesign()).getRealname());
+        data.setCreateByName(sysUserService.getById(data.getCreateBy()).getRealname());
+        data.setProjectName(projectService.getById(data.getProject()).getProjectName());
+
+        return data;
+    }
+
+    public List<PlatformMaterial> dictHandlerMaterial(List<PlatformMaterial> data){
+        data.forEach(platformMaterial -> {
+            if(!platformMaterial.getClip().isEmpty()){
+                platformMaterial.setClipName(sysUserService.getById(platformMaterial.getClip()).getRealname());
+            }
+            if(!platformMaterial.getPlan().isEmpty()){
+                platformMaterial.setPlanName(sysUserService.getById(platformMaterial.getPlan()).getRealname());
+            }
+            if(!platformMaterial.getShot().isEmpty()){
+                platformMaterial.setShotName(sysUserService.getById(platformMaterial.getShot()).getRealname());
+            }
+            platformMaterial.setProjectName(projectService.getById(platformMaterial.getProjectId()).getProjectName());
+        });
+        return data;
+    }
+}

+ 18 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/JsonArrayUtil.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.orderplatform.util;
+
+import com.alibaba.fastjson.JSONArray;
+
+public class JsonArrayUtil {
+
+    public static JSONArray Varchar2JSONArray(String data){
+        if(data.isEmpty()){
+            return null;
+        }
+        JSONArray jsonArray=new JSONArray();
+        char[] chars= data.toCharArray();
+        for(int i=0;i<chars.length;i++){
+            jsonArray.add(chars[i]);
+        }
+        return jsonArray;
+    }
+}

+ 83 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/orderplatform/util/OperateRecordHandler.java

@@ -0,0 +1,83 @@
+package org.jeecg.modules.orderplatform.util;
+
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.orderplatform.entity.PlatformOperateRecord;
+import org.jeecg.modules.orderplatform.service.IPlatformOperateRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OperateRecordHandler {
+
+    @Autowired
+    IPlatformOperateRecordService platformOperateRecordService;
+
+    /**
+     * 审批记录
+     */
+    public void Approval(String code, String operate) {
+        switch (operate) {
+            //接单:
+            case "ACCEPT_ORDER":
+                saveOperateRecord(code, "", "接单成功");
+                break;
+            //销毁订单
+            case "DESTROY_ORDER":
+                saveOperateRecord(code, "", "销毁了订单");
+                break;
+            //驳回订单
+            case "REJECT_ORDER":
+                saveOperateRecord(code, "", "驳回了订单");
+                break;
+            //通过脚本
+            case "ACCEPT_SCRIPT":
+                saveOperateRecord("", code, "审批通过了脚本");
+                break;
+            //驳回脚本
+            case "REJECT_SCRIPT":
+                saveOperateRecord("", code, "审批驳回了脚本");
+                break;
+            //通过脚本
+            case "ACCEPT_VIDEO":
+                saveOperateRecord("", code, "审批通过了视频");
+                break;
+            //驳回脚本
+            case "REJECT_VIDEO":
+                saveOperateRecord("", code, "审批驳回了视频");
+                break;
+        }
+    }
+
+    /**
+     * 提交记录
+     */
+    public void Submit(String code, String operate) {
+        switch (operate) {
+            //发起订单
+            case "PAYOUT":
+                saveOperateRecord(code, "", "发起了一个订单");
+                break;
+            //上传脚本
+            case "SCRIPT":
+                saveOperateRecord("", code, "上传了一个脚本");
+                break;
+            //上传视频
+            case "VIDEO":
+                saveOperateRecord("", code, "上传了一个视频");
+                break;
+        }
+    }
+
+    //操作记录入库
+    private void saveOperateRecord(String order, String material, String operate) {
+        //获取操作人Id
+        String userId = ((LoginUser) SecurityUtils.getSubject().getPrincipal()).getId();
+        PlatformOperateRecord platformOperateRecord = new PlatformOperateRecord();
+        platformOperateRecord.setUserId(userId);
+        platformOperateRecord.setOrderCode(order);
+        platformOperateRecord.setMaterialCode(material);
+        platformOperateRecord.setOperate(operate);
+        platformOperateRecordService.save(platformOperateRecord);
+    }
+}

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/OptimizerConfig.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.entity;
+package org.jeecg.modules.performance.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/Performance.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.entity;
+package org.jeecg.modules.performance.entity;
 
 import cn.com.ctop.common.module.annotation.Dict;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 3 - 3
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/PerformanceMapper.java

@@ -1,9 +1,9 @@
-package cn.com.ctop.performanceappraisal.mapper;
+package org.jeecg.modules.performance.mapper;
 
-import cn.com.ctop.performanceappraisal.entity.Performance;
-import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.performance.entity.Performance;
+import org.jeecg.modules.performance.vo.OptimizerCostDetailVO;
 
 import java.math.BigDecimal;
 import java.util.List;

+ 2 - 3
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/xml/PerformanceMapper.xml

@@ -1,7 +1,7 @@
 <?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.performanceappraisal.mapper.PerformanceMapper">
-    <resultMap id="OptimizerTotalCostDetail" type="cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO">
+<mapper namespace="org.jeecg.modules.performance.mapper.PerformanceMapper">
+    <resultMap id="OptimizerTotalCostDetail" type="org.jeecg.modules.performance.vo.OptimizerCostDetailVO">
         <result column="realName" property="realName"/>
         <result column="totalCost" property="totalCost"/>
         <result column="year" property="year"/>
@@ -25,7 +25,6 @@
         LEFT JOIN
         sys_user sysUser ON sysUser.id = userRole.user_id
         WHERE
-        <!-- userRole.role_id = '79fba4f45f1b8e284af9c68311c6c771' -->
         dailiAccount.stat_date &gt;= #{startDate}
         AND
         dailiAccount.stat_date &lt;= #{endDate}

+ 5 - 5
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/IPerformanceService.java

@@ -1,10 +1,10 @@
-package cn.com.ctop.performanceappraisal.service;
+package org.jeecg.modules.performance.service;
 
-import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
-import cn.com.ctop.performanceappraisal.entity.Performance;
-import cn.com.ctop.performanceappraisal.vo.DesignerCostDetailVO;
-import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.performance.entity.OptimizerConfig;
+import org.jeecg.modules.performance.entity.Performance;
+import org.jeecg.modules.performance.vo.DesignerCostDetailVO;
+import org.jeecg.modules.performance.vo.OptimizerCostDetailVO;
 
 import java.math.BigDecimal;
 import java.util.List;

+ 7 - 7
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/service/impl/PerformanceServiceImpl.java

@@ -1,18 +1,18 @@
-package cn.com.ctop.performanceappraisal.service.impl;
+package org.jeecg.modules.performance.service.impl;
 
 import cn.com.ctop.common.module.utils.CtopAdConstant;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
-import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
-import cn.com.ctop.performanceappraisal.entity.Performance;
-import cn.com.ctop.performanceappraisal.mapper.PerformanceMapper;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
-import cn.com.ctop.performanceappraisal.vo.DesignerCostDetailVO;
-import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.modules.performance.entity.OptimizerConfig;
+import org.jeecg.modules.performance.entity.Performance;
+import org.jeecg.modules.performance.mapper.PerformanceMapper;
+import org.jeecg.modules.performance.service.IPerformanceService;
+import org.jeecg.modules.performance.vo.DesignerCostDetailVO;
+import org.jeecg.modules.performance.vo.OptimizerCostDetailVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

+ 1 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performance/service/impl/SalePerformanceDetailServiceImpl.java

@@ -4,16 +4,15 @@ import cn.com.ctop.common.module.entity.Advertiser;
 import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.utils.CtopAdConstant;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
-
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.performance.constants.RateConstant;
 import org.jeecg.modules.performance.entity.SalePerformanceDetail;
 import org.jeecg.modules.performance.mapper.SalePerformanceDetailMapper;
+import org.jeecg.modules.performance.service.IPerformanceService;
 import org.jeecg.modules.performance.service.ISalePerformanceDetailService;
 import org.jeecg.modules.system.entity.SysUserRole;
 import org.jeecg.modules.system.service.ISysUserRoleService;

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/DesignerCostDetailVO.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.vo;
+package org.jeecg.modules.performance.vo;
 
 import lombok.Data;
 

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/OptimizerCostDetailVO.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.vo;
+package org.jeecg.modules.performance.vo;
 
 import lombok.Data;
 

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/OptimizerVO.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.vo;
+package org.jeecg.modules.performance.vo;
 
 import lombok.Data;
 

+ 1 - 1
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/vo/UserPerformanceDetailVO.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.performanceappraisal.vo;
+package org.jeecg.modules.performance.vo;
 
 import lombok.Data;
 

+ 0 - 181
jeecg-boot-module-system/src/main/java/org/jeecg/modules/performanceappraisal/controller/OptimizerRoleInfoController.java

@@ -1,181 +0,0 @@
-package org.jeecg.modules.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.common.module.entity.SysUser;
-import cn.com.ctop.performanceappraisal.entity.OptimizerRoleInfo;
-import cn.com.ctop.performanceappraisal.service.IOptimizerRoleInfoService;
-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.modules.system.service.ISysUserService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.Map;
-
-/**
- * 优化师角色关系表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-17
- */
-@Slf4j
-@Api(tags = "优化师角色关系表")
-@RestController
-@RequestMapping("/ctop/optimizerRoleInfo")
-public class OptimizerRoleInfoController {
-    @Autowired
-    private IOptimizerRoleInfoService optimizerRoleInfoService;
-    @Autowired
-    private ISysUserService sysUserService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param optimizerRoleInfo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "优化师角色关系表-分页列表查询")
-    @ApiOperation(value = "优化师角色关系表-分页列表查询", notes = "优化师角色关系表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<OptimizerRoleInfo>> queryPageList(OptimizerRoleInfo optimizerRoleInfo,
-                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                          HttpServletRequest req) {
-        Result<IPage<OptimizerRoleInfo>> result = new Result<>();
-        optimizerRoleInfo.setType(1);
-        QueryWrapper<OptimizerRoleInfo> queryWrapper = QueryGenerator.initQueryWrapper(optimizerRoleInfo, req.getParameterMap());
-        Page<OptimizerRoleInfo> page = new Page<>(pageNo, pageSize);
-        IPage<OptimizerRoleInfo> pageList = optimizerRoleInfoService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-
-    @AutoLog(value = "优化师角色关系表-添加")
-    @ApiOperation(value = "优化师角色关系表-添加", notes = "优化师角色关系表-添加")
-    @PostMapping(value = "/add")
-    public Result<OptimizerRoleInfo> add(String belongerId, String userId, String orgCode) {
-        Result<OptimizerRoleInfo> result = new Result<OptimizerRoleInfo>();
-        try {
-            SysUser user = sysUserService.getById(userId);
-            OptimizerRoleInfo roleInfo = new OptimizerRoleInfo();
-            roleInfo.setType(2);
-            roleInfo.setBelongerId(belongerId);
-            roleInfo.setUserId(userId);
-            roleInfo.setRealname(user.getRealname());
-            roleInfo.setOrgCode(orgCode);
-            roleInfo.setEnabled(1);
-            optimizerRoleInfoService.save(roleInfo);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param optimizerRoleInfo
-     * @return
-     */
-    @AutoLog(value = "优化师角色关系表-编辑")
-    @ApiOperation(value = "优化师角色关系表-编辑", notes = "优化师角色关系表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<OptimizerRoleInfo> edit(@RequestBody OptimizerRoleInfo optimizerRoleInfo) {
-        Result<OptimizerRoleInfo> result = new Result<OptimizerRoleInfo>();
-        OptimizerRoleInfo optimizerRoleInfoEntity = optimizerRoleInfoService.getById(optimizerRoleInfo.getId());
-        if (optimizerRoleInfoEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = optimizerRoleInfoService.updateById(optimizerRoleInfo);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "优化师角色关系表-通过id删除")
-    @ApiOperation(value = "优化师角色关系表-通过id删除", notes = "优化师角色关系表-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            optimizerRoleInfoService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "优化师角色关系表-批量删除")
-    @ApiOperation(value = "优化师角色关系表-批量删除", notes = "优化师角色关系表-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<OptimizerRoleInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<OptimizerRoleInfo> result = new Result<OptimizerRoleInfo>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.optimizerRoleInfoService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "优化师角色关系表-通过id查询")
-    @ApiOperation(value = "优化师角色关系表-通过id查询", notes = "优化师角色关系表-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<OptimizerRoleInfo> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<OptimizerRoleInfo> result = new Result<OptimizerRoleInfo>();
-        OptimizerRoleInfo optimizerRoleInfo = optimizerRoleInfoService.getById(id);
-        if (optimizerRoleInfo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(optimizerRoleInfo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 获取优化师经理的统计数据
-     */
-    @GetMapping("manager/detail")
-    public Map<String, Object> managerDetail(@RequestParam(name = "orgCode", defaultValue = "A01") String orgCode, @RequestParam(name = "appType", defaultValue = "2") String appType) {
-        return optimizerRoleInfoService.getManagerDetail(appType, orgCode);
-    }
-}

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -70,6 +70,7 @@ public interface ISysUserService extends IService<SysUser> {
 
     public SysUser getUserByName(String username);
 
+    SysUser getUserByRealName(String realname);
     /**
      * 添加用户和用户角色关系
      *

+ 4 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -146,6 +146,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return userMapper.getUserByName(username);
     }
 
+    @Override
+    public SysUser getUserByRealName(String username) {
+        return userMapper.getUserByRealName(username);
+    }
 
     @Override
     @Transactional

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/IWpsFileService.java

@@ -40,7 +40,7 @@ public interface IWpsFileService extends IService<WpsFile> {
 
     int delFile(String id);
 
-    void uploadFile(MultipartFile file,String userId);
+    WpsFile uploadFile(MultipartFile file,String userId);
 
     String createTemplateFile(String template);
 

+ 5 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/wps/service/impl/WpsFileServiceImpl.java

@@ -349,7 +349,7 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
     }
 
     @Override
-    public void uploadFile(MultipartFile file,String userId){
+    public WpsFile uploadFile(MultipartFile file,String userId){
         ResFileDTO resFileDTO = CosUtils.uploadMultipartFile(file,"script-lib/wps/");
         // 上传成功后,处理数据库记录值
         Date date = new Date();
@@ -364,8 +364,9 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
 
         // 处理水印
         wpsFileWatermarkService.saveWatermark(f.getId());
-    }
 
+        return f;
+    }
     @Override
     public String createTemplateFile(String template){
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -395,4 +396,6 @@ public class WpsFileServiceImpl extends ServiceImpl<WpsFileMapper, WpsFile> impl
         ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
         return result;
     }
+
+
 }

+ 2 - 2
jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -67,7 +67,7 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
+    url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
@@ -106,7 +106,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true
+          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/SysUserMapper.java

@@ -34,6 +34,8 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      */
     SysUser getUserByName(@Param("username") String username);
 
+    SysUser getUserByRealName(@Param("realname") String realname);
+
     /**
      * 根据部门Id查询用户信息
      *

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/SysUserMapper.xml

@@ -61,6 +61,11 @@
 		select * from  sys_user  where phone = #{phone} and del_flag = 0
 	</select>
 
+    <!-- 根据realname查询 -->
+    <select id="getUserByRealName" resultType="cn.com.ctop.common.module.entity.SysUser">
+        select * from  sys_user  where realname = #{realname} and del_flag = 0 limit 1
+    </select>
+
     <!-- 根据邮箱查询用户信息 -->
     <select id="getUserByEmail" resultType="cn.com.ctop.common.module.entity.SysUser">
 	select * from  sys_user  where email = #{email} and del_flag = 0

+ 5 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java

@@ -58,6 +58,11 @@ public interface IMaterialInfoService extends IService<MaterialInfo> {
      */
     Map<String, Object> correlationUpload(JSONObject json);
 
+    /**
+     *  下单制关联素材库
+     */
+    String platformUploadVideo(JSONObject json);
+
 
     /**
      * 关联上传封面

+ 96 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -44,6 +44,8 @@ import com.tencentcloudapi.mps.v20190612.models.DescribeTaskDetailResponse;
 import it.sauronsoftware.jave.Encoder;
 import it.sauronsoftware.jave.EncoderException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -634,6 +636,100 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
         return resultMap;
     }
 
+    @Override
+    public String platformUploadVideo(JSONObject json) {
+        String userId = ((LoginUser) SecurityUtils.getSubject().getPrincipal()).getId();
+        MaterialInfo info = new MaterialInfo();
+        String type = json.getString("type");
+        info.setType(type);
+        String url = "";
+        if (!Check.isNull(json.getString("url"))) {
+            url = "https:" + json.getString("url");
+        }
+        Long projectId = json.getLong("projectId");
+        String code = json.getString("code");
+        info.setCode(code);
+        String id = code + "_" + projectId;
+        info.setId(id);
+        if (!Check.isNull(json.getString("watermarkUrl"))) {
+            info.setWatermarkUrl(json.getString("watermarkUrl"));
+        }
+        info.setUrl(url);
+        info.setUserId(userId);
+        info.setProjectId(projectId);
+        info.setWatermarkCode(json.getString("watermarkCode"));
+        info.setStatus(0);
+        info.setMaterialName(json.getString("materialName"));
+        info.setWatermarkMaterialName(json.getString("watermarkMaterialName"));
+        info.setMaterialDescribe(json.getString("materialDescribe"));
+        Project project = projectService.getById(projectId);
+        if (!Check.isNull(project)) {
+            if (!Check.isNull(project.getSupplierCode())) {
+                info.setSupplierCode(project.getSupplierCode());
+            }
+        }
+        MaterialCutFrame cutFrame = materialCutFrameService.getCutFrameByCode(code);
+        if (Check.isNull(cutFrame)) {
+            String videoUrl = URLDecoder.decode(info.getUrl()).replace("https://media-1301855440.cos.ap-chongqing.myqcloud.com/", "");
+            String loadImage = "cutFrame/" + code + "/zero.jpg";
+            String coverUrl = CloudVideoProcessUtil.videoCutPictureHandle(videoUrl, loadImage);
+            info.setCoverUrl(coverUrl);
+            Thread thread = new Thread() {
+                @Override
+                public void run() {
+                    try {
+                        log.info("开始抽帧,code:{}", code);
+                        materialCutFrameService.getTencentCutFrame(videoUrl, code, coverUrl);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            };
+            thread.start();
+        } else {
+            info.setCoverUrl(cutFrame.getUrl());
+        }
+        this.save(info);
+        JSONArray imageArr = json.getJSONArray("imageArr");
+        if (!Check.isNull(imageArr)) {
+            JSONObject imageJson = new JSONObject();
+            imageJson.put("videoId", info.getCode());
+            imageJson.put("userId", userId);
+            imageJson.put("projectId", projectId);
+            imageJson.put("imageArr", imageArr);
+            materialImageInfoService.insertImage(imageJson);
+        }
+        Map<String, Object> deleteMap = new HashMap<>();
+        deleteMap.put("material_id", info.getCode());
+        JSONObject ascription = json.getJSONObject("ascription");
+        if (!Check.isNull(ascription)) {
+            MaterialAscription materialAscription = new MaterialAscription();
+            materialAscription.setMaterialId(info.getCode());
+            materialAscription.setClipId(ascription.getString("clipId"));
+            materialAscription.setShotId(ascription.getString("shotId"));
+            materialAscription.setPlanId(ascription.getString("planId"));
+            materialAscription.setPlaneId(ascription.getString("planeId"));
+            materialAscriptionMapper.deleteByMap(deleteMap);
+            int result = materialAscriptionMapper.insert(materialAscription);
+            if (result > 0) {
+                log.info("素材归属信息入库完成,MaterialId:{}", info.getId());
+            }
+        }
+        materialTagInfoService.deleteByCode(code);
+        JSONArray modalityTagList = json.getJSONArray("modalityTagList");
+        insertTagList(code, userId, modalityTagList);
+        JSONArray contentTagList = json.getJSONArray("contentTagList");
+        insertTagList(code, userId, contentTagList);
+        JSONArray senceTagList = json.getJSONArray("senceTagList");
+        insertTagList(code, userId, senceTagList);
+        JSONArray modTagList = json.getJSONArray("modTagList");
+        insertTagList(code, userId, modTagList);
+        getFile(info, project.getMediaId());
+
+        return id;
+    }
+
+
     private void insertTagList(String code, String userId, JSONArray tagList) {
         if (null != tagList && !tagList.isEmpty()) {
             for (int m = 0; m < tagList.size(); m++) {

+ 2 - 2
module-job-kuaishou/src/main/resources/application-prod.yml

@@ -52,7 +52,7 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
@@ -91,7 +91,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaiShouVideoGetController.java

@@ -116,8 +116,8 @@ public class KuaiShouVideoGetController {
             requestMap.put("channelType", channelType);
             if ("time".equals(orderBy)) {
                 if (!Check.isNull(startDate) && !Check.isNull(endDate)) {
-                    requestMap.put("startDate", startDate + " 00:00:00");
-                    requestMap.put("endDate", endDate + " 59:59:59");
+                    requestMap.put("startDate", startDate);
+                    requestMap.put("endDate", endDate);
                 }
                 list = kuaiShouVideoGetService.getVideoList(requestMap);
             } else if ("cost".equals(orderBy)) {

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/entity/KuaiShouGroupTarget.java

@@ -162,6 +162,7 @@ public class KuaiShouGroupTarget {
     @Excel(name = "人群包排除", width = 15)
     @ApiModelProperty(value = "人群包排除")
     private String excludePopulation;
+    private String thirdPlatformCode;
     /**
      * 0:关闭智能扩量,1:打开智能扩量
      */

+ 2 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/mapper/xml/KuaiShouGroupTargetMapper.xml

@@ -26,6 +26,7 @@
         app_ids,
         population,
         exclude_population,
+        third_platform_code,
         filter_converted_level,
         is_open,
         no_age_break,
@@ -56,6 +57,7 @@
             #{targets.appIds},
             #{targets.population},
             #{targets.excludePopulation},
+            #{targets.thirdPlatformCode},
             #{targets.filterConvertedLevel},
             #{targets.isOpen},
             #{targets.noAgeBreak},

+ 16 - 8
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/BatchServiceImpl.java

@@ -329,6 +329,11 @@ public class BatchServiceImpl implements IBatchService {
             targetJson.put("exclude_population", requestJson.getJSONArray("excludePopulation"));
         }
 
+
+        if (!Check.isNull(requestJson.getJSONArray("thirdPlatformCode"))) {
+            targetJson.put("third_platform_code", requestJson.getJSONArray("thirdPlatformCode"));
+        }
+
         if (sceneId != 5) {
             JSONObject intelliExtendJson = new JSONObject();
 
@@ -463,8 +468,6 @@ public class BatchServiceImpl implements IBatchService {
         JSONObject returnJson = new JSONObject();
 
         try {
-
-
             JSONObject unitJson = new JSONObject();
             Long campaignId = requestJson.getLong("campaignId");
             if (Check.isNull(campaignId)) {
@@ -477,8 +480,6 @@ public class BatchServiceImpl implements IBatchService {
             } else {
                 unitJson.put("campaign_id", campaignId);
             }
-
-
             // 资源位置
             JSONArray scene_id = requestJson.getJSONArray("sceneId");
             if (!Check.isNull(scene_id)) {
@@ -637,8 +638,10 @@ public class BatchServiceImpl implements IBatchService {
                 targetJson.put("exclude_population", requestJson.getJSONArray("excludePopulation"));
             }
 
+            if (!Check.isNull(requestJson.getJSONArray("thirdPlatformCode"))) {
+                targetJson.put("third_platform_code", requestJson.getJSONArray("thirdPlatformCode"));
+            }
             JSONObject intelliExtendJson = new JSONObject();
-
             if (sceneId != 5) {
                 // 开启智能扩量
                 if (!Check.isNull(requestJson.getInteger("isOpen"))) {
@@ -935,11 +938,11 @@ public class BatchServiceImpl implements IBatchService {
                         targetJson.put("exclude_population", JSONArray.parseArray(groupTarget.getExcludePopulation()));
                     }
 
+                    if (!Check.isNull(groupTarget.getThirdPlatformCode())) {
+                        targetJson.put("third_platform_code", groupTarget.getThirdPlatformCode());
+                    }
                     if (sceneId != 5) {
-
-
                         JSONObject intelliExtendJson = new JSONObject();
-
                         // 开启智能扩量
                         if (!Check.isNull(groupTarget.getIsOpen())) {
                             intelliExtendJson.put("is_open", groupTarget.getIsOpen());
@@ -1771,6 +1774,11 @@ public class BatchServiceImpl implements IBatchService {
             if (!Check.isNull(requestJson.getJSONArray("excludePopulation"))) {
                 targetJson.put("exclude_population", requestJson.getJSONArray("excludePopulation"));
             }
+
+            if (!Check.isNull(requestJson.getJSONArray("thirdPlatformCode"))) {
+                targetJson.put("third_platform_code", requestJson.getJSONArray("thirdPlatformCode"));
+            }
+
             if (scene != 5) {
                 if (!Check.isNull(requestJson.getInteger("filterConvertedLevel"))) {
                     targetJson.put("filter_converted_level", requestJson.getInteger("filterConvertedLevel"));

+ 5 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouGroupServiceImpl.java

@@ -464,6 +464,11 @@ public class KuaiShouGroupServiceImpl extends ServiceImpl<KuaiShouGroupMapper, K
                             groupTarget.setExcludePopulation(targetJson.getJSONArray("exclude_population").toJSONString());
                         }
 
+                        if (!Check.isNull(targetJson.getJSONArray("third_platform_code"))) {
+                            groupTarget.setThirdPlatformCode(targetJson.getJSONArray("third_platform_code").toJSONString());
+                        }
+
+
                         JSONObject intelliExtend = targetJson.getJSONObject("intelli_extend");
                         if (!Check.isNull(intelliExtend)) {
                             groupTarget.setIsOpen(intelliExtend.getInteger("is_open"));

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/AccountReportMapper.xml

@@ -117,7 +117,7 @@
         end
         ) eventRegisterCost,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName,
+        (select auth_name from ctop_user_allocation where account_id = t1.account_id limit 1) accountName,
         sum(event_next_day_stay) eventNextDayStay,
         (case
         when sum(activation) != 0
@@ -171,7 +171,7 @@
         ) eventRegisterCost,
 
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName
+        (select auth_name from ctop_user_allocation where account_id = t1.account_id limit 1) accountName
         from
         ctop_kuaishou_report_hourly_account t1
         where stat_date = #{date}
@@ -215,7 +215,7 @@
         end
         ) eventRegisterCost,
         account_id accountId,
-        (select auth_name from ctop_user_allocation where account_id = = t1.account_id limit 1) accountName,
+        (select auth_name from ctop_user_allocation where account_id = t1.account_id limit 1) accountName,
         sum(event_next_day_stay) eventNextDayStay,
         (case
         when sum(activation) != 0

+ 2 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/mapper/xml/DailyReportMapper.xml

@@ -120,7 +120,7 @@
         FROM
         ctop_user_allocation
         WHERE
-        account_id = accountId
+        account_id = t1.account_id
         ) authName,
         stat_date statDate,
         campaign_name campaignName,
@@ -184,7 +184,7 @@
         ) conversionPrice
 
         FROM
-        ctop_kuaishou_report_daily_group
+        ctop_kuaishou_report_daily_group t1
         <where>
             <if test="date != null">
                 and stat_date = #{date}

+ 6 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/service/impl/KuaiShouYiCheReportServiceImpl.java

@@ -64,7 +64,7 @@ public class KuaiShouYiCheReportServiceImpl implements IKuaiShouYiCheReportServi
 
 
             // ios
-            requestMap.put("systemType", "IOS");
+            requestMap.put("systemType", "ios");
             requestMap.put("statDate", statDate);
             // 账号
             List<JSONObject> iosReportArr = kuaiShouYiCheReportMapper.selectReportByMap(requestMap);
@@ -106,7 +106,7 @@ public class KuaiShouYiCheReportServiceImpl implements IKuaiShouYiCheReportServi
             requestMap.put("disCount", disCount);
             requestMap.put("projectId", projectId);
             requestMap.put("statDate", statDate);
-            requestMap.put("systemType", "IOS");
+            requestMap.put("systemType", "ios");
             JSONObject iosReport = kuaiShouYiCheReportMapper.getDailyReportByMap(requestMap);
             requestMap.put("systemType", "android");
             JSONObject androidReport = kuaiShouYiCheReportMapper.getDailyReportByMap(requestMap);
@@ -114,9 +114,11 @@ public class KuaiShouYiCheReportServiceImpl implements IKuaiShouYiCheReportServi
             returnJson.put("android", androidReport);
             returnJson.remove("systemType");
             JSONObject directApplicationReport = kuaiShouYiCheReportMapper.getDirectApplicationReportByMap(requestMap);
-            returnJson.put("directApplication", directApplicationReport); // 应用直达
+            // 应用直达
+            returnJson.put("directApplication", directApplicationReport);
             List<JSONObject> channelSubcontractingReport = kuaiShouYiCheReportMapper.getChannelSubcontractingReportByMap(requestMap);
-            returnJson.put("channelSubcontracting", channelSubcontractingReport); // 渠道包分析
+            // 渠道包分析
+            returnJson.put("channelSubcontracting", channelSubcontractingReport);
 
         } catch (Exception e) {
             e.printStackTrace();

+ 0 - 40
module-media/pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>jeecg-boot-parent</artifactId>
-        <groupId>org.jeecgframework.boot</groupId>
-        <version>2.0.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>cn.com.ctop</groupId>
-    <artifactId>module-media</artifactId>
-
-    <name>module-media</name>
-    <!-- FIXME change it to the project's website -->
-    <url>http://www.example.com</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>module-common</artifactId>
-            <version>2.0.2</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>

+ 4 - 17
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/mapper/xml/ByteDanceVideoReportDailyMapper.xml

@@ -252,10 +252,9 @@
                 a.advertiser_id as advertiserId,
                 a.advertiser_name as advertiserName,
                 a.stat_datetime as statDatetime,
-                sum(a.cost) as cost,  -- 消耗
+                sum(a.cost) as cost,
                 a.video_url as videoUrl,
                 (select info.url from ctop_material_info info where info.code = a.signature limit 1) as url,
-                -- huanbi as huanbi,
                 signature as signature
 
         from ctop_bytedance_video_report_daily a
@@ -263,9 +262,6 @@
         where
         stat_datetime &gt;= #{startDate}
         and stat_datetime &lt;= #{endDate}
-<!--        <if test=" role != 'admin' ">
-            and a.company_id = #{companyId}
-        </if>-->
         <if test="accountIds != null">
             and a.account_id in
             <foreach item="item" index="index" collection="accountIds" open="(" separator="," close=")">
@@ -285,10 +281,9 @@
         a.advertiser_id as advertiserId,
         a.advertiser_name as advertiserName,
         a.stat_datetime as statDatetime,
-        sum(a.cost) as cost,  -- 消耗
+        sum(a.cost) as cost,
         a.video_url as videoUrl,
         (select info.url from ctop_material_info info where info.code = a.signature limit 1) as url,
-        -- huanbi as huanbi,
         signature as signature
 
         from ctop_bytedance_video_report_daily a
@@ -296,7 +291,6 @@
         where
         stat_datetime &gt;= #{startDate}
         and stat_datetime &lt;= #{endDate}
-        <!-- and a.company_id = #{companyId} -->
         <if test="accountIds != null">
         and a.account_id in
             <foreach item="item" index="index" collection="accountIds" open="(" separator="," close=")">
@@ -316,10 +310,9 @@
         a.advertiser_id as advertiserId,
         a.advertiser_name as advertiserName,
         a.stat_datetime as statDatetime,
-        sum(a.cost) as cost,  -- 消耗
+        sum(a.cost) as cost,
         a.video_url as videoUrl,
         (select info.url from ctop_material_info info where info.code = a.signature limit 1) as url,
-        -- huanbi as huanbi,
         signature as signature
 
         from ctop_bytedance_video_report_daily a
@@ -327,7 +320,6 @@
         where
         stat_datetime &gt;= #{startDate}
         and stat_datetime &lt;= #{endDate}
-        <!-- and a.company_id = #{companyId} -->
         <if test="accountIds != null">
             and a.account_id in
             <foreach item="item" index="index" collection="accountIds" open="(" separator="," close=")">
@@ -347,10 +339,9 @@
         a.advertiser_id as advertiserId,
         a.advertiser_name as advertiserName,
         a.stat_datetime as statDatetime,
-        sum(a.cost) as cost,  -- 消耗
+        sum(a.cost) as cost,
         a.video_url as videoUrl,
         (select info.url from ctop_material_info info where info.code = a.signature limit 1) as url,
-        -- huanbi as huanbi,
         signature as signature
 
         from ctop_bytedance_video_report_daily a
@@ -1092,7 +1083,6 @@
         left join (select material_id,clip_id,shot_id,plan_id,plane_id from ctop_material_ascription group by material_id) f on a.signature = f.material_id
         where stat_datetime &gt;= #{startDate}
         and stat_datetime &lt;= #{endDate}
-        <!-- and a.company_id = #{companyId}  -->
         and f.material_id is not null
         and f.shot_id = #{userId}
         <if test="accountIds != null">
@@ -1194,7 +1184,6 @@
         left join (select material_id,clip_id,shot_id,plan_id,plane_id from ctop_material_ascription group by material_id) f on a.signature = f.material_id
         where stat_datetime &gt;= #{startDate}
         and stat_datetime &lt;= #{endDate}
-        <!-- and a.company_id = #{companyId}  -->
         and f.material_id is not null
         and f.plan_id = #{userId}
         <if test="accountIds != null">
@@ -1220,7 +1209,6 @@
         left join (select material_id,clip_id,shot_id,plan_id,plane_id from ctop_material_ascription group by material_id) f on a.signature = f.material_id
         where stat_datetime &gt;= #{startDate}
         and stat_datetime &lt;= #{endDate}
-        <!-- and a.company_id = #{companyId}  -->
         and f.material_id is not null
         and f.clip_id = #{userId}
         <if test="accountIds != null">
@@ -1268,5 +1256,4 @@
             </foreach>
         )
     </select>
-
 </mapper>

+ 0 - 66
performance-appraisal/pom.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>jeecg-boot-parent</artifactId>
-        <groupId>org.jeecgframework.boot</groupId>
-        <version>2.0.2</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>cn.com.ctop</groupId>
-    <artifactId>performance-appraisal</artifactId>
-
-    <name>performance-appraisal</name>
-    <url>http://www.example.com</url>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>module-common</artifactId>
-            <version>2.0.2</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-boot-base-common</artifactId>
-            <version>2.0.2</version>
-        </dependency>
-        <dependency>
-            <groupId>cn.com.ctop</groupId>
-            <artifactId>module-kuaishou</artifactId>
-            <version>2.0.2</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <!-- 解决MyBatis配置文件引入问题 -->
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                    <include>**/*.xml</include>
-                </includes>
-                <!-- 是否替换资源中的属性-->
-                <filtering>false</filtering>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-    </build>
-</project>

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/controller/AccountVideoQuarterInfoController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.accountvideoquarterinfo.controller;
-
-import cn.com.ctop.accountvideoquarterinfo.entity.AccountVideoQuarterInfo;
-import cn.com.ctop.accountvideoquarterinfo.service.IAccountVideoQuarterInfoService;
-import cn.com.ctop.common.module.annotation.AutoLog;
-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 2020-04-13
- */
-@Slf4j
-@Api(tags = "绩效明细_账户下所有视频的季度消耗数据")
-@RestController
-@RequestMapping("/accountvideoquarterinfo/accountVideoQuarterInfo")
-public class AccountVideoQuarterInfoController {
-    @Autowired
-    private IAccountVideoQuarterInfoService accountVideoQuarterInfoService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param accountVideoQuarterInfo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-分页列表查询")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-分页列表查询", notes = "绩效明细_账户下所有视频的季度消耗数据-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<AccountVideoQuarterInfo>> queryPageList(AccountVideoQuarterInfo accountVideoQuarterInfo,
-                                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                HttpServletRequest req) {
-        Result<IPage<AccountVideoQuarterInfo>> result = new Result<IPage<AccountVideoQuarterInfo>>();
-        QueryWrapper<AccountVideoQuarterInfo> queryWrapper = QueryGenerator.initQueryWrapper(accountVideoQuarterInfo, req.getParameterMap());
-        Page<AccountVideoQuarterInfo> page = new Page<AccountVideoQuarterInfo>(pageNo, pageSize);
-        IPage<AccountVideoQuarterInfo> pageList = accountVideoQuarterInfoService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param accountVideoQuarterInfo
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-添加")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-添加", notes = "绩效明细_账户下所有视频的季度消耗数据-添加")
-    @PostMapping(value = "/add")
-    public Result<AccountVideoQuarterInfo> add(@RequestBody AccountVideoQuarterInfo accountVideoQuarterInfo) {
-        Result<AccountVideoQuarterInfo> result = new Result<AccountVideoQuarterInfo>();
-        try {
-            accountVideoQuarterInfoService.save(accountVideoQuarterInfo);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param accountVideoQuarterInfo
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-编辑")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-编辑", notes = "绩效明细_账户下所有视频的季度消耗数据-编辑")
-    @PutMapping(value = "/edit")
-    public Result<AccountVideoQuarterInfo> edit(@RequestBody AccountVideoQuarterInfo accountVideoQuarterInfo) {
-        Result<AccountVideoQuarterInfo> result = new Result<AccountVideoQuarterInfo>();
-        AccountVideoQuarterInfo accountVideoQuarterInfoEntity = accountVideoQuarterInfoService.getById(accountVideoQuarterInfo.getId());
-        if (accountVideoQuarterInfoEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = accountVideoQuarterInfoService.updateById(accountVideoQuarterInfo);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-通过id删除")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-通过id删除", notes = "绩效明细_账户下所有视频的季度消耗数据-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            accountVideoQuarterInfoService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-批量删除")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-批量删除", notes = "绩效明细_账户下所有视频的季度消耗数据-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<AccountVideoQuarterInfo> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<AccountVideoQuarterInfo> result = new Result<AccountVideoQuarterInfo>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.accountVideoQuarterInfoService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "绩效明细_账户下所有视频的季度消耗数据-通过id查询")
-    @ApiOperation(value = "绩效明细_账户下所有视频的季度消耗数据-通过id查询", notes = "绩效明细_账户下所有视频的季度消耗数据-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<AccountVideoQuarterInfo> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<AccountVideoQuarterInfo> result = new Result<AccountVideoQuarterInfo>();
-        AccountVideoQuarterInfo accountVideoQuarterInfo = accountVideoQuarterInfoService.getById(id);
-        if (accountVideoQuarterInfo == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(accountVideoQuarterInfo);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<AccountVideoQuarterInfo> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                AccountVideoQuarterInfo accountVideoQuarterInfo = JSON.parseObject(deString, AccountVideoQuarterInfo.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(accountVideoQuarterInfo, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<AccountVideoQuarterInfo> pageList = accountVideoQuarterInfoService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "绩效明细_账户下所有视频的季度消耗数据列表");
-        mv.addObject(NormalExcelConstants.CLASS, AccountVideoQuarterInfo.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<AccountVideoQuarterInfo> listAccountVideoQuarterInfos = ExcelImportUtil.importExcel(file.getInputStream(), AccountVideoQuarterInfo.class, params);
-                accountVideoQuarterInfoService.saveBatch(listAccountVideoQuarterInfos);
-                return Result.ok("文件导入成功!数据行数:" + listAccountVideoQuarterInfos.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("文件导入失败!");
-    }
-
-}

+ 0 - 153
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/entity/AccountVideoQuarterInfo.java

@@ -1,153 +0,0 @@
-package cn.com.ctop.accountvideoquarterinfo.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 2020-04-13
- */
-@Data
-@TableName("ctop_performance_account_video_quarter_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_performance_account_video_quarter_info对象", description = "绩效明细_账户下所有视频的季度消耗数据")
-public class AccountVideoQuarterInfo {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Integer id;
-    /**
-     * accountId
-     */
-    @Excel(name = "accountId", width = 15)
-    @ApiModelProperty(value = "accountId")
-    private Long accountId;
-    /**
-     * projectId
-     */
-    @Excel(name = "projectId", width = 15)
-    @ApiModelProperty(value = "projectId")
-    private Long projectId;
-    /**
-     * projectName
-     */
-    @Excel(name = "projectName", width = 15)
-    @ApiModelProperty(value = "projectName")
-    private String projectName;
-    /**
-     * signature
-     */
-    @Excel(name = "signature", width = 15)
-    @ApiModelProperty(value = "signature")
-    private String signature;
-    /**
-     * designResponsibleName
-     */
-    @Excel(name = "designResponsibleName", width = 15)
-    @ApiModelProperty(value = "designResponsibleName")
-    private String designResponsibleName;
-    /**
-     * designResponsibleId
-     */
-    @Excel(name = "designResponsibleId", width = 15)
-    @ApiModelProperty(value = "designResponsibleId")
-    private String designResponsibleId;
-    /**
-     * planId
-     */
-    @Excel(name = "planId", width = 15)
-    @ApiModelProperty(value = "planId")
-    private String planId;
-    /**
-     * planName
-     */
-    @Excel(name = "planName", width = 15)
-    @ApiModelProperty(value = "planName")
-    private String planName;
-    /**
-     * clipId
-     */
-    @Excel(name = "clipId", width = 15)
-    @ApiModelProperty(value = "clipId")
-    private String clipId;
-    /**
-     * clipName
-     */
-    @Excel(name = "clipName", width = 15)
-    @ApiModelProperty(value = "clipName")
-    private String clipName;
-    /**
-     * shotId
-     */
-    @Excel(name = "shotId", width = 15)
-    @ApiModelProperty(value = "shotId")
-    private String shotId;
-    /**
-     * shotName
-     */
-    @Excel(name = "shotName", width = 15)
-    @ApiModelProperty(value = "shotName")
-    private String shotName;
-    /**
-     * planeId
-     */
-    @Excel(name = "planeId", width = 15)
-    @ApiModelProperty(value = "planeId")
-    private String planeId;
-    /**
-     * planeName
-     */
-    @Excel(name = "planeName", width = 15)
-    @ApiModelProperty(value = "planeName")
-    private String planeName;
-    /**
-     * videoCost
-     */
-    @Excel(name = "videoCost", width = 15)
-    @ApiModelProperty(value = "videoCost")
-    private java.math.BigDecimal videoCost;
-    /**
-     * appType
-     */
-    @Excel(name = "appType", width = 15)
-    @ApiModelProperty(value = "appType")
-    private Integer appType;
-    /**
-     * year
-     */
-    @Excel(name = "year", width = 15)
-    @ApiModelProperty(value = "year")
-    private Integer year;
-    /**
-     * quarter
-     */
-    @Excel(name = "quarter", width = 15)
-    @ApiModelProperty(value = "quarter")
-    private Integer quarter;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/mapper/AccountVideoQuarterInfoMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.accountvideoquarterinfo.mapper;
-
-import cn.com.ctop.accountvideoquarterinfo.entity.AccountVideoQuarterInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 绩效明细_账户下所有视频的季度消耗数据
- *
- * @author: jeecg-boot
- * @date: 2020-04-13
- * @cersion: V1.0
- */
-public interface AccountVideoQuarterInfoMapper extends BaseMapper<AccountVideoQuarterInfo> {
-
-}

+ 0 - 5
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/mapper/xml/AccountVideoQuarterInfoMapper.xml

@@ -1,5 +0,0 @@
-<?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.accountvideoquarterinfo.mapper.AccountVideoQuarterInfoMapper">
-
-</mapper>

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/service/IAccountVideoQuarterInfoService.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.accountvideoquarterinfo.service;
-
-import cn.com.ctop.accountvideoquarterinfo.entity.AccountVideoQuarterInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 绩效明细_账户下所有视频的季度消耗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-13
- */
-public interface IAccountVideoQuarterInfoService extends IService<AccountVideoQuarterInfo> {
-
-}

+ 0 - 20
performance-appraisal/src/main/java/cn/com/ctop/accountvideoquarterinfo/service/impl/AccountVideoQuarterInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package cn.com.ctop.accountvideoquarterinfo.service.impl;
-
-import cn.com.ctop.accountvideoquarterinfo.entity.AccountVideoQuarterInfo;
-import cn.com.ctop.accountvideoquarterinfo.mapper.AccountVideoQuarterInfoMapper;
-import cn.com.ctop.accountvideoquarterinfo.service.IAccountVideoQuarterInfoService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 绩效明细_账户下所有视频的季度消耗数据
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-13
- */
-@Service
-public class AccountVideoQuarterInfoServiceImpl extends ServiceImpl<AccountVideoQuarterInfoMapper, AccountVideoQuarterInfo> implements IAccountVideoQuarterInfoService {
-
-}

+ 0 - 261
performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/controller/HuananVideoReportController.java

@@ -1,261 +0,0 @@
-package cn.com.ctop.huananvideoreport.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.huananvideoreport.entity.HuananVideoReport;
-import cn.com.ctop.huananvideoreport.service.IHuananVideoReportService;
-import cn.com.ctop.userefficientvideomap.entity.UserDto2;
-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.text.ParseException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 华南视频报表类
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-28
- */
-@Slf4j
-@Api(tags = "华南视频报表类")
-@RestController
-@RequestMapping("/huananvideoreport/huananVideoReport")
-public class HuananVideoReportController {
-    @Autowired
-    private IHuananVideoReportService huananVideoReportService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param huananVideoReport
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "华南视频报表类-分页列表查询")
-    @ApiOperation(value = "华南视频报表类-分页列表查询", notes = "华南视频报表类-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<HuananVideoReport>> queryPageList(HuananVideoReport huananVideoReport,
-                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                          HttpServletRequest req) {
-        Result<IPage<HuananVideoReport>> result = new Result<IPage<HuananVideoReport>>();
-        QueryWrapper<HuananVideoReport> queryWrapper = QueryGenerator.initQueryWrapper(huananVideoReport, req.getParameterMap());
-        Page<HuananVideoReport> page = new Page<HuananVideoReport>(pageNo, pageSize);
-        IPage<HuananVideoReport> pageList = huananVideoReportService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param huananVideoReport
-     * @return
-     */
-    @AutoLog(value = "华南视频报表类-添加")
-    @ApiOperation(value = "华南视频报表类-添加", notes = "华南视频报表类-添加")
-    @PostMapping(value = "/add")
-    public Result<HuananVideoReport> add(@RequestBody HuananVideoReport huananVideoReport) {
-        Result<HuananVideoReport> result = new Result<HuananVideoReport>();
-        try {
-            huananVideoReportService.save(huananVideoReport);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param huananVideoReport
-     * @return
-     */
-    @AutoLog(value = "华南视频报表类-编辑")
-    @ApiOperation(value = "华南视频报表类-编辑", notes = "华南视频报表类-编辑")
-    @PutMapping(value = "/edit")
-    public Result<HuananVideoReport> edit(@RequestBody HuananVideoReport huananVideoReport) {
-        Result<HuananVideoReport> result = new Result<HuananVideoReport>();
-        HuananVideoReport huananVideoReportEntity = huananVideoReportService.getById(huananVideoReport.getId());
-        if (huananVideoReportEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = huananVideoReportService.updateById(huananVideoReport);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "华南视频报表类-通过id删除")
-    @ApiOperation(value = "华南视频报表类-通过id删除", notes = "华南视频报表类-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            huananVideoReportService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "华南视频报表类-批量删除")
-    @ApiOperation(value = "华南视频报表类-批量删除", notes = "华南视频报表类-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<HuananVideoReport> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<HuananVideoReport> result = new Result<HuananVideoReport>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.huananVideoReportService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "华南视频报表类-通过id查询")
-    @ApiOperation(value = "华南视频报表类-通过id查询", notes = "华南视频报表类-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<HuananVideoReport> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<HuananVideoReport> result = new Result<HuananVideoReport>();
-        HuananVideoReport huananVideoReport = huananVideoReportService.getById(id);
-        if (huananVideoReport == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(huananVideoReport);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<HuananVideoReport> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                HuananVideoReport huananVideoReport = JSON.parseObject(deString, HuananVideoReport.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(huananVideoReport, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<HuananVideoReport> pageList = huananVideoReportService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "华南视频报表类列表");
-        mv.addObject(NormalExcelConstants.CLASS, HuananVideoReport.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<HuananVideoReport> listHuananVideoReports = ExcelImportUtil.importExcel(file.getInputStream(), HuananVideoReport.class, params);
-                huananVideoReportService.saveBatch(listHuananVideoReports);
-                return Result.ok("文件导入成功!数据行数:" + listHuananVideoReports.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("文件导入失败!");
-    }
-
-
-    @AutoLog(value = "头条优化季度绩效报表")
-    @ApiOperation(value = "头条优化季度绩效报表", notes = "头条优化季度绩效报表")
-    @PostMapping(value = "/getHuananMaterialInfo")
-    public Result getHuananMaterialInfo(HttpServletRequest req) throws ParseException {
-        Result<List<UserDto2>> result = new Result<List<UserDto2>>();
-        huananVideoReportService.getHuananMaterialInfo("2020-05-01", "2020-05-07");
-        result.setSuccess(true);
-        return result;
-    }
-
-}

+ 0 - 17
performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/dto/HuananVideoReportDTO.java

@@ -1,17 +0,0 @@
-package cn.com.ctop.huananvideoreport.dto;
-
-import lombok.Data;
-
-/**
- * 华南视频报表类
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-28
- */
-@Data
-public class HuananVideoReportDTO {
-
-    private String accountId;
-    private String authName;
-}

+ 0 - 121
performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/entity/HuananVideoReport.java

@@ -1,121 +0,0 @@
-package cn.com.ctop.huananvideoreport.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 2020-04-28
- */
-@Data
-@TableName("bytedance_huanan_video_report")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "bytedance_huanan_video_report对象", description = "华南视频报表类")
-public class HuananVideoReport {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Integer id;
-    /**
-     * accountId
-     */
-    @Excel(name = "accountId", width = 15)
-    @ApiModelProperty(value = "accountId")
-    private String accountId;
-    /**
-     * authName
-     */
-    @Excel(name = "authName", width = 15)
-    @ApiModelProperty(value = "authName")
-    private String authName;
-    /**
-     * projectId
-     */
-    @Excel(name = "projectId", width = 15)
-    @ApiModelProperty(value = "projectId")
-    private Integer projectId;
-    /**
-     * projectName
-     */
-    @Excel(name = "projectName", width = 15)
-    @ApiModelProperty(value = "projectName")
-    private String projectName;
-    /**
-     * advertiserId
-     */
-    @Excel(name = "advertiserId", width = 15)
-    @ApiModelProperty(value = "advertiserId")
-    private String advertiserId;
-    /**
-     * advertiserName
-     */
-    @Excel(name = "advertiserName", width = 15)
-    @ApiModelProperty(value = "advertiserName")
-    private String advertiserName;
-    /**
-     * cost
-     */
-    @Excel(name = "cost", width = 15)
-    @ApiModelProperty(value = "cost")
-    private java.math.BigDecimal cost;
-    /**
-     * signature
-     */
-    @Excel(name = "signature", width = 15)
-    @ApiModelProperty(value = "signature")
-    private String signature;
-    /**
-     * videoUrl
-     */
-    @Excel(name = "videoUrl", width = 15)
-    @ApiModelProperty(value = "videoUrl")
-    private String videoUrl;
-    /**
-     * 环比
-     */
-    @Excel(name = "环比", width = 15)
-    @ApiModelProperty(value = "环比")
-    private java.math.BigDecimal huanbi;
-    /**
-     * 素材名称
-     */
-    @Excel(name = "素材名称", width = 15)
-    @ApiModelProperty(value = "素材名称")
-    private String materialName;
-    /**
-     * 1头条2快手
-     */
-    @Excel(name = "1头条2快手", width = 15)
-    @ApiModelProperty(value = "1头条2快手")
-    private Integer appType;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    private Long materialId;
-
-    private String statDatetime;
-}

+ 0 - 24
performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/mapper/HuananVideoReportMapper.java

@@ -1,24 +0,0 @@
-package cn.com.ctop.huananvideoreport.mapper;
-
-import java.util.List;
-
-import cn.com.ctop.huananvideoreport.dto.HuananVideoReportDTO;
-import org.apache.ibatis.annotations.Param;
-import cn.com.ctop.huananvideoreport.entity.HuananVideoReport;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 华南视频报表类
- *
- * @author: jeecg-boot
- * @date: 2020-04-28
- * @cersion: V1.0
- */
-public interface HuananVideoReportMapper extends BaseMapper<HuananVideoReport> {
-
-    List<HuananVideoReport> getHuananMaterialInfo(@Param("startDate") String startDate, @Param("endDate") String endDate);
-
-    HuananVideoReport selectByDateAndId(@Param("materialId") Long materialId, @Param("statDate") String statDate);
-
-    HuananVideoReportDTO getAccountConcatInfo(@Param("materialId") Long materialId);
-}

+ 0 - 301
performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/mapper/xml/HuananVideoReportMapper.xml

@@ -1,305 +0,0 @@
-<?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.huananvideoreport.mapper.HuananVideoReportMapper">
-
-
-    <select id="getHuananMaterialInfo" resultType="cn.com.ctop.huananvideoreport.entity.HuananVideoReport">
-        select
-        a.material_id as materialId,
-        b.project_id as projectId,
-        b.project_name as projectName,
-        b.advertiser_id as advertiserId,
-        b.advertiser_name as advertiserName,
-        a.stat_datetime as statDatetime,
-        sum(a.cost) as cost,
-        d.signature as signature,
-        d.video_url as video_url,
-        e.url as url,
-        e.material_name as materialName,
-        1 as appType
-        from ctop_bytedance_report_material_daily a
-        left join ctop_user_allocation b on a.account_id = b.account_id
-        left join user_company c on b.user_id = c.user_id
-        left join ctop_bytedance_video_info d on a.material_id = d.material_id
-        left join (select code,url,material_name from ctop_material_info group by code) e on d.signature = e.code
-        where c.company_id = '6608ed13c0dd42de93c790dbdf124234'
-        and a.image_mode in ('CREATIVE_IMAGE_MODE_VIDEO',
-        'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL')
-        and date_format(stat_datetime,'%Y-%m-%d') &gt;= #{startDate}
-        and date_format(stat_datetime,'%Y-%m-%d') &lt;= #{endDate}
-        group by `statDatetime`,`materialId`
-        order by `statDatetime`,`projectId`,`materialId`
-    </select>
-
-    <select id="selectByDateAndId" resultType="cn.com.ctop.huananvideoreport.entity.HuananVideoReport">
-        select
-        *
-        from
-        bytedance_huanan_video_report
-        where material_id = #{materialId}
-        and stat_datetime = #{statDate}
-
-    </select>
-
-    <select id="getAccountConcatInfo" resultType="cn.com.ctop.huananvideoreport.dto.HuananVideoReportDTO">
-        select
-        group_concat(distinct(b.account_id)) as accountId,
-        group_concat(distinct(b.auth_name)) as authName
-        from
-        ctop_bytedance_report_material_daily a
-        left join ctop_user_allocation b on a.account_id = b.account_id
-        where a.material_id = #{materialId}
-    </select>
-
-    <select id="getHuananVideoInfo" resultType="cn.com.ctop.huananvideoreport.entity.HuananVideoReport">
-        select
-        a.material_id as materialId,
-        b.project_id as projectId,
-        b.project_name as projectName,
-        b.advertiser_id as advertiserId,
-        b.advertiser_name as advertiserName,
-        a.stat_datetime as statDatetime,
-        sum(a.cost) as cost,
-        d.signature as signature,
-        d.video_url as video_url,
-        e.url as url,
-        e.material_name as materialName,
-        1 as appType
-        from ctop_bytedance_report_material_daily a
-        left join ctop_user_allocation b on a.account_id = b.account_id
-        left join user_company c on b.user_id = c.user_id
-        left join ctop_bytedance_video_info d on a.material_id = d.material_id
-        left join (select code,url,material_name from ctop_material_info group by code) e on d.signature = e.code
-        where c.company_id = '6608ed13c0dd42de93c790dbdf124234'
-        and a.image_mode in ('CREATIVE_IMAGE_MODE_VIDEO',
-        'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL')
-        and date_format(stat_datetime,'%Y-%m-%d') &gt;= #{startDate}
-        and date_format(stat_datetime,'%Y-%m-%d') &lt;= #{endDate}
-        group by `statDatetime`,`signature`
-        order by `statDatetime`,`projectId`,`materialId`
-    </select>
-
-    <select id="videoInfoList" resultType="cn.com.ctop.huananvideoreport.entity.HuananVideoReport">
-        select
-        a.material_id as materialId,
-        --         a.account_id as accountId,
-        --         b.auth_name as authName,
-        b.project_id as projectId,
-        b.project_name as projectName,
-        b.advertiser_id as advertiserId,
-        b.advertiser_name as advertiserName,
-        a.stat_datetime as statDatetime,
-        sum(a.cost) as cost,  -- 消耗
-        d.signature as signature,
-        d.video_url as videoUrl,
-        e.url as url,
-        e.material_name as materialName,
-        1 as appType,
-        sum(a.click) as click,   -- 点击数
-
-        case
-        when sum(a.total_play) != 0
-        then sum(a.play25_feed_break)/sum(a.total_play)
-        else 0 end as play25FeedBreakRate,  -- 25%进度播放率
-
-        case
-        when sum(a.total_play) != 0
-        then sum(a.play_over)/sum(a.total_play)
-        else 0 end as playOverRate,  -- 整体完播率
-
-        case
-        when sum(a.click) != 0
-        then sum(a.convert_material)/sum(a.click)
-        else 0 end as convertRate,  -- 转化率  转化数/点击数*100% !
-        sum(a.active) as active, -- 应用下载-激活
-        sum(a.download_finish) as downloadFinish, -- 应用下载-安卓下载完成
-        sum(a.download_start) as downloadStart, -- 应用下载-安卓下载开始
-        sum(a.install_finish) as installFinish, -- 应用下载-安卓安装完成
-        sum(a.register) as register, -- 应用下载-注册
-        sum(a.pay_count) as payCount, -- 应用下载-付费数
-        sum(a.in_app_uv) as inAppUv, -- 应用下载-到达uv
-        sum(a.in_app_detail_uv) as inAppDetailUv, -- 应用下载-详情页到站uv
-        sum(a.in_app_cart) as inAppCart, -- 应用下载-加入购物车
-        sum(a.in_app_order) as inAppOrder, -- 应用下载-提交订单
-        sum(a.in_app_pay) as inAppPay, -- 应用下载-付费
-        sum(a.phone) as phone, -- 落地页-电话拨打数
-        sum(a.form) as form, --  表单提交数
-        sum(a.map_search) as mapSearch, --落地页-地图搜索
-        sum(a.button) as button, --落地页-按钮button
-        sum(a.view_material) as viewMaterial, --落地页-关键页面浏览
-        sum(a.qq) as qq, --落地页-QQ咨询数
-        sum(a.lottery) as lottery, --落地页-抽奖数
-        sum(a.vote) as vote, --落地页-投票
-        sum(a.redirect) as redirect, --落地页-页面跳转
-        sum(a.shopping) as shopping, --落地页-商品购买
-        sum(a.consult) as consult, --落地页-在线咨询
-        sum(a.wechat) as wechat, --落地页-微信
-        sum(a.phone_confirm) as phoneConfirm, --落地页-智能电话确认拨打
-        sum(a.phone_connect) as phoneConnect, --落地页-智能电话确认接通
-        sum(a.consult_effective) as consultEffective, --落地页-智能电话有效咨询
-        sum(a.total_play) as totalPlay, --视频-总播放
-        sum(a.valid_play) as validPlay, --视频-有效播放
-        sum(a.wifi_play) as wifiPlay, --视频-wifi播放
-        <!-- sum(a.play_duration_sum) as play_duration_sum, --> --视频-播放时长,单位ms
-        sum(a.play25_feed_break) as play25FeedBreak, --视频-播放25%进度总数
-        sum(a.play50_feed_break) as play50FeedBreak, --视频-播放50%进度总数
-        sum(a.play75_feed_break) as play75FeedBreak, --视频-播放75%进度总数
-        sum(a.play100_feed_break) as play100FeedBreak, --视频-播放100%进度总数
-        sum(a.advanced_creative_phone_click) as advancedCreativePhoneClick, --附加创意-电话按钮
-        sum(a.vanced_creative_counsel_click) as vancedCreativeCounselClick, --附加创意-在线咨询
-        sum(a.advanced_creative_form_click) as advancedCreativeFormClick, --附加创意-表单提交
-        sum(a.share_material) as shareMaterial, --互动数据-分享数
-        sum(a.comment_material) as commentMaterial, --互动数据-评论数
-        sum(a.follow) as follow, --互动数据-新增关注数
-        sum(a.home_visited) as homeVisited, --互动数据-主页访问量
-        sum(a.ies_challenge_click) as iesChallengeClick, --互动数据-挑战赛查看数
-        sum(a.ies_music_click) as iesMusicClick, --互动数据-音乐查看数
-        sum(a.next_day_open) as nextDayOpen, --次留数
-        case
-        when sum(a.active) != 0
-        then sum(a.next_day_open)/sum(a.active)
-        else 0 end as nextDayOpenRate, --次留率 = 次留数/激活数
-
-        case
-        when sum(a.next_day_open) != 0
-        then sum(a.cost)/sum(a.next_day_open)
-        else 0 end as nextDayOpenCost, --次留成本 = 消耗/次留数
-
-        sum(a.active_pay_amount) as activePayAmount, -- 应用下载广告数据-付费次数
-
-        case
-        when sum(a.cost) != 0
-        then sum(a.cost)/sum(a.valid_play)
-        else 0 end validPlayCost, --视频数据-有效播放成本  计算公式:总花费/有效播放数,当天数据可能会有波动,次日早8点后稳定。
-        sum(a.advanced_creative_coupon_addition) as advancedCreativeCouponAddition, --附加创意-附加创意卡券领取
-        sum(a.convert_material) as convertMaterial, --转化数据-转化数
-
-        case
-        when sum(a.cost) != 0
-        then sum(a.cost)/sum(a.active_pay_amount)
-        else 0 end as activePayCost, --应用下载广告数据-付费成本 = 消耗/付费次数
-        sum(a.download) as download, --落地页转化数据-下载开始
-        <!--sum(a.cpa) as cpa, -->--
-        sum(a.cpc) as cpc, --平均点击单价
-        sum(a.location_click) as locationClick, --互动数据-POI点击数
-        sum(a.play_over_rate) as playOverRate, --视频数据-播完率
-
-        case
-        when sum(a.show_material) != 0
-        then sum(a.click)/sum(a.show_material)
-        else 0 end as ctr, --展现数据-点击率   广告被点击的次数占展示次数的百分比。计算方法:点击数/展示数*100%
-
-        case
-        when sum(a.cost) != 0
-        then sum(a.cost)/sum(a.show_material)*1000
-        else 0 end cpm, --平均千次展现费用  广告平均每一千次展现所付出的费用,计算公式是:总花费/展示数*1000。
-        sum(a.wifi_play_rate) as wifiPlayRate, --视频数据-WiFi播放占比
-        sum(a.like_material) as likeMaterial, --互动数据-点赞数
-        <!--  sum(a.active_pay_rate) as activePayRate,--> --应用下载广告数据-付费率
-
-        case
-        when sum(a.cost) != 0
-        then sum(a.cost)/sum(a.active)
-        else 0 end activeCost, --应用下载广告数据-激活成本  计算方式:总花费/激活数。
-
-        case
-        when sum(a.cost) != 0
-        then sum(a.cost)/sum(a.game_addiction)
-        else 0 end as gameAddictionCost, --应用下载广告数据-关键行为成本  广告主为每个有APP内关键行为的用户所付出的成本,计算公式是总花费/关键行为数。当天数据可能会有波动,次日早8点后稳定。
-        sum(a.game_addiction) as gameAddiction, --应用下载广告数据-关键行为数
-
-        case
-        when sum(a.active) != 0
-        then sum(a.active)/sum(a.click)
-        else 0 end as activeRate, --应用下载广告数据-激活率   计算方式:激活数/点击数*100%
-        <!-- sum(a.play_duration_10s) as playDuration10s,--> --
-        <!-- sum(a.phone_effective) as phone_effective,--> --
-
-        case
-        when sum(a.active) != 0
-        then sum(a.game_addiction)/sum(a.active)
-        else 0 end gameAddictionRate, --应用下载广告数据-关键行为率  关键行为用户占激活用户的比例
-
-        case
-        when sum(a.active) != 0
-        then sum(a.register)/sum(a.active)
-        else 0 end as activeRegisterRate, --应用下载广告数据-注册率   注册用户占激活用户的比例
-        <!-- sum(a.average_video_play) as averageVideoPlay,--> --
-
-        case
-        when sum(a.download_finish) != 0
-        then sum(a.cost)/sum(a.download_finish)
-        else 0 end as downloadFinishCost, --应用下载广告数据-安卓下载完成成本 计算方式:总花费/安卓下载完成数。
-        <!--sum(a.play_duration_3s) as playDuration3s,--> --
-
-        case
-        when sum(a.register) != 0
-        then sum(a.cost)/sum(a.register)
-        else 0 end as activeRegisterCost, --应用下载广告数据-注册成本  总花费/注册数,当天数据可能会有波动,次日早8点后稳定。
-        sum(a.show_material) as showMaterial, --展现数据-展示数
-
-        case
-        when sum(a.click) != 0
-        then sum(a.convert_material)/sum(a.click)
-        else 0 end as convertRate, --转化数据-转化率  计算方式:转化数/点击数*100%
-
-        case
-        when sum(a.download_start) != 0
-        then sum(a.download_finish)/sum(a.download_start)
-        else 0 end as downloadFinishRate, --应用下载广告数据-安卓下载完成率  计算方式:安卓下载完成数/安卓下载开始数
-
-        case
-        when sum(a.download_finish) != 0
-        then sum(a.install_finish)/sum(a.download_finish)
-        else 0 end as installFinishRate, --应用下载广告数据-安卓安装完成率  计算方式:安卓安装完成数/安卓下载完成数
-        sum(a.coupon) as coupon, --落地页转化数据-建站卡券领取
-        sum(a.coupon_single_page) as couponSinglePage, --落地页转化数据-卡券页领取
-        sum(a.play_over) as playOver, -- 完播数
-
-        case
-        when sum(a.download_start) != 0
-        then sum(a.cost)/sum(a.download_start)
-        else 0 end as downloadStartCost, --应用下载广告数据-安卓下载开始成本  计算方法:总花费/安卓下载开始数。
-        sum(a.message) as message, --落地页转化数据-短信咨询  用户点击短信咨询的次数
-        <!-- sum(a.play_duration) as playDuration, --> --
-
-        case
-        when sum(a.valid_play) != 0
-        then sum(a.valid_play)/sum(a.show_material)
-        else 0 end as validPlayRate, --视频数据-有效播放率  有效播放数/展示数
-        sum(a.average_play_time_per_play) as averagePlayTimePerPlay, --视频数据-平均单次播放时长
-
-        case
-        when sum(a.convert_material) != 0
-        then sum(a.cost)/sum(a.convert_material)
-        else 0 end as convertCost, --转化数据-转化成本=总花费/转化数
-        <!--  sum(a.convert_show_rate) as convert_show_rate, --> --
-
-        case
-        when sum(a.install_finish) != 0
-        then sum(a.cost)/sum(a.install_finish)
-        else 0 end as installFinishCost, --应用下载广告数据-安卓安装完成成本  计算方式:总花费/安卓安装完成数
-
-        case
-        when sum(a.click) != 0
-        then sum(a.download_start)/sum(a.click)
-        else 0 end as downloadStartRate, --应用下载广告数据-安卓下载开始率  计算方法:安卓下载开始数/点击数
-        from ctop_bytedance_report_material_daily a
-        left join ctop_user_allocation b on a.account_id = b.account_id
-        left join user_company c on b.user_id = c.user_id
-        left join ctop_bytedance_video_info d on a.material_id = d.material_id
-        left join (select code,url,material_name from ctop_material_info group by code) e on d.signature = e.code
-        where c.company_id = '6608ed13c0dd42de93c790dbdf124234'
-        and a.image_mode in ('CREATIVE_IMAGE_MODE_VIDEO',
-        'CREATIVE_IMAGE_MODE_VIDEO_VERTICAL')
-        and date_format(stat_datetime,'%Y-%m-%d') &gt;= #{startDate}
-        and date_format(stat_datetime,'%Y-%m-%d') &lt;= #{endDate}
-        group by `statDatetime`,`signature`
-        order by `statDatetime`,`projectId`,`signature`
-    </select>
-
-</mapper>

+ 0 - 17
performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/service/IHuananVideoReportService.java

@@ -1,17 +0,0 @@
-package cn.com.ctop.huananvideoreport.service;
-
-import cn.com.ctop.huananvideoreport.entity.HuananVideoReport;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.text.ParseException;
-
-/**
- * 华南视频报表类
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-28
- */
-public interface IHuananVideoReportService extends IService<HuananVideoReport> {
-    void getHuananMaterialInfo(String startDate, String endDate) throws ParseException;
-}

+ 0 - 65
performance-appraisal/src/main/java/cn/com/ctop/huananvideoreport/service/impl/HuananVideoReportServiceImpl.java

@@ -1,65 +0,0 @@
-package cn.com.ctop.huananvideoreport.service.impl;
-
-import cn.com.ctop.common.module.entity.MaterialInfo;
-import cn.com.ctop.huananvideoreport.dto.HuananVideoReportDTO;
-import cn.com.ctop.huananvideoreport.entity.HuananVideoReport;
-import cn.com.ctop.huananvideoreport.mapper.HuananVideoReportMapper;
-import cn.com.ctop.huananvideoreport.service.IHuananVideoReportService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.assertj.core.util.DateUtil;
-import org.jeecg.common.util.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.util.List;
-
-/**
- * 华南视频报表类
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-28
- */
-@Service
-public class HuananVideoReportServiceImpl extends ServiceImpl<HuananVideoReportMapper, HuananVideoReport> implements IHuananVideoReportService {
-
-    @Autowired
-    private HuananVideoReportMapper huananVideoReportMapper;
-
-    public void getHuananMaterialInfo(String startDate, String endDate) throws ParseException {
-
-        List<HuananVideoReport> mList = huananVideoReportMapper.getHuananMaterialInfo(startDate, endDate);
-
-        for (HuananVideoReport m : mList) {
-            huananVideoReportMapper.insert(m);
-        }
-
-
-        QueryWrapper<HuananVideoReport> queryWrapper = new QueryWrapper<>();
-        List<HuananVideoReport> mList2 = huananVideoReportMapper.selectList(queryWrapper);
-
-        for (HuananVideoReport m : mList2) {
-            String statDate = DateUtils.addDay(m.getStatDatetime(), -1);
-            HuananVideoReport mb = huananVideoReportMapper.selectByDateAndId(m.getMaterialId(), statDate);
-
-            BigDecimal huanbi = BigDecimal.ZERO;
-            if (mb != null && mb.getCost().compareTo(BigDecimal.ZERO) > 0) {
-                huanbi = m.getCost().subtract(mb.getCost()).divide(mb.getCost(), 7, BigDecimal.ROUND_HALF_UP);
-            }
-            HuananVideoReportDTO accountConcatInfo = huananVideoReportMapper.getAccountConcatInfo(m.getMaterialId());
-
-            m.setAccountId(accountConcatInfo.getAccountId());
-            m.setAuthName(accountConcatInfo.getAuthName());
-            m.setHuanbi(huanbi);
-            huananVideoReportMapper.updateById(m);
-        }
-
-
-    }
-
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/controller/PerformanceAccountController.java

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

+ 0 - 113
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/entity/PerformanceAccount.java

@@ -1,113 +0,0 @@
-package cn.com.ctop.performanceaccount.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-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 org.springframework.format.annotation.DateTimeFormat;
-
-import java.util.Date;
-
-/**
- * 运营明细表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-05
- */
-@Data
-@TableName("ctop_performance_account")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_performance_account对象", description = "运营明细表")
-public class PerformanceAccount {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Integer id;
-    /**
-     * 账户id
-     */
-    @Excel(name = "账户id", width = 15)
-    @ApiModelProperty(value = "账户id")
-    private Long accountId;
-    /**
-     * 账户期间消耗
-     */
-    @Excel(name = "账户期间消耗", width = 15)
-    @ApiModelProperty(value = "账户期间消耗")
-    private java.math.BigDecimal cost;
-    /**
-     * 年
-     */
-    @Excel(name = "年", width = 15)
-    @ApiModelProperty(value = "年")
-    private Integer year;
-    /**
-     * 1头条2快手
-     */
-    @Excel(name = "1头条2快手", width = 15)
-    @ApiModelProperty(value = "1头条2快手")
-    private Integer mediaType;
-    /**
-     * 季度
-     */
-    @Excel(name = "季度", width = 15)
-    @ApiModelProperty(value = "季度")
-    private Integer quarter;
-    /**
-     * 账户所属人
-     */
-    @Excel(name = "账户所属人", width = 15)
-    @ApiModelProperty(value = "账户所属人")
-    private String userId;
-    /**
-     * 账户消耗计算开始时间
-     */
-    @Excel(name = "账户消耗计算开始时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "账户消耗计算开始时间")
-    private String startDate;
-    /**
-     * 账户消耗计算结束时间
-     */
-    @Excel(name = "账户消耗计算结束时间", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "账户消耗计算结束时间")
-    private String endDate;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    @TableField(exist = false)
-    private String realname;
-
-    @TableField(exist = false)
-    private String authName;
-
-    @TableField(exist = false)
-    private String advertiserName;
-
-    @TableField(exist = false)
-    private String projectName;
-
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/mapper/PerformanceAccountMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceaccount.mapper;
-
-import cn.com.ctop.performanceaccount.entity.PerformanceAccount;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 运营明细表
- *
- * @author: jeecg-boot
- * @date: 2020-04-05
- * @cersion: V1.0
- */
-public interface PerformanceAccountMapper extends BaseMapper<PerformanceAccount> {
-
-}

+ 0 - 5
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/mapper/xml/PerformanceAccountMapper.xml

@@ -1,5 +0,0 @@
-<?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.performanceaccount.mapper.PerformanceAccountMapper">
-
-</mapper>

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/service/IPerformanceAccountService.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceaccount.service;
-
-import cn.com.ctop.performanceaccount.entity.PerformanceAccount;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * 运营明细表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-05
- */
-public interface IPerformanceAccountService extends IService<PerformanceAccount> {
-
-}

+ 0 - 20
performance-appraisal/src/main/java/cn/com/ctop/performanceaccount/service/impl/PerformanceAccountServiceImpl.java

@@ -1,20 +0,0 @@
-package cn.com.ctop.performanceaccount.service.impl;
-
-import cn.com.ctop.performanceaccount.entity.PerformanceAccount;
-import cn.com.ctop.performanceaccount.mapper.PerformanceAccountMapper;
-import cn.com.ctop.performanceaccount.service.IPerformanceAccountService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * 运营明细表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2020-04-05
- */
-@Service
-public class PerformanceAccountServiceImpl extends ServiceImpl<PerformanceAccountMapper, PerformanceAccount> implements IPerformanceAccountService {
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/OptimizerConfigController.java

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

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceConfigController.java

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

+ 0 - 244
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceController.java

@@ -1,244 +0,0 @@
-package cn.com.ctop.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.performanceappraisal.entity.Performance;
-import cn.com.ctop.performanceappraisal.service.IPerformanceService;
-import cn.com.ctop.userefficientvideomap.mapper.UserEfficientVideoMapMapper;
-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.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 设计师季度绩效表
- *
- * @author jeecg-boot
- * @version V1.0
- * @date 2019-12-10
- */
-@Slf4j
-@Api(tags = "设计师季度绩效表")
-@RestController
-@RequestMapping("/ctop/performance")
-public class PerformanceController {
-    @Autowired
-    private IPerformanceService performanceService;
-    @Autowired
-    private UserEfficientVideoMapMapper userEfficientVideoMapMapper;
-
-    /**
-     * 分页列表查询
-     *
-     * @param performance
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-分页列表查询")
-    @ApiOperation(value = "设计师季度绩效表-分页列表查询", notes = "设计师季度绩效表-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<Performance>> queryPageList(Performance performance,
-                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                    HttpServletRequest req) {
-        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
-        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
-        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
-        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param performance
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-添加")
-    @ApiOperation(value = "设计师季度绩效表-添加", notes = "设计师季度绩效表-添加")
-    @PostMapping(value = "/add")
-    public Result<Performance> add(@RequestBody Performance performance) {
-        Result<Performance> result = new Result<Performance>();
-        try {
-            performanceService.save(performance);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param performance
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-编辑")
-    @ApiOperation(value = "设计师季度绩效表-编辑", notes = "设计师季度绩效表-编辑")
-    @PutMapping(value = "/edit")
-    public Result<Performance> edit(@RequestBody Performance performance) {
-        Result<Performance> result = new Result<Performance>();
-        Performance performanceEntity = performanceService.getById(performance.getId());
-        if (performanceEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = performanceService.updateById(performance);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-通过id删除")
-    @ApiOperation(value = "设计师季度绩效表-通过id删除", notes = "设计师季度绩效表-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            performanceService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-批量删除")
-    @ApiOperation(value = "设计师季度绩效表-批量删除", notes = "设计师季度绩效表-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<Performance> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<Performance> result = new Result<Performance>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.performanceService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "设计师季度绩效表-通过id查询")
-    @ApiOperation(value = "设计师季度绩效表-通过id查询", notes = "设计师季度绩效表-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<Performance> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<Performance> result = new Result<Performance>();
-        Performance performance = performanceService.getById(id);
-        if (performance == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(performance);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    @GetMapping("/project/list")
-    public Map<String, Object> projectList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, String appType) {
-        return performanceService.getUserOptimizerProjectList(pageNo, pageSize, appType);
-    }
-
-    @GetMapping("/account/list")
-    public Map<String, Object> accountList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                           Long projectId, String appType) {
-        return performanceService.getUserOptimizerAccountList(appType, projectId, pageNo, pageSize);
-    }
-
-
-    @AutoLog(value = "设计组内设计师季度绩效表-分页列表查询")
-    @ApiOperation(value = "设计组内设计师季度绩效表-分页列表查询", notes = "设计组内设计师季度绩效表-分页列表查询")
-    @GetMapping(value = "/designerDepartMemberPerformanceList")
-    public Result<IPage<Performance>> designerDepartMemberPerformanceList(Performance performance,
-                                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                          HttpServletRequest req) {
-        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        //String departId = userEfficientVideoMapMapper.getDepartIdByUserId("e9ca23d68d884d4ebb19d07889727dae");
-        String departId = userEfficientVideoMapMapper.getDepartIdByUserId(sysUser.getId());
-        List<String> userIdList = userEfficientVideoMapMapper.getUserIdListByDepId(departId);
-        ////
-        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
-        queryWrapper.in("user_id", userIdList);
-
-        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
-        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    @AutoLog(value = "北京设计师季度绩效列表-分页列表查询")
-    @ApiOperation(value = "北京设计师季度绩效列表-分页列表查询", notes = "北京设计师季度绩效列表-分页列表查询")
-    @GetMapping(value = "/beijingDesignerPageList")
-    public Result<IPage<Performance>> beijingDesignerPageList(Performance performance,
-                                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                              @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                              HttpServletRequest req) {
-        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
-        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
-        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
-        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    @AutoLog(value = "北京设计师季度绩效列表-分页列表查询")
-    @ApiOperation(value = "北京设计师季度绩效列表-分页列表查询", notes = "北京设计师季度绩效列表-分页列表查询")
-    @GetMapping(value = "/beijingPlaneDesignerList")
-    public Result<IPage<Performance>> beijingPlaneDesignerPageList(Performance performance,
-                                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                   HttpServletRequest req) {
-        Result<IPage<Performance>> result = new Result<IPage<Performance>>();
-        QueryWrapper<Performance> queryWrapper = QueryGenerator.initQueryWrapper(performance, req.getParameterMap());
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        //sysUser.setId("b0e4798234df4096936e6bc6d00db3ba");
-        queryWrapper.eq("user_id", sysUser.getId());
-        Page<Performance> page = new Page<Performance>(pageNo, pageSize);
-        IPage<Performance> pageList = performanceService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-}

+ 0 - 326
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/PerformanceOptimizerController.java

@@ -1,326 +0,0 @@
-package cn.com.ctop.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.performanceappraisal.entity.PerformanceOptimizer;
-import cn.com.ctop.performanceappraisal.service.IPerformanceOptimizerService;
-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.DateUtils;
-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 2019-12-13
- */
-@Slf4j
-@Api(tags = "优化师绩效信息")
-@RestController
-@RequestMapping("/ctop/performanceOptimizer")
-public class PerformanceOptimizerController {
-    @Autowired
-    private IPerformanceOptimizerService performanceOptimizerService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param performanceOptimizer
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-分页列表查询")
-    @ApiOperation(value = "优化师绩效信息-分页列表查询", notes = "优化师绩效信息-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<PerformanceOptimizer>> queryPageList(PerformanceOptimizer performanceOptimizer,
-                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                             HttpServletRequest req) {
-        Result<IPage<PerformanceOptimizer>> result = new Result<>();
-        QueryWrapper<PerformanceOptimizer> queryWrapper = QueryGenerator.initQueryWrapper(performanceOptimizer, req.getParameterMap());
-        Page<PerformanceOptimizer> page = new Page<PerformanceOptimizer>(pageNo, pageSize);
-        IPage<PerformanceOptimizer> pageList = performanceOptimizerService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param performanceOptimizer
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-添加")
-    @ApiOperation(value = "优化师绩效信息-添加", notes = "优化师绩效信息-添加")
-    @PostMapping(value = "/add")
-    public Result<PerformanceOptimizer> add(@RequestBody PerformanceOptimizer performanceOptimizer) {
-        Result<PerformanceOptimizer> result = new Result<PerformanceOptimizer>();
-        try {
-            performanceOptimizerService.save(performanceOptimizer);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param performanceOptimizer
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-编辑")
-    @ApiOperation(value = "优化师绩效信息-编辑", notes = "优化师绩效信息-编辑")
-    @PutMapping(value = "/edit")
-    public Result<PerformanceOptimizer> edit(@RequestBody PerformanceOptimizer performanceOptimizer) {
-        Result<PerformanceOptimizer> result = new Result<PerformanceOptimizer>();
-        PerformanceOptimizer performanceOptimizerEntity = performanceOptimizerService.getById(performanceOptimizer.getId());
-        if (performanceOptimizerEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = performanceOptimizerService.updateById(performanceOptimizer);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-通过id删除")
-    @ApiOperation(value = "优化师绩效信息-通过id删除", notes = "优化师绩效信息-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            performanceOptimizerService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-批量删除")
-    @ApiOperation(value = "优化师绩效信息-批量删除", notes = "优化师绩效信息-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<PerformanceOptimizer> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<PerformanceOptimizer> result = new Result<PerformanceOptimizer>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.performanceOptimizerService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "优化师绩效信息-通过id查询")
-    @ApiOperation(value = "优化师绩效信息-通过id查询", notes = "优化师绩效信息-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<PerformanceOptimizer> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<PerformanceOptimizer> result = new Result<PerformanceOptimizer>();
-        PerformanceOptimizer performanceOptimizer = performanceOptimizerService.getById(id);
-        if (performanceOptimizer == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(performanceOptimizer);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<PerformanceOptimizer> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                PerformanceOptimizer performanceOptimizer = JSON.parseObject(deString, PerformanceOptimizer.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(performanceOptimizer, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<PerformanceOptimizer> pageList = performanceOptimizerService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "优化师绩效信息列表");
-        mv.addObject(NormalExcelConstants.CLASS, PerformanceOptimizer.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<PerformanceOptimizer> listPerformanceOptimizers = ExcelImportUtil.importExcel(file.getInputStream(), PerformanceOptimizer.class, params);
-                performanceOptimizerService.saveBatch(listPerformanceOptimizers);
-                return Result.ok("文件导入成功!数据行数:" + listPerformanceOptimizers.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("文件导入失败!");
-    }
-
-    /**
-     * 优化师绩效详情
-     *
-     * @param pageNo
-     * @param pageSize
-     * @param mediaType
-     * @return
-     */
-    @GetMapping(value = "/detail")
-    @ResponseBody
-    public Map<String, Object> getPerformanceDetail(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                    @RequestParam(name = "mediaType", defaultValue = "2") String mediaType) {
-        return performanceOptimizerService.getPerformanceDetail(mediaType, pageNo, pageSize);
-    }
-
-    /**
-     * 优化师绩效排行榜
-     *
-     * @param mediaType
-     * @param pageNo
-     * @param pageSize
-     * @return
-     */
-    @GetMapping(value = "/ranking/list")
-    @ResponseBody
-    public Map<String, Object> getRankingList(@RequestParam(name = "mediaType", defaultValue = "2") String mediaType,
-                                              @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                              @RequestParam(name = "pageSize", defaultValue = "3") Integer pageSize,
-                                              @RequestParam(name = "orgCode", defaultValue = "A01") String orgCode) {
-        return performanceOptimizerService.getRankingList(mediaType, pageNo, pageSize, orgCode);
-    }
-
-    /**
-     * 获取项目经理相关数据
-     *
-     * @param
-     * @param mediaType
-     * @return
-     */
-    @GetMapping(value = "/manager/detail")
-    @ResponseBody
-    public Map<String, Object> getManagerPerformanceDetail(@RequestParam(name = "orgCode", defaultValue = "A01") String orgCode,
-                                                           @RequestParam(name = "mediaType", defaultValue = "2") String mediaType) {
-        return performanceOptimizerService.getManagerPerformanceDetail(mediaType, orgCode);
-    }
-
-
-    /**
-     * 计算运营绩效
-     */
-    @GetMapping(value = "/yunyingPerformance")
-    @ResponseBody
-    public void yunyingPerformance(@RequestParam(name = "year") Integer year,
-                                   @RequestParam(name = "quarter") Integer quarter) {
-
-        Map<String, String> map = DateUtils.quarterStartEndDate(year, quarter);
-        //performanceOptimizerService.toutiaoYunyingQuarterPerformance(year, quarter, map.get("startDate"), map.get("endDate"));
-        //performanceOptimizerService.kuaishouYunyingQuarterPerformance(year, quarter, map.get("startDate"), map.get("endDate"));
-
-        performanceOptimizerService.toutiaoYunyingQuarterPerformance(year, quarter, "2020-01-01", "2020-03-31");
-        performanceOptimizerService.kuaishouYunyingQuarterPerformance(year, quarter, "2020-01-01", "2020-03-31");
-
-    }
-
-    /**
-     * 计算运营绩效
-     */
-    @GetMapping(value = "/kuaishouYunyingLeaderQuarterPerformance")
-    @ResponseBody
-    public void kuaishouYunyingLeaderQuarterPerformance(@RequestParam(name = "year") Integer year,
-                                                        @RequestParam(name = "quarter") Integer quarter) {
-
-        Map<String, String> map = DateUtils.quarterStartEndDate(year, quarter);
-        performanceOptimizerService.kuaishouYunyingLeaderQuarterPerformance(year, quarter);
-    }
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/RolePerformancRraiseController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.performanceappraisal.entity.RolePerformancRraise;
-import cn.com.ctop.performanceappraisal.service.IRolePerformancRraiseService;
-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 2019-12-10
- */
-@Slf4j
-@Api(tags = "角色提点比例")
-@RestController
-@RequestMapping("/ctop/rolePerformancRraise")
-public class RolePerformancRraiseController {
-    @Autowired
-    private IRolePerformancRraiseService rolePerformancRraiseService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param rolePerformancRraise
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-分页列表查询")
-    @ApiOperation(value = "角色提点比例-分页列表查询", notes = "角色提点比例-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<RolePerformancRraise>> queryPageList(RolePerformancRraise rolePerformancRraise,
-                                                             @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                             @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                             HttpServletRequest req) {
-        Result<IPage<RolePerformancRraise>> result = new Result<IPage<RolePerformancRraise>>();
-        QueryWrapper<RolePerformancRraise> queryWrapper = QueryGenerator.initQueryWrapper(rolePerformancRraise, req.getParameterMap());
-        Page<RolePerformancRraise> page = new Page<RolePerformancRraise>(pageNo, pageSize);
-        IPage<RolePerformancRraise> pageList = rolePerformancRraiseService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param rolePerformancRraise
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-添加")
-    @ApiOperation(value = "角色提点比例-添加", notes = "角色提点比例-添加")
-    @PostMapping(value = "/add")
-    public Result<RolePerformancRraise> add(@RequestBody RolePerformancRraise rolePerformancRraise) {
-        Result<RolePerformancRraise> result = new Result<RolePerformancRraise>();
-        try {
-            rolePerformancRraiseService.save(rolePerformancRraise);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param rolePerformancRraise
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-编辑")
-    @ApiOperation(value = "角色提点比例-编辑", notes = "角色提点比例-编辑")
-    @PutMapping(value = "/edit")
-    public Result<RolePerformancRraise> edit(@RequestBody RolePerformancRraise rolePerformancRraise) {
-        Result<RolePerformancRraise> result = new Result<RolePerformancRraise>();
-        RolePerformancRraise rolePerformancRraiseEntity = rolePerformancRraiseService.getById(rolePerformancRraise.getId());
-        if (rolePerformancRraiseEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = rolePerformancRraiseService.updateById(rolePerformancRraise);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-通过id删除")
-    @ApiOperation(value = "角色提点比例-通过id删除", notes = "角色提点比例-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            rolePerformancRraiseService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-批量删除")
-    @ApiOperation(value = "角色提点比例-批量删除", notes = "角色提点比例-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<RolePerformancRraise> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<RolePerformancRraise> result = new Result<RolePerformancRraise>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.rolePerformancRraiseService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "角色提点比例-通过id查询")
-    @ApiOperation(value = "角色提点比例-通过id查询", notes = "角色提点比例-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<RolePerformancRraise> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<RolePerformancRraise> result = new Result<RolePerformancRraise>();
-        RolePerformancRraise rolePerformancRraise = rolePerformancRraiseService.getById(id);
-        if (rolePerformancRraise == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(rolePerformancRraise);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<RolePerformancRraise> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                RolePerformancRraise rolePerformancRraise = JSON.parseObject(deString, RolePerformancRraise.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(rolePerformancRraise, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<RolePerformancRraise> pageList = rolePerformancRraiseService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "角色提点比例列表");
-        mv.addObject(NormalExcelConstants.CLASS, RolePerformancRraise.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<RolePerformancRraise> listRolePerformancRraises = ExcelImportUtil.importExcel(file.getInputStream(), RolePerformancRraise.class, params);
-                rolePerformancRraiseService.saveBatch(listRolePerformancRraises);
-                return Result.ok("文件导入成功!数据行数:" + listRolePerformancRraises.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("文件导入失败!");
-    }
-
-}

+ 0 - 248
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/controller/RolePerformanceCommissionController.java

@@ -1,248 +0,0 @@
-package cn.com.ctop.performanceappraisal.controller;
-
-import cn.com.ctop.common.module.annotation.AutoLog;
-import cn.com.ctop.performanceappraisal.entity.RolePerformanceCommission;
-import cn.com.ctop.performanceappraisal.service.IRolePerformanceCommissionService;
-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 2019-12-10
- */
-@Slf4j
-@Api(tags = "角色提成比例")
-@RestController
-@RequestMapping("/ctop/rolePerformanceCommission")
-public class RolePerformanceCommissionController {
-    @Autowired
-    private IRolePerformanceCommissionService rolePerformanceCommissionService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param rolePerformanceCommission
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-分页列表查询")
-    @ApiOperation(value = "角色提成比例-分页列表查询", notes = "角色提成比例-分页列表查询")
-    @GetMapping(value = "/list")
-    public Result<IPage<RolePerformanceCommission>> queryPageList(RolePerformanceCommission rolePerformanceCommission,
-                                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                                  HttpServletRequest req) {
-        Result<IPage<RolePerformanceCommission>> result = new Result<IPage<RolePerformanceCommission>>();
-        QueryWrapper<RolePerformanceCommission> queryWrapper = QueryGenerator.initQueryWrapper(rolePerformanceCommission, req.getParameterMap());
-        Page<RolePerformanceCommission> page = new Page<RolePerformanceCommission>(pageNo, pageSize);
-        IPage<RolePerformanceCommission> pageList = rolePerformanceCommissionService.page(page, queryWrapper);
-        result.setSuccess(true);
-        result.setResult(pageList);
-        return result;
-    }
-
-    /**
-     * 添加
-     *
-     * @param rolePerformanceCommission
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-添加")
-    @ApiOperation(value = "角色提成比例-添加", notes = "角色提成比例-添加")
-    @PostMapping(value = "/add")
-    public Result<RolePerformanceCommission> add(@RequestBody RolePerformanceCommission rolePerformanceCommission) {
-        Result<RolePerformanceCommission> result = new Result<RolePerformanceCommission>();
-        try {
-            rolePerformanceCommissionService.save(rolePerformanceCommission);
-            result.success("添加成功!");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-            result.error500("操作失败");
-        }
-        return result;
-    }
-
-    /**
-     * 编辑
-     *
-     * @param rolePerformanceCommission
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-编辑")
-    @ApiOperation(value = "角色提成比例-编辑", notes = "角色提成比例-编辑")
-    @PutMapping(value = "/edit")
-    public Result<RolePerformanceCommission> edit(@RequestBody RolePerformanceCommission rolePerformanceCommission) {
-        Result<RolePerformanceCommission> result = new Result<RolePerformanceCommission>();
-        RolePerformanceCommission rolePerformanceCommissionEntity = rolePerformanceCommissionService.getById(rolePerformanceCommission.getId());
-        if (rolePerformanceCommissionEntity == null) {
-            result.error500("未找到对应实体");
-        } else {
-            boolean ok = rolePerformanceCommissionService.updateById(rolePerformanceCommission);
-            if (ok) {
-                result.success("修改成功!");
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-通过id删除")
-    @ApiOperation(value = "角色提成比例-通过id删除", notes = "角色提成比例-通过id删除")
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        try {
-            rolePerformanceCommissionService.removeById(id);
-        } catch (Exception e) {
-            log.error("删除失败", e.getMessage());
-            return Result.error("删除失败!");
-        }
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-批量删除")
-    @ApiOperation(value = "角色提成比例-批量删除", notes = "角色提成比例-批量删除")
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<RolePerformanceCommission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        Result<RolePerformanceCommission> result = new Result<RolePerformanceCommission>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.rolePerformanceCommissionService.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "角色提成比例-通过id查询")
-    @ApiOperation(value = "角色提成比例-通过id查询", notes = "角色提成比例-通过id查询")
-    @GetMapping(value = "/queryById")
-    public Result<RolePerformanceCommission> queryById(@RequestParam(name = "id", required = true) String id) {
-        Result<RolePerformanceCommission> result = new Result<RolePerformanceCommission>();
-        RolePerformanceCommission rolePerformanceCommission = rolePerformanceCommissionService.getById(id);
-        if (rolePerformanceCommission == null) {
-            result.error500("未找到对应实体");
-        } else {
-            result.setResult(rolePerformanceCommission);
-            result.setSuccess(true);
-        }
-        return result;
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<RolePerformanceCommission> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                RolePerformanceCommission rolePerformanceCommission = JSON.parseObject(deString, RolePerformanceCommission.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(rolePerformanceCommission, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<RolePerformanceCommission> pageList = rolePerformanceCommissionService.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "角色提成比例列表");
-        mv.addObject(NormalExcelConstants.CLASS, RolePerformanceCommission.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<RolePerformanceCommission> listRolePerformanceCommissions = ExcelImportUtil.importExcel(file.getInputStream(), RolePerformanceCommission.class, params);
-                rolePerformanceCommissionService.saveBatch(listRolePerformanceCommissions);
-                return Result.ok("文件导入成功!数据行数:" + listRolePerformanceCommissions.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("文件导入失败!");
-    }
-
-}

+ 0 - 81
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/OptimizerRoleInfo.java

@@ -1,81 +0,0 @@
-package cn.com.ctop.performanceappraisal.entity;
-
-import cn.com.ctop.common.module.annotation.Dict;
-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 2019-12-17
- */
-@Data
-@TableName("ctop_optimizer_role_info")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_optimizer_role_info对象", description = "优化师角色关系表")
-public class OptimizerRoleInfo {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.UUID)
-    @ApiModelProperty(value = "id")
-    private Integer id;
-    /**
-     * 部门代码
-     */
-    @Excel(name = "部门代码", width = 15)
-    @ApiModelProperty(value = "部门代码")
-    private String orgCode;
-    /**
-     * 角色类型 1:运营经理 2:运营专员
-     */
-    @Excel(name = "角色类型 1:运营经理 2:运营专员", width = 15)
-    @ApiModelProperty(value = "角色类型 1:运营经理 2:运营专员")
-    @Dict(dicCode = "optimizer_type")
-    private Integer type;
-    /**
-     * 用户id
-     */
-    @Excel(name = "用户id", width = 15)
-    @ApiModelProperty(value = "用户id")
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
-    private String userId;
-    private String realname;
-    /**
-     * 归属人id
-     */
-    @Excel(name = "归属人id", width = 15)
-    @ApiModelProperty(value = "归属人id")
-    @Dict(dicCode = "id", dictTable = "sys_user", dicText = "realname")
-    private String belongerId;
-    /**
-     * enabled
-     */
-    @Excel(name = "enabled", width = 15)
-    @ApiModelProperty(value = "enabled")
-    @Dict(dicCode = "valid_status")
-    private Integer enabled;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

+ 0 - 63
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/PerformanceConfig.java

@@ -1,63 +0,0 @@
-package cn.com.ctop.performanceappraisal.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 2020-01-08
- */
-@Data
-@TableName("ctop_performance_config")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_performance_config对象", description = "绩效配置文件表")
-public class PerformanceConfig {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * year
-     */
-    @Excel(name = "year", width = 15)
-    @ApiModelProperty(value = "year")
-    private Integer year;
-    /**
-     * quarter
-     */
-    @Excel(name = "quarter", width = 15)
-    @ApiModelProperty(value = "quarter")
-    private Integer quarter;
-    /**
-     * mediaTaskRaise
-     */
-    @Excel(name = "mediaTaskRaise", width = 15)
-    @ApiModelProperty(value = "mediaTaskRaise")
-    private Integer mediaTaskRaise;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

+ 0 - 102
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/PerformanceOptimizer.java

@@ -1,102 +0,0 @@
-package cn.com.ctop.performanceappraisal.entity;
-
-import cn.com.ctop.performanceappraisal.vo.OptimizerCostDetailVO;
-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 2019-12-13
- */
-@Data
-@TableName("ctop_performance_optimizer")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_performance_optimizer对象", description = "优化师绩效信息")
-public class PerformanceOptimizer {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 总消耗
-     */
-    @Excel(name = "总消耗", width = 15)
-    @ApiModelProperty(value = "总消耗")
-    private java.math.BigDecimal totalCost;
-    /**
-     * 总提成
-     */
-    @Excel(name = "总提成", width = 15)
-    @ApiModelProperty(value = "总提成")
-    private java.math.BigDecimal totalRoyalty;
-    /**
-     * 年
-     */
-    @Excel(name = "年", width = 15)
-    @ApiModelProperty(value = "年")
-    private String year;
-    /**
-     * 季度
-     */
-    @Excel(name = "季度", width = 15)
-    @ApiModelProperty(value = "季度")
-    private String quarter;
-    /**
-     * 用户id
-     */
-    @Excel(name = "用户id", width = 15)
-    @ApiModelProperty(value = "用户id")
-    private String userId;
-    /**
-     * 用户名称
-     */
-    @Excel(name = "用户名称", width = 15)
-    @ApiModelProperty(value = "用户名称")
-    private String realname;
-    /**
-     * 媒体类型
-     */
-    @Excel(name = "媒体类型1_头条2_快手", width = 15)
-    @ApiModelProperty(value = "媒体类型1_头条2_快手")
-    private Integer appType;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-
-    public PerformanceOptimizer() {
-    }
-
-    public PerformanceOptimizer(OptimizerCostDetailVO vo) {
-        this.appType = vo.getAppType();
-        this.totalCost = vo.getTotalCost();
-        this.totalRoyalty = vo.getTotalRoyalty();
-        this.year = vo.getYear();
-        this.quarter = vo.getQuarter();
-        this.userId = vo.getUserId();
-        this.realname = vo.getRealName();
-        this.appType = vo.getAppType();
-    }
-}

+ 0 - 85
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformancRraise.java

@@ -1,85 +0,0 @@
-package cn.com.ctop.performanceappraisal.entity;
-
-import cn.com.ctop.common.module.annotation.Dict;
-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 2019-12-10
- */
-@Data
-@TableName("ctop_role_performance_raise")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_role_performance_raise对象", description = "角色提点比例")
-public class RolePerformancRraise {
-
-    /**
-     * id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "id")
-    private Long id;
-    /**
-     * 角色id
-     */
-    @Excel(name = "角色id", width = 15)
-    @ApiModelProperty(value = "角色id")
-    @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
-    private String roleId;
-    /**
-     * 提点梯度级别
-     */
-    @Excel(name = "提点梯度级别", width = 15)
-    @ApiModelProperty(value = "提点梯度级别")
-    private Integer level;
-    /**
-     * n 千分之n
-     */
-    @Excel(name = "n 千分之n", width = 15)
-    @ApiModelProperty(value = "n 千分之n")
-    private java.math.BigDecimal raiseRate;
-    /**
-     * n 百分之n
-     */
-    @Excel(name = "n 百分之n", width = 15)
-    @ApiModelProperty(value = "n 百分之n")
-    private java.math.BigDecimal videoEfficiencyRate;
-    /**
-     * 1:快手 2:头条
-     */
-    @Excel(name = "媒体类型1_头条2_快手", width = 15)
-    @ApiModelProperty(value = "媒体类型1_头条2_快手")
-    @Dict(dicCode = "media_type")
-    private Integer appType;
-    /**
-     * 是否可用
-     */
-    @Excel(name = "是否可用", width = 15)
-    @ApiModelProperty(value = "是否可用")
-    @Dict(dicCode = "valid_status")
-    private Integer enabled;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
-    private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
-    private Date updateTime;
-}

+ 0 - 78
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/entity/RolePerformanceCommission.java

@@ -1,78 +0,0 @@
-package cn.com.ctop.performanceappraisal.entity;
-
-import cn.com.ctop.common.module.annotation.Dict;
-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 2019-12-10
- */
-@Data
-@TableName("ctop_role_performance_commission")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "ctop_role_performance_commission对象", description = "角色提成比例")
-public class RolePerformanceCommission {
-
-    /**
-     * 主键id
-     */
-    @TableId(type = IdType.AUTO)
-    @ApiModelProperty(value = "主键id")
-    private Long id;
-    /**
-     * sys_role的主键id
-     */
-    @Excel(name = "sys_role的主键id", width = 15)
-    @ApiModelProperty(value = "sys_role的主键id")
-    @Dict(dicCode = "id", dictTable = "sys_role", dicText = "role_name")
-    private String roleId;
-    /**
-     * 角色提成比例
-     */
-    @Excel(name = "角色提成比例", width = 15)
-    @ApiModelProperty(value = "角色提成比例")
-    private java.math.BigDecimal roleCommissionRate;
-    /**
-     * 是否可用 1:可用 2:不可用
-     */
-    @Excel(name = "是否可用", width = 15)
-    @ApiModelProperty(value = "是否可用 1:可用 2:不可用")
-    @Dict(dicCode = "valid_status")
-    private Integer enabled;
-    /**
-     * 1:快手  2:头条
-     */
-    @Excel(name = "媒体类型1_头条2_快手", width = 15)
-    @ApiModelProperty(value = "媒体类型1_头条2_快手")
-    @Dict(dicCode = "media_type")
-    private Integer appType;
-
-    @Excel(name = "是否有平面", width = 15)
-    @ApiModelProperty(value = "是否有平面")
-    @Dict(dicCode = "has_plane")
-    private Integer hasPlane;
-    /**
-     * 开始时间
-     */
-    @ApiModelProperty(value = "开始时间")
-    private Date createTime;
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(value = "更新时间")
-    private Date updateTime;
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/OptimizerConfigMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceappraisal.mapper;
-
-import cn.com.ctop.performanceappraisal.entity.OptimizerConfig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 优化师配置信息表
- *
- * @author: jeecg-boot
- * @date: 2019-12-13
- * @cersion: V1.0
- */
-public interface OptimizerConfigMapper extends BaseMapper<OptimizerConfig> {
-
-}

+ 0 - 15
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/OptimizerRoleInfoMapper.java

@@ -1,15 +0,0 @@
-package cn.com.ctop.performanceappraisal.mapper;
-
-import cn.com.ctop.performanceappraisal.entity.OptimizerRoleInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 优化师角色关系表
- *
- * @author: jeecg-boot
- * @date: 2019-12-17
- * @cersion: V1.0
- */
-public interface OptimizerRoleInfoMapper extends BaseMapper<OptimizerRoleInfo> {
-
-}

+ 0 - 0
performance-appraisal/src/main/java/cn/com/ctop/performanceappraisal/mapper/PerformanceConfigMapper.java


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません