浏览代码

Merge branch 'master' into V2.0.1

zhaoxian 4 年之前
父节点
当前提交
a62a7104fb
共有 100 个文件被更改,包括 532 次插入341357 次删除
  1. 4 1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
  2. 2 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/CwjsPolicyInfoMapper.java
  3. 87 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml
  4. 49 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/ImportPolicyController.java
  5. 1 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/pojo/CtopCwjsSlettementReport.java
  6. 105 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/vo/PolicyImportVo.java
  7. 2 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/vo/SettlementReportBytedanceVo.java
  8. 4 2
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/ReportSettlementMapper.java
  9. 2 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/CwjsProfitMapper.xml
  10. 85 12
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/ReportSettlementMapper.xml
  11. 6 6
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/SettlementFileInfoMapper.xml
  12. 6 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/IReportSettlementService.java
  13. 101 18
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java
  14. 9 0
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/SettlementFileInfoServiceImpl.java
  15. 69 65
      jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/SettlementInfoServiceImpl.java
  16. 0 57
      jeecg-boot-module-demo/pom.xml
  17. 0 16
      jeecg-boot-module-demo/src/main/java/org/jeecg/JeecgDemoCloudApplication.java
  18. 0 48
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoController.java
  19. 0 27
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/provider/JcloudDemoProvider.java
  20. 0 7
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java
  21. 0 13
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java
  22. 0 214
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java
  23. 0 13551
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area.json
  24. 0 1
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_mini.json
  25. 0 36
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_options.json
  26. 0 29
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.json
  27. 0 29
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.json
  28. 0 29
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.json
  29. 0 29
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.json
  30. 0 29
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.json
  31. 0 63
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json
  32. 0 10
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getTubiao.json
  33. 0 50
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json
  34. 0 156
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission.json
  35. 0 150
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json
  36. 0 608
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/role.json
  37. 0 103
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/service.json
  38. 0 12
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json
  39. 0 55
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json
  40. 0 2388
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user.json
  41. 0 407
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json
  42. 0 40
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/userinfo.json
  43. 0 85
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json
  44. 0 61
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json
  45. 0 43
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json
  46. 0 32
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json
  47. 0 388
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java
  48. 0 20
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/entity/MockEntity.java
  49. 0 155907
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh.json
  50. 0 1550
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh_s8.json
  51. 0 1
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/dlglong.json
  52. 0 216
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VXESocket.java
  53. 0 63
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/BigScreenTemplatController.java
  54. 0 285
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
  55. 0 254
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java
  56. 0 265
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderTabMainController.java
  57. 0 244
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java
  58. 0 29
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/TestAlinkController.java
  59. 0 78
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
  60. 0 54
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java
  61. 0 50
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java
  62. 0 48
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java
  63. 0 67
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java
  64. 0 45
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java
  65. 0 29
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java
  66. 0 17
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java
  67. 0 29
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java
  68. 0 15
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java
  69. 0 34
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml
  70. 0 5
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml
  71. 0 5
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml
  72. 0 5
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml
  73. 0 5
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xml
  74. 0 33
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java
  75. 0 18
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java
  76. 0 46
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java
  77. 0 18
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java
  78. 0 15
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java
  79. 0 109
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java
  80. 0 30
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java
  81. 0 162
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java
  82. 0 29
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java
  83. 0 19
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java
  84. 0 44
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java
  85. 0 40
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/xxljob/TestJobHandler.java
  86. 0 406
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java
  87. 0 20
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/entity/MockEntity.java
  88. 0 155907
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh.json
  89. 0 1550
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh_s8.json
  90. 0 1
      jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/json/dlglong.json
  91. 0 7
      jeecg-boot-module-demo/src/main/resources/application.yml
  92. 0 3360
      jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/css/easyui.css
  93. 0 1225
      jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/css/jquery-ui.css
  94. 0 66
      jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/css/main_design1.css
  95. 0 62
      jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/css/room.css
  96. 二进制
      jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm.png
  97. 二进制
      jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm1.png
  98. 二进制
      jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/images/content_down.png
  99. 二进制
      jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/images/content_down1.png
  100. 0 0
      jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/images/index.gif

+ 4 - 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -217,13 +217,16 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/estimatePeopleNumber/**", "anon");
 
         filterChainDefinitionMap.put("/exportReportController/**", "anon");
+
+        filterChainDefinitionMap.put("/importPolicyController/importPolicyInit", "anon");
         //filterChainDefinitionMap.put("/settLementController/**", "anon");
 //        filterChainDefinitionMap.put("/settLementFileController/**", "anon");
 
         filterChainDefinitionMap.put("/ctop/projectMember/**", "anon");
         filterChainDefinitionMap.put("/agent/**", "anon");
         filterChainDefinitionMap.put("/materialUse/**", "anon");
-
+        filterChainDefinitionMap.put("/document/library/**", "anon");
+        filterChainDefinitionMap.put("/rejected/audit/**", "anon");
 
         // 添加自己的过滤器并且取名为jwt
         Map<String, Filter> filterMap = new HashMap<>(1);

+ 2 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/CwjsPolicyInfoMapper.java

@@ -30,4 +30,6 @@ public interface CwjsPolicyInfoMapper extends BaseMapper<CwjsPolicyInfo> {
     List<JSONObject> getAllSaleByUserId(String userId);
 
     void updatePolicyInfoById(CwjsPolicyInfo policyInfo);
+
+    CwjsPolicyInfo getPolicyInfo(CwjsPolicyInfo policyInfo);
 }

+ 87 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/mapper/xml/CwjsPolicyInfoMapper.xml

@@ -134,4 +134,91 @@
         where id = #{id}
     </update>
 
+
+
+
+
+
+
+
+
+    <select id="getPolicyInfo" resultType="org.jeecg.ctop.finance.policy.entity.CwjsPolicyInfo">
+        SELECT pi.*
+        FROM
+            ctop_cwjs_policy_info pi
+          where pi.del_flag = 0
+        <if test="companyName != null and companyName != ''">
+            and pi.company_name = #{companyName}
+        </if>
+        <if test="advertiserName != null and advertiserName != ''">
+            and pi.advertiser_name = #{advertiserName}
+        </if>
+        <if test="mediaType != null and mediaType != ''">
+            and pi.media_type = #{mediaType}
+        </if>
+
+        <if test="companySubjectId != null">
+            and pi.company_subject_id = #{companySubjectId}
+        </if>
+
+        <if test="groupAbbreviation != null and groupAbbreviation != ''">
+            and pi.group_abbreviation = #{groupAbbreviation}
+        </if>
+
+        <if test="advancePay != null">
+            and pi.advance_pay = #{advancePay}
+        </if>
+        <if test="accountingPeriod != null and accountingPeriod != ''">
+            and pi.accounting_period = #{accountingPeriod}
+        </if>
+
+        <if test="rebateType != null">
+            and pi.rebate_type = #{rebateType}
+        </if>
+
+        <if test="rebateRate != null and rebateRate != ''">
+            and pi.rebate_rate = #{rebateRate}
+        </if>
+
+        <if test="isDianPay != null">
+            and pi.is_dian_pay = #{isDianPay}
+        </if>
+
+        <if test="dianPayCompanyName != null and dianPayCompanyName != ''">
+            and pi.dian_pay_company_name = #{dianPayCompanyName}
+        </if>
+
+        <if test="dianPayCompanyRebateRate != null and dianPayCompanyRebateRate != ''">
+            and pi.dian_pay_company_rebate_rate = #{dianPayCompanyRebateRate}
+        </if>
+
+        <if test="promotionType != null">
+            and pi.promotion_type = #{promotionType}
+        </if>
+
+        <if test="policyStartDate != null and policyStartDate != ''">
+            and pi.policy_start_date = #{policyStartDate}
+        </if>
+
+        <if test="policyEndDate != null and policyEndDate != ''">
+            and pi.policy_end_date = #{policyEndDate}
+        </if>
+
+        <if test="createUserId != null and createUserId != ''">
+            and pi.create_user_id = #{createUserId}
+        </if>
+        limit 1
+
+
+    </select>
+
+
+
+
+
+
+
+
+
+
 </mapper>

+ 49 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/controller/ImportPolicyController.java

@@ -0,0 +1,49 @@
+package org.jeecg.ctop.finance.settlement.controller;
+
+import cn.com.ctop.common.module.service.ISysUserService;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.entity.SysUser;
+import org.jeecg.common.util.DateUtils;
+import org.jeecg.ctop.finance.settlement.entity.vo.SettlementFileParamsVo;
+import org.jeecg.ctop.finance.settlement.service.IReportSettlementService;
+import org.jeecg.ctop.finance.settlement.service.ISettlementInfoService;
+import org.jeecg.ctop.finance.settlement.service.serviceImpl.ReportSettlementServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
+
+
+/**
+ * 政策信息 导入
+ * Administrator
+ * 2021/7/28
+ **/
+
+@Slf4j
+@RestController
+@RequestMapping("/importPolicyController")
+public class ImportPolicyController {
+
+    @Autowired
+    private ReportSettlementServiceImpl reportSettlementService;
+    @Autowired
+    private ISysUserService userService;
+
+    @ApiOperation(value = "财务结算-导入政策数据", notes = "财务结算-导入政策数据")
+    @PostMapping(value = "/importPolicyInit")
+    public Result importPolicyInit(@RequestParam("file") MultipartFile files) throws Exception{
+
+        return reportSettlementService.importPolicyInit(files);
+    }
+
+
+
+
+
+
+}

+ 1 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/pojo/CtopCwjsSlettementReport.java

@@ -20,6 +20,7 @@ public class CtopCwjsSlettementReport implements Serializable {
     private Long id;
     private Integer policyId;
     private String advertiserName;
+    private String companyName;
     private String productName;
     private String policyDate;
     private Integer mediaType;

+ 105 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/vo/PolicyImportVo.java

@@ -0,0 +1,105 @@
+package org.jeecg.ctop.finance.settlement.entity.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * @description: 政策 上传 数据 excel
+ * @return:
+ * @author: zianY
+ */
+@Data
+public class PolicyImportVo implements Serializable {
+    /**公司名称*/
+    @Excel(name = "公司名称")
+    private String companyName;
+    /**广告主id*/
+    @Excel(name = "广告主")
+    private String advertiserName;
+
+    @Excel(name = "产品名称(多个产品名称使用英文'-'分割)")
+    private String policyProductName;
+
+
+    /**媒体类型*/
+    @Excel(name = "媒体(1-头条 2-快手)")
+    private Integer mediaType;
+
+    @Excel(name = "销售人员名称")
+    private String createUserName;
+    /**区域 华北,华南,华东*/
+    @Excel(name = "区域(华北,石家庄,华南,骄阳,杭州,华东)")
+    private String areaInfo;
+
+    /**我司主体*/
+    @Excel(name = "我司主体(北京汇创思拓数字科技有限公司,广州汇创思拓数字科技有限公司,骄阳,上海贯月,舟山有梗)")
+    private String companySubjectIdStr;
+
+
+    /**运营方式: 0:自运营  1:代运营*/
+    @Excel(name = "运营方式(0:自运营  1:代运营)")
+    private Integer promotionType;
+
+    /**集团简称*/
+    @Excel(name = "集团简称")
+    private String groupAbbreviation;
+    /**状态 0:待审核 1:审核中 2:审核通过3:审核拒绝*/
+
+    @ApiModelProperty(value = "状态 0:待审核 1:审核中 2:审核通过3:审核拒绝")
+    private Integer approvedStatus;
+
+    /**是否预付:0:否  1:是 */
+    @Excel(name = "是否预付(0:否  1:是)")
+    private Integer advancePay;
+
+    /**返点类型:0:返现  1:返货   2:返现+返货*/
+    @Excel(name = "返点类型(0:返现  1:返货   2:返现+返货)")
+    private Integer rebateType;
+
+    /**返点比例*/
+    @Excel(name = "返点比列(保留2位小数,不需要带'%')")
+    private java.math.BigDecimal rebateRate;
+
+    /**账期*/
+    @Excel(name = "账期")
+    private String accountingPeriod;
+
+    /**是否垫付:0:否  1:是 */
+    @Excel(name = "是否第三方垫付(0:否  1:是)")
+    private Integer isDianPay;
+    /**垫付公司名称*/
+    @Excel(name = "垫付公司")
+    private String dianPayCompanyName;
+    /**垫付公司返点比例*/
+    @Excel(name = "垫付返点(保留4位小数)")
+    private java.math.BigDecimal dianPayCompanyRebateRate;
+
+    /**政策开始时间*/
+    @Excel(name = "政策开始时间(年-月-日)")
+    private String policyStartDate;
+    /**政策结束时间*/
+    @Excel(name = "政策结束时间(年-月-日)")
+    private String policyEndDate;
+    /**备注:如果没人填的话记录被拒次数*/
+    @Excel(name = "备注")
+    private String remarks;
+
+
+    @ApiModelProperty(value = "删除状态(0,正常,1已删除)")
+    private Integer delFlag;
+    /**创建时间*/
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+    /**更新时间*/
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+}

+ 2 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/entity/vo/SettlementReportBytedanceVo.java

@@ -50,6 +50,8 @@ public class SettlementReportBytedanceVo implements Serializable {
 
 
     private String accountName;
+    private String agentId;
+    private String agentName;
 
 
 

+ 4 - 2
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/ReportSettlementMapper.java

@@ -44,6 +44,8 @@ public interface ReportSettlementMapper {
      * @return
      */
    List<String> getAccountIdBytedance(@Param("sales") Set<String> sales, @Param("mediaId")String mediaId, @Param("advertiserId")String advertiserId, @Param("productId")String productId);
+   List<String> getAccountIdBytedanceRepeat(@Param("accountIds") List<String> accountIds,@Param("uploadYears")String uploadYears);
+   List<String> getAccountIdKuaiShouRepeat(@Param("accountIds") List<String> accountIds,@Param("uploadYears")String uploadYears);
 
     /**
      * 查询 头条 账户 图片
@@ -77,9 +79,9 @@ public interface ReportSettlementMapper {
      * @param
      * @return
      */
-    List<Map<String,Object>> getProfitBytedance(@Param("productName") String productName,@Param("mediaType") String mediaType,@Param("startTime")String startTime,@Param("endTime")String endTime);
+    List<Map<String,Object>> getProfitBytedance(@Param("advertiserName") String advertiserName,@Param("productName") String productName,@Param("saleId") String saleId,@Param("mediaType") String mediaType,@Param("startTime")String startTime,@Param("endTime")String endTime);
 
-    Map<String,Object> getProfitRebate(@Param("productName") String productName,@Param("startTime")String startTime,@Param("endTime")String endTime);
+    Map<String,Object> getProfitRebate(@Param("advertiserName") String advertiserName,@Param("productName") String productName,@Param("saleId") String saleId,@Param("mediaType") String mediaType,@Param("startTime")String startTime,@Param("endTime")String endTime);
 
     Map<String,Object> getProfitReportSale(String accountId);
 

+ 2 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/CwjsProfitMapper.xml

@@ -6,6 +6,7 @@
     <insert id="replaceCwjsSlettementProfit">
             replace into ctop_cwjs_slettement_report(
             advertiser_name,
+            company_name,
             product_name,
             policy_date,
             create_user_id,
@@ -15,6 +16,7 @@
             values
             <foreach collection="list" item="l" separator=",">
                 (#{l.advertiserName},
+                #{l.companyName},
                 #{l.productName},
                 #{l.policyDate},
                 #{l.createUserId},

+ 85 - 12
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/ReportSettlementMapper.xml

@@ -7,7 +7,27 @@
         select t.*,c.auth_name as accountName from (select id,
         advertiser_id,
         date,DATE_FORMAT(date,'%Y-%m') as uploadYears,
-        balance,cash_cost,cost,frozen,income,reward_cost,shared_wallet_cost,transfer_in,transfer_out,create_time
+        balance,cash_cost,cost,frozen,income,reward_cost,shared_wallet_cost,transfer_in,transfer_out,create_time,
+        (
+        SELECT
+        ag.agent_id
+        from
+        ctop_cwjs_agent_info ag
+        LEFT JOIN ctop_agent_account ac on ag.agent_id = ac.agent_id
+        where ac.state = 0
+        and ag.`status` = 0
+        and ag.enabled = 0
+        and ac.account_id = #{accountId}) as agentId,
+        (
+        SELECT
+        ag.name
+        from
+        ctop_cwjs_agent_info ag
+        LEFT JOIN ctop_agent_account ac on ag.agent_id = ac.agent_id
+        where ac.state = 0
+        and ag.`status` = 0
+        and ag.enabled = 0
+        and ac.account_id = #{accountId}) as agentName
          from
         ctop_account_transaction_day
         where cost >0
@@ -15,6 +35,7 @@
             )t
       LEFT JOIN ctop_user_allocation c on t.advertiser_id = c.account_id
         where uploadYears = #{uploadYears}
+        ORDER BY date
     </select>
 
     <!-- 查询 头条 账户id-->
@@ -43,6 +64,61 @@
 
     </select>
 
+
+    <!-- 查询  账户id 消耗不为0-->
+    <select id="getAccountIdBytedanceRepeat" resultType="java.lang.String">
+        SELECT
+        advertiser_id
+        FROM
+        ctop_account_transaction_day
+        WHERE
+        cost > 0
+    <if test="uploadYears !=null and uploadYears != ''">
+        AND DATE_FORMAT( date, '%Y-%m' ) =  #{uploadYears}
+    </if>
+    <if test="accountIds !=null and accountIds != ''">
+        AND advertiser_id in
+        <foreach collection="accountIds" item="item" separator=","
+                 open="(" close=")">
+            #{item}
+        </foreach>
+    </if>
+        GROUP BY
+        advertiser_id
+    </select>
+
+    <!-- 查询  账户id 消耗不为0-->
+    <select id="getAccountIdKuaiShouRepeat" resultType="java.lang.String">
+        SELECT
+        account_id AS accountId
+        FROM
+        ctop_kuaishou_daily_agent
+        WHERE
+        total_charged_in_yuan > 0
+     <if test="uploadYears !=null and uploadYears != ''">
+        AND DATE_FORMAT( date_time, '%Y-%m' ) =  #{uploadYears}
+    </if>
+    <if test="accountIds !=null and accountIds != ''">
+        AND account_id in
+        <foreach collection="accountIds" item="item" separator=","
+                 open="(" close=")">
+            #{item}
+        </foreach>
+    </if>
+        GROUP BY
+        account_id
+    </select>
+
+
+
+
+
+
+
+
+
+
+
     <!-- 查询 头条 账户 图片-->
     <select id="getAccountImagesBytedance" resultType="java.lang.String">
         SELECT
@@ -260,7 +336,9 @@
         <if test="mediaType !=null and mediaType != ''">
             AND cp.media_type = #{mediaType}
         </if>
+            AND r.advertiser_name = #{advertiserName}
             AND r.product_name = #{productName}
+            AND r.create_user_id = #{saleId}
         <if test="startTime !=null and startTime != ''">
             AND  r.policy_date &gt;= #{startTime}
         </if>
@@ -283,9 +361,12 @@
         LEFT JOIN ctop_cwjs_policy_info p ON r.policy_id = p.id
         WHERE
         p.del_flag = 0
-        <if test="productName !=null and productName != ''">
-            AND r.product_name = #{productName}
+        <if test="mediaType !=null and mediaType != ''">
+            AND p.media_type = #{mediaType}
         </if>
+        AND r.advertiser_name = #{advertiserName}
+        AND r.product_name = #{productName}
+        AND r.create_user_id = #{saleId}
         <if test="startTime !=null and startTime != ''">
             AND  r.policy_date &gt;= #{startTime}
         </if>
@@ -299,16 +380,8 @@
 
     <!-- 查询 利润表  销售人员姓名 -->
     <select id="getProfitReportSale" resultType="java.util.LinkedHashMap">
-       <!-- SELECT f.create_user_id,u.realname as saleName
-        from ctop_cwjs_settlement_info f
-        LEFT  JOIN sys_user u on u.id = f.create_user_id
-        where f.del_flag = 0
-        <if test="accountId !=null and accountId != ''">
-            AND f.account_id = #{accountId}
-        </if>
-        limit 1-->
         ( SELECT
-        p.sale_id,
+        p.sale_id AS saleId,
         y.realname AS saleName
         FROM
         ctop_user_allocation u

+ 6 - 6
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/mapper/xml/SettlementFileInfoMapper.xml

@@ -97,13 +97,13 @@
         f.upload_years as uploadYears,
         f.media_id as mediaId,
         f.advertiser_id as advertiserId,
-        ( SELECT ad.NAME FROM ctop_advertiser ad WHERE ad.id = cwjs.advertiser_id LIMIT 1 ) advertiserName,
+        ( SELECT ad.NAME FROM ctop_advertiser ad WHERE ad.id = f.advertiser_id LIMIT 1 ) advertiserName,
         f.product_id as productId,
-        ( SELECT cp.product_name FROM ctop_product cp WHERE cp.id = cwjs.product_id LIMIT 1 ) productName,
-        cwjs.project_id as projectId,
-        ( SELECT project.project_name FROM ctop_project project WHERE project.id = cwjs.project_id LIMIT 1 ) projectName,
-        cwjs.account_id as accountId,
-        cwjs.account_name as accountName,
+        ( SELECT cp.product_name FROM ctop_product cp WHERE cp.id = f.product_id LIMIT 1 ) productName,
+        IFNULL((SELECT u.project_id from ctop_user_allocation u where u.account_id  = f.account_id),cwjs.project_id) as projectId,
+        IFNULL((SELECT u.project_name from ctop_user_allocation u where u.account_id  = f.account_id),(SELECT project.project_name FROM ctop_project project WHERE project.id = cwjs.project_id LIMIT 1 )) as projectName,
+        IFNULL(cwjs.account_id,f.account_id) as accountId,
+        IFNULL((SELECT u.auth_name from ctop_user_allocation u where u.account_id  = f.account_id),cwjs.account_name) as accountName,
         f.del_flag,
         cwjs.create_user_id as saleUserId,
         ( SELECT su.realname FROM sys_user su WHERE su.id = cwjs.create_user_id LIMIT 1 ) saleUserName,

+ 6 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/IReportSettlementService.java

@@ -6,6 +6,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.ctop.finance.policy.entity.CwjsPolicyInfo;
 import org.jeecg.ctop.finance.settlement.entity.vo.SettlementFileParamsVo;
 import org.jeecg.ctop.finance.settlement.entity.vo.SettlementReportBytedanceVo;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
@@ -29,4 +30,9 @@ public interface IReportSettlementService {
     void cwjsPRofit(CwjsPolicyInfo cwjsPolicyInfo);
 
     List<String> getAccountId(SettlementFileParamsVo paramsVo,SysUser user);
+
+
+
+    Result importPolicyInit(MultipartFile file);
+
 }

+ 101 - 18
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/ReportSettlementServiceImpl.java

@@ -1,13 +1,13 @@
 package org.jeecg.ctop.finance.settlement.service.serviceImpl;
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import cn.com.ctop.common.module.entity.SysLog;
 import cn.com.ctop.common.module.entity.UserAllocation;
-import cn.com.ctop.common.module.mapper.MailLogMapper;
-import cn.com.ctop.common.module.mapper.SysLogMapper;
-import cn.com.ctop.common.module.mapper.SysRoleMapper;
-import cn.com.ctop.common.module.mapper.UserAllocationMapper;
+import cn.com.ctop.common.module.mapper.*;
 import cn.com.ctop.common.module.utils.CorpWexinUtils;
 import cn.com.ctop.common.module.utils.ImageUtils;
 import com.alibaba.fastjson.JSONObject;
@@ -24,8 +24,11 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.entity.SysUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DateUtils;
+import org.jeecg.ctop.finance.policy.entity.CwjsCompanySubject;
 import org.jeecg.ctop.finance.policy.entity.CwjsPolicyInfo;
 import org.jeecg.ctop.finance.policy.entity.CwjsPolicyProduct;
+import org.jeecg.ctop.finance.policy.mapper.CwjsCompanySubjectMapper;
+import org.jeecg.ctop.finance.policy.mapper.CwjsPolicyInfoMapper;
 import org.jeecg.ctop.finance.policy.mapper.CwjsPolicyProductMapper;
 import org.jeecg.ctop.finance.policy.utils.Check;
 import org.jeecg.ctop.finance.settlement.entity.pojo.CtopCwjsSettlementInfo;
@@ -41,6 +44,7 @@ import org.jeecg.modules.ctop.service.IMaterialReportOverViewService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
@@ -200,8 +204,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                     row.createCell(0).setCellValue(vo.getDate());
                     row.createCell(1).setCellValue(vo.getAccountName());
                     row.createCell(2).setCellValue(vo.getAdvertiserId());
-                    row.createCell(3).setCellValue("北京汇创思拓数字科技有限公司-ka");
-                    row.createCell(4).setCellValue("73970348172");
+                    row.createCell(3).setCellValue(vo.getAgentName());
+                    row.createCell(4).setCellValue(vo.getAgentId());
                     row.createCell(5).setCellValue(vo.getCost());
                     row.createCell(6).setCellValue(vo.getCashCost());
                     row.createCell(7).setCellValue(vo.getRewardCost());
@@ -563,7 +567,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                 List<String> policyDaysList = new ArrayList<>();
                 if (!Check.isNull(map.get("productName"))){
                     //查询 头条利润表  返点类型和比列
-                    List<Map<String,Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("productName")+"","1",paramsVo.getStartTime(),paramsVo.getEndTime());
+                    List<Map<String,Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("advertiserName")+"",map.get("productName")+"",slaeMap.get("saleId")+"","1",paramsVo.getStartTime(),paramsVo.getEndTime());
                     List listPolicyTIme = new ArrayList();
                     for (Map<String, Object> rate : rateMap) {
                         listPolicyTIme.add(rate.get("policyStartDate"));
@@ -585,7 +589,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                     for (Map<String, String> stringMap : arrayList) {
                         ProfitReportBytedanceVo vo = new ProfitReportBytedanceVo();
                         //使用政策 返点类型和比例
-                        Map<String,Object>  policyRateMap = reportSettlementMapper.getProfitRebate(map.get("productName")+"",stringMap.get("startDate"),stringMap.get("endDate"));
+                        Map<String,Object>  policyRateMap = reportSettlementMapper.getProfitRebate(map.get("advertiserName")+"",map.get("productName")+"",slaeMap.get("saleId")+"","1",stringMap.get("startDate"),stringMap.get("endDate"));
                         if (!Check.isNull(policyRateMap)){
                             if(Integer.valueOf(policyRateMap.get("rebateType").toString())== 0){
                                 vo.setRebateType("返现");//返点类型
@@ -721,7 +725,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                 List<String> policyDaysList = new ArrayList<>();
                 if (!Check.isNull(map.get("productName"))) {
                     //查询 快手利润表  返点类型和比列
-                    List<Map<String, Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("productName") + "", "2", paramsVo.getStartTime(), paramsVo.getEndTime());
+                    List<Map<String, Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("advertiserName")+"",map.get("productName") + "", slaeMap.get("saleId")+"","2", paramsVo.getStartTime(), paramsVo.getEndTime());
                     List listPolicyTIme = new ArrayList();
                     for (Map<String, Object> rate : rateMap) {
                         listPolicyTIme.add(rate.get("policyStartDate"));
@@ -745,7 +749,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                     for (Map<String, String> stringMap : arrayList) {
                         ProfitReportKuaiShouVo vo = new ProfitReportKuaiShouVo();
                         //使用政策 返点类型和比例
-                        Map<String, Object> policyRateMap = reportSettlementMapper.getProfitRebate(map.get("productName") + "", stringMap.get("startDate"), stringMap.get("endDate"));
+                        Map<String, Object> policyRateMap = reportSettlementMapper.getProfitRebate(map.get("advertiserName")+"",map.get("productName") + "", slaeMap.get("saleId")+"","2",stringMap.get("startDate"), stringMap.get("endDate"));
                         if (!Check.isNull(policyRateMap)) {
                             if (Integer.valueOf(policyRateMap.get("rebateType").toString()) == 0) {
                                 vo.setRebateType("返现");//返点类型
@@ -796,11 +800,9 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                     vo.setTime(!Check.isNull(vo.getRebateType()) ? stringMap.get("startDate") + "----" + stringMap.get("endDate") : "");
                     resultList.add(vo);
                 }
-
             }
 
             Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("快手利润单", "快手利润单"), ProfitReportKuaiShouVo.class, resultList);
-
             try {
                 response.setCharacterEncoding("UTF-8");
                 response.setHeader("content-Type", "application/vnd.ms-excel");
@@ -809,7 +811,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             } catch (IOException e) {
                 throw new RuntimeException(e);
             }
-
         } catch (Exception e) {
             e.printStackTrace();
             return Result.errorMsg(e.getMessage());
@@ -834,7 +835,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
         int accountNum = 0;
         String productInfo = null;
         String message =  "{0},您好!您{1}月份有{2}个产品的账户需要进行媒体后台消耗截图上传,共计{3}个账户。产品分别为:{4}。请及时上传,多谢配合!";
-
         //查询所有 运营绑定的账户
         List<Map<String,Object>> userList = reportSettlementMapper.getAccountOperateUserId();
         for (Map<String, Object> userMap : userList) {
@@ -849,7 +849,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             productNum = product.size();
             accountNum = productList.size();
             productInfo = StringUtils.join(product.toArray(),"、");
-
             //发送微信通知
             JSONObject jsonObject =  mailLogMapper.getWChatIdByUserId(userId);
             String msg = MessageFormat.format(message,userMap.get("userName").toString(),month,productNum,accountNum,productInfo);
@@ -881,7 +880,6 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             productNum = product.size();
             accountNum = productList.size();
             productInfo = StringUtils.join(product.toArray(),"、");
-
             //发送微信通知
             JSONObject jsonObject =  mailLogMapper.getWChatIdByUserId(Check.isNull(userId) ? "f990f815ecef43fab9cbe1bb22bb6d63" : userId);
             String msg = MessageFormat.format(message,userMap.get("userName").toString(),month,productNum,accountNum,productInfo);
@@ -893,10 +891,8 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
     @Resource
     private CwjsPolicyProductMapper cwjsPolicyProductMapper;
 
-
     @Override
     public void cwjsPRofit(CwjsPolicyInfo cwjsPolicyInfo) {
-
         // 获取两个日期之间 所有的 时间 年-月-日
         List<String> betweenDaysList = SettlementUtil.getAllDatesOfTwoTimes(cwjsPolicyInfo.getPolicyStartDate(),cwjsPolicyInfo.getPolicyEndDate());
         //查看 政策下的产品
@@ -909,6 +905,7 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
                         CtopCwjsSlettementReport report = new CtopCwjsSlettementReport();
                         report.setPolicyId(cwjsPolicyInfo.getId());
                         report.setAdvertiserName(cwjsPolicyInfo.getAdvertiserName());
+                        report.setCompanyName(cwjsPolicyInfo.getCompanyName());
                         report.setProductName(product.getPolicyProductName());
                         report.setMediaType(cwjsPolicyInfo.getMediaType());
                         report.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
@@ -920,4 +917,90 @@ public class ReportSettlementServiceImpl implements IReportSettlementService {
             }
         }
     }
+
+    @Resource
+    private CwjsPolicyInfoMapper cwjsPolicyInfoMapper;
+    @Resource
+    private SysUserMapper sysUserMapper;
+    @Resource
+    private CwjsCompanySubjectMapper cwjsCompanySubjectMapper;
+
+    @Override
+    public Result importPolicyInit(MultipartFile file) {
+        try {
+            //LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            //settlementInfo.setCreateUserId(user.getId());
+            //settlementInfo.setCreateUserId("b161b7d9793942f980dbfe8c931cd1b0");
+            ImportParams importParams = new ImportParams();
+            //表头行数
+            importParams.setHeadRows(1);
+
+            ExcelImportResult<PolicyImportVo> importResult = ExcelImportUtil.importExcelMore(file.getInputStream(), PolicyImportVo.class, importParams);
+            if (importResult.getList().size() < 1) {
+                return Result.error("读取Excel失败,数据不能为空,请重新检查数据并导入");
+            }
+
+            for (PolicyImportVo importVo : importResult.getList()) {
+                if (cn.com.ctop.common.module.utils.Check.isNull(importVo.getCompanyName())){
+                    continue;
+                }
+                if (cn.com.ctop.common.module.utils.Check.isNull(importVo.getPolicyProductName())){
+                    continue;
+                }
+                List<String> productNameList = Arrays.asList(importVo.getPolicyProductName().split("-"));
+
+                CwjsPolicyInfo cwjsPolicyInfo = new CwjsPolicyInfo();
+                BeanUtils.copyProperties(importVo, cwjsPolicyInfo);
+
+                // 销售 - 创建人
+                QueryWrapper<SysUser> sysUserQw = new QueryWrapper<>();
+                sysUserQw.eq("realname", importVo.getCreateUserName());
+                sysUserQw.last("limit 1");
+                SysUser user = sysUserMapper.selectOne(sysUserQw);
+                cwjsPolicyInfo.setCreateUserId(user.getId());
+
+                //公司主体
+                QueryWrapper<CwjsCompanySubject> companySubQw = new QueryWrapper<>();
+                companySubQw.eq("company_subject_name", importVo.getCompanySubjectIdStr());
+                companySubQw.eq("area_info", importVo.getAreaInfo());
+                companySubQw.last("limit 1");
+                CwjsCompanySubject companySubject = cwjsCompanySubjectMapper.selectOne(companySubQw);
+                cwjsPolicyInfo.setCompanySubjectId(companySubject.getId());
+
+                cwjsPolicyInfo.setApprovedStatus(3);
+
+                CwjsPolicyInfo policy = cwjsPolicyInfoMapper.getPolicyInfo(cwjsPolicyInfo);
+
+                if (cn.com.ctop.common.module.utils.Check.isNull(policy)){
+                    cwjsPolicyInfoMapper.insert(cwjsPolicyInfo);
+                    policy = cwjsPolicyInfoMapper.getPolicyInfo(cwjsPolicyInfo);
+                }
+
+                //查看 政策下的产品
+                List<CwjsPolicyProduct> productList = cwjsPolicyProductMapper.queryProductsByPolicyId(policy.getId());
+                List proList = productList.stream().map(CwjsPolicyProduct:: getPolicyProductName).collect(Collectors.toList());
+                for (String str : productNameList) {
+                    if (!proList.contains(str)){
+                        //新增产品
+                        CwjsPolicyProduct policyProduct = new CwjsPolicyProduct();
+                        policyProduct.setPolicyId(policy.getId());
+                        policyProduct.setPolicyProductName(str);
+                        policyProduct.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
+                        policyProduct.setDelFlag(0);
+                        cwjsPolicyProductMapper.insert(policyProduct);
+                    }
+                }
+                this.cwjsPRofit(policy);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error("政策数据上传失败,请使用正确的模板导入!");
+        }
+        return Result.successMsg("政策数据上传成功", null);
+    }
+
+
+
+
+
 }

+ 9 - 0
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/SettlementFileInfoServiceImpl.java

@@ -11,6 +11,7 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.ctop.finance.policy.utils.Check;
 import org.jeecg.ctop.finance.settlement.entity.pojo.CtopCwjsSettlementFileInfo;
 import org.jeecg.ctop.finance.settlement.entity.vo.SettlementFileParamsVo;
+import org.jeecg.ctop.finance.settlement.mapper.ReportSettlementMapper;
 import org.jeecg.ctop.finance.settlement.mapper.SettlementFileInfoMapper;
 import org.jeecg.ctop.finance.settlement.mapper.SettlementInfoMapper;
 import org.jeecg.ctop.finance.settlement.service.IReportSettlementService;
@@ -185,6 +186,8 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
 
     @Autowired
     private IReportSettlementService reportSettlementService;
+    @Autowired
+    private ReportSettlementMapper reportSettlementMapper;
 
     /**
      * @description: 查询账户数量以及图片数量
@@ -196,6 +199,12 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
     public Result getAccountNumAndImgNum(SettlementFileParamsVo paramsVo, SysUser user) {
         Map<String,String> map =  settlementFileInfoMapper.getAccountNumAndImgNum(paramsVo);
         List<String>accountIds = reportSettlementService.getAccountId(paramsVo,user);
+        //过滤消耗为0 的账户 1-头条 2-快手
+        if (paramsVo.getMediaId().equals(1)){
+            accountIds = reportSettlementMapper.getAccountIdBytedanceRepeat(accountIds,paramsVo.getUploadYears());
+        }else if (paramsVo.getMediaId().equals(2)){
+            accountIds = reportSettlementMapper.getAccountIdKuaiShouRepeat(accountIds,paramsVo.getUploadYears());
+        }
         if(null == accountIds||accountIds.isEmpty()){
             map.put("accountNum","0");
         }else{

+ 69 - 65
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/settlement/service/serviceImpl/SettlementInfoServiceImpl.java

@@ -8,6 +8,7 @@ import cn.com.ctop.alarm.modules.service.impl.RuleAccountTemplateServiceImpl;
 import cn.com.ctop.common.module.entity.SysLog;
 import cn.com.ctop.common.module.entity.UserAllocation;
 import cn.com.ctop.common.module.mapper.SysLogMapper;
+import cn.com.ctop.common.module.mapper.SysUserMapper;
 import cn.com.ctop.common.module.service.impl.UserAllocationServiceImpl;
 import cn.com.ctop.common.module.utils.Check;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,9 +20,18 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.entity.SysUser;
 import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.ctop.finance.policy.entity.CwjsCompanySubject;
+import org.jeecg.ctop.finance.policy.entity.CwjsPolicyInfo;
+import org.jeecg.ctop.finance.policy.entity.CwjsPolicyProduct;
+import org.jeecg.ctop.finance.policy.mapper.CwjsCompanySubjectMapper;
+import org.jeecg.ctop.finance.policy.mapper.CwjsPolicyInfoMapper;
+import org.jeecg.ctop.finance.policy.mapper.CwjsPolicyProductMapper;
+import org.jeecg.ctop.finance.policy.service.impl.CwjsPolicyProductServiceImpl;
 import org.jeecg.ctop.finance.settlement.entity.pojo.CtopCwjsSettlementInfo;
 import org.jeecg.ctop.finance.settlement.entity.vo.AccountImportVo;
+import org.jeecg.ctop.finance.settlement.entity.vo.PolicyImportVo;
 import org.jeecg.ctop.finance.settlement.mapper.SettlementInfoMapper;
 import org.jeecg.ctop.finance.settlement.service.ISettlementInfoService;
 import org.jeecg.modules.ctop.entity.ProjectMember;
@@ -38,6 +48,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Slf4j
@@ -53,12 +64,10 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
 
 
     /**
-     *
-     * @description: 查询 财务结算-账户列表
-     *
      * @param settlementInfo
      * @param pageNo
      * @param pageSize
+     * @description: 查询 财务结算-账户列表
      * @return: org.jeecg.common.api.vo.Result
      * @author: zianY
      */
@@ -73,26 +82,27 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
 
     @Autowired
     private UserAllocationServiceImpl userAllocationService;
+
     /**
-     * @description: 财务结算-修改账户状态
      * @param id
      * @param status 账户状态 0-开 1-关
+     * @description: 财务结算-修改账户状态
      * @return: org.jeecg.common.api.vo.Result
      * @author: zianY
      */
     @Override
     public Result updSettlementStatusById(Long id, Integer status) {
         // 修改状态
-        settlementInfoMapper.updSettlementStatusById(id,status);
+        settlementInfoMapper.updSettlementStatusById(id, status);
 
         //同步 状态
-       CtopCwjsSettlementInfo settlementInfo =  settlementInfoMapper.selectById(id);
+        CtopCwjsSettlementInfo settlementInfo = settlementInfoMapper.selectById(id);
 
         UserAllocation userAllocation = userAllocationService.getByAccountId(new Long(settlementInfo.getAccountId()));
-        if (!Check.isNull(userAllocation)){
+        if (!Check.isNull(userAllocation)) {
             userAllocation.setAccountStatus(status);
             userAllocationService.editUserAlloCation(userAllocation);
-        }else{
+        } else {
             LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
             SysLog sysLog = new SysLog();
             sysLog.setLogType(2);
@@ -155,10 +165,8 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
     */
 
     /**
-     *
-     * @description: 删除
-     *
      * @param id
+     * @description: 删除
      * @return: org.jeecg.common.api.vo.Result
      * @author: zianY
      */
@@ -170,11 +178,9 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
 
 
     /**
-     *
-     * @description:
-     *
      * @param settlementInfo
      * @param file
+     * @description:
      * @return: org.jeecg.common.api.vo.Result
      * @author: zianY
      * @time: 2021/7/30 16:26
@@ -182,69 +188,67 @@ public class SettlementInfoServiceImpl extends ServiceImpl<SettlementInfoMapper,
     @Override
     public Result settlementAccountImport(CtopCwjsSettlementInfo settlementInfo, MultipartFile file) {
 
-            try {
-                //LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-                //settlementInfo.setCreateUserId(user.getId());
-                //settlementInfo.setCreateUserId("b161b7d9793942f980dbfe8c931cd1b0");
-                ImportParams importParams = new ImportParams();
-                //表格标题行数
-                importParams.setTitleRows(1);
-                //表头行数
-                importParams.setHeadRows(1);
-
-                //校验表头 头条
-                if (StringUtils.equals("1",String.valueOf(settlementInfo.getMediaId()))){
-                    importParams.setImportFields(new String[]{"账户ID","账户名称"});
-                    //快手
-                }else if (StringUtils.equals("2",String.valueOf(settlementInfo.getMediaId()))){
-                    importParams.setImportFields(new String[]{"快手ID","账户ID","账户名称"});
+        try {
+            //LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+            //settlementInfo.setCreateUserId(user.getId());
+            //settlementInfo.setCreateUserId("b161b7d9793942f980dbfe8c931cd1b0");
+            ImportParams importParams = new ImportParams();
+            //表格标题行数
+            importParams.setTitleRows(1);
+            //表头行数
+            importParams.setHeadRows(1);
+
+            //校验表头 头条
+            if (StringUtils.equals("1", String.valueOf(settlementInfo.getMediaId()))) {
+                importParams.setImportFields(new String[]{"账户ID", "账户名称"});
+                //快手
+            } else if (StringUtils.equals("2", String.valueOf(settlementInfo.getMediaId()))) {
+                importParams.setImportFields(new String[]{"快手ID", "账户ID", "账户名称"});
+            }
+            //校验excel的标题列顺序
+            importParams.setNeedCheckOrder(true);
+            ExcelImportResult<AccountImportVo> importResult = ExcelImportUtil.importExcelMore(file.getInputStream(), AccountImportVo.class, importParams);
+            if (importResult.getList().size() < 1) {
+                return Result.error("读取Excel失败,数据不能为空,请重新检查数据并导入");
+            }
+            for (AccountImportVo importVo : importResult.getList()) {
+                if (Check.isNull(importVo.getAccountId())) {
+                    continue;
                 }
-                //校验excel的标题列顺序
-                importParams.setNeedCheckOrder(true);
-                ExcelImportResult<AccountImportVo> importResult = ExcelImportUtil.importExcelMore(file.getInputStream(), AccountImportVo.class,importParams);
-                if (importResult.getList().size() < 1){
-                    return Result.error("读取Excel失败,数据不能为空,请重新检查数据并导入");
+                //查询 账户 状态
+                UserAllocation userAllocation = userAllocationService.getByAccountId(new Long(importVo.getAccountId()));
+                if (Check.isNull(userAllocation)) {
+                    settlementInfo.setStatus(0);
+                } else {
+                    settlementInfo.setStatus(userAllocation.getAccountStatus());
                 }
-                for (AccountImportVo importVo : importResult.getList()) {
-                    if (Check.isNull(importVo.getAccountId())){
-                        continue;
-                    }
-                    //查询 账户 状态
-                    UserAllocation userAllocation = userAllocationService.getByAccountId(new Long(importVo.getAccountId()));
-                    if (Check.isNull(userAllocation)){
-                        settlementInfo.setStatus(0);
-                    }else {
-                        settlementInfo.setStatus(userAllocation.getAccountStatus());
-                    }
-                    BeanUtils.copyProperties(importVo,settlementInfo);
-                    //根据账户id 查看
-                    CtopCwjsSettlementInfo cwjs = settlementInfoMapper.getSettlementByAccountId(importVo.getAccountId());
-                    if (Check.isNull(cwjs)){
-                       // BeanUtils.copyProperties(importVo,settlementInfo);
-                        settlementInfoMapper.insert(settlementInfo);
-                    }else {
-                        settlementInfo.setId(cwjs.getId());
-                        settlementInfoMapper.updateById(settlementInfo);
-                    }
+                BeanUtils.copyProperties(importVo, settlementInfo);
+                //根据账户id 查看
+                CtopCwjsSettlementInfo cwjs = settlementInfoMapper.getSettlementByAccountId(importVo.getAccountId());
+                if (Check.isNull(cwjs)) {
+                    // BeanUtils.copyProperties(importVo,settlementInfo);
+                    settlementInfoMapper.insert(settlementInfo);
+                } else {
+                    settlementInfo.setId(cwjs.getId());
+                    settlementInfoMapper.updateById(settlementInfo);
                 }
-            }catch (Exception e){
-                e.printStackTrace();
-                return Result.error("账户数据上传失败,请使用正确的模板导入!");
             }
-            return Result.successMsg("账户数据上传成功",null);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error("账户数据上传失败,请使用正确的模板导入!");
         }
+        return Result.successMsg("账户数据上传成功", null);
+    }
 
 
     /**
-     *
-     * @description: 查询多个用户信息
-     *
      * @param userIds
-     * @return: java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     * @description: 查询多个用户信息
+     * @return: java.util.List<java.util.Map < java.lang.String, java.lang.Object>>
      * @author: zianY
      */
     @Override
-    public List<Map<String,Object>> getUserByIds(Set userIds) {
+    public List<Map<String, Object>> getUserByIds(Set userIds) {
         return settlementInfoMapper.getUserByIds(userIds);
     }
 

+ 0 - 57
jeecg-boot-module-demo/pom.xml

@@ -1,57 +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.4.5</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>jeecg-boot-module-demo</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-boot-base-core</artifactId>
-        </dependency>
-        <!--引入微服务启动依赖 starter-->
-      <dependency>
-          <groupId>org.jeecgframework.boot</groupId>
-          <artifactId>jeecg-boot-starter-cloud</artifactId>
-      </dependency>
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-system-local-api</artifactId>
-        </dependency>
-
-        <!--alink -->
-        <dependency>
-            <groupId>com.alibaba.alink</groupId>
-            <artifactId>alink_core_flink-1.13_2.11</artifactId>
-            <version>1.4.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-scala_2.11</artifactId>
-            <version>1.13.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner_2.11</artifactId>
-            <version>1.13.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients_2.11</artifactId>
-            <version>1.13.0</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>

+ 0 - 16
jeecg-boot-module-demo/src/main/java/org/jeecg/JeecgDemoCloudApplication.java

@@ -1,16 +0,0 @@
-package org.jeecg;
-
-import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-
-@SpringBootApplication
-@EnableDubbo
-@EnableFeignClients(basePackages = {"org.jeecg"})
-public class JeecgDemoCloudApplication {
-
-    public static void main(String[] args) {
-        SpringApplication.run(JeecgDemoCloudApplication.class, args);
-    }
-}

+ 0 - 48
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoController.java

@@ -1,48 +0,0 @@
-//package org.jeecg.modules.demo.cloud.controller;
-//
-//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.api.ISysBaseAPI;
-//import org.jeecg.common.system.vo.DictModel;
-//import org.springframework.web.bind.annotation.GetMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import javax.annotation.Resource;
-//import java.util.List;
-//
-///**
-// *
-// */
-//@Slf4j
-//@Api(tags = "Cloud示例")
-//@RestController
-//@RequestMapping("/test")
-//public class JcloudDemoController {
-//
-//
-//    @Resource
-//    private ISysBaseAPI sysBaseAPI;
-//
-//    /**
-//     * 测试
-//     *
-//     * @return
-//     */
-//    @GetMapping("/remote")
-//    @ApiOperation(value = "测试feign", notes = "测试feign")
-//    public Result remoteDict() {
-////        try{
-////            //睡5秒,网关Hystrix3秒超时,会触发熔断降级操作
-////            Thread.sleep(5000);
-////        }catch (Exception e){
-////            e.printStackTrace();
-////        }
-//        List<DictModel> list = sysBaseAPI.queryAllDict();
-//        return Result.OK(list);
-//    }
-//
-//
-//}

+ 0 - 27
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/provider/JcloudDemoProvider.java

@@ -1,27 +0,0 @@
-package org.jeecg.modules.demo.cloud.provider;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.demo.cloud.service.JcloudDemoService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-
-/**
- * feign服务端接口
- */
-@RestController
-@RequestMapping("/test")
-public class JcloudDemoProvider {
-
-    @Resource
-    private JcloudDemoService jcloudDemoService;
-
-    @GetMapping("/getMessage")
-    public Result<String> getMessage(@RequestParam String name) {
-        return jcloudDemoService.getMessage(name);
-    }
-
-}

+ 0 - 7
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/JcloudDemoService.java

@@ -1,7 +0,0 @@
-package org.jeecg.modules.demo.cloud.service;
-
-import org.jeecg.common.api.vo.Result;
-
-public interface JcloudDemoService {
-    Result<String> getMessage(String name);
-}

+ 0 - 13
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/cloud/service/impl/JcloudDemoServiceImpl.java

@@ -1,13 +0,0 @@
-package org.jeecg.modules.demo.cloud.service.impl;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.demo.cloud.service.JcloudDemoService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class JcloudDemoServiceImpl implements JcloudDemoService {
-    @Override
-    public Result<String> getMessage(String name) {
-        return Result.OK("Hello," + name);
-    }
-}

+ 0 - 214
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java

@@ -1,214 +0,0 @@
-package org.jeecg.modules.demo.mock;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.swing.filechooser.FileSystemView;
-
-import org.apache.commons.io.IOUtils;
-import org.jeecg.common.api.vo.Result;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import lombok.extern.slf4j.Slf4j;
-
-@RestController
-@RequestMapping("/mock/api")
-@Slf4j
-public class MockController {
-
-	private final String JSON_PATH = "classpath:org/jeecg/modules/demo/mock/json";
-	
-	/**
-	 * 通用json访问接口
-	 * 格式: http://localhost:8080/jeecg-boot/api/json/{filename}
-	 * @param filename
-	 * @return
-	 */
-	@RequestMapping(value = "/json/{filename}", method = RequestMethod.GET)
-	public String getJsonData(@PathVariable String filename) {
-		String jsonpath = "classpath:org/jeecg/modules/demo/mock/json/"+filename+".json";
-		return readJson(jsonpath);
-	}
-	
-	@GetMapping(value = "/asynTreeList")
-	public String asynTreeList(String id) {
-		return readJson(JSON_PATH + "/asyn_tree_list_" + id + ".json");
-	}
-	
-	@GetMapping(value = "/user")
-	public String user() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/user.json");
-	}
-	
-	/**
-	 * 老的登录获取用户信息接口
-	 * @return
-	 */
-	@GetMapping(value = "/user/info")
-	public String userInfo() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/user_info.json");
-	}
-
-	@GetMapping(value = "/role")
-	public String role() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/role.json");
-	}
-
-	@GetMapping(value = "/service")
-	public String service() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/service.json");
-	}
-
-	@GetMapping(value = "/permission")
-	public String permission() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/permission.json");
-	}
-
-	@GetMapping(value = "/permission/no-pager")
-	public String permission_no_page() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/permission_no_page.json");
-	}
-	
-	/**
-	 * 省市县
-	 */
-	@GetMapping(value = "/area")
-	public String area() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/area.json");
-	}
-	
-	/**
-	  * 测试报表数据
-	 */
-	@GetMapping(value = "/report/getYearCountInfo")
-	public String getYearCountInfo() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json");
-	}
-	@GetMapping(value = "/report/getMonthCountInfo")
-	public String getMonthCountInfo() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json");
-	}
-	@GetMapping(value = "/report/getCntrNoCountInfo")
-	public String getCntrNoCountInfo() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json");
-	}
-	@GetMapping(value = "/report/getCabinetCountInfo")
-	public String getCabinetCountInfo() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json");
-	}
-	@GetMapping(value = "/report/getTubiao")
-	public String getTubiao() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/getTubiao.json");
-	}
-
-	/**
-	   * 实时磁盘监控
-	 * @param request
-	 * @param response
-	 * @return
-	 */
-	@GetMapping("/queryDiskInfo")
-	public Result<List<Map<String,Object>>> queryDiskInfo(HttpServletRequest request, HttpServletResponse response){
-		Result<List<Map<String,Object>>> res = new Result<>();
-		try {
-			// 当前文件系统类
-	        FileSystemView fsv = FileSystemView.getFileSystemView();
-	        // 列出所有windows 磁盘
-	        File[] fs = File.listRoots();
-	        log.info("查询磁盘信息:"+fs.length+"个");
-	        List<Map<String,Object>> list = new ArrayList<>();
-	        
-	        for (int i = 0; i < fs.length; i++) {
-	        	if(fs[i].getTotalSpace()==0) {
-	        		continue;
-	        	}
-	        	Map<String,Object> map = new HashMap<>();
-	        	map.put("name", fsv.getSystemDisplayName(fs[i]));
-	        	map.put("max", fs[i].getTotalSpace());
-	        	map.put("rest", fs[i].getFreeSpace());
-	        	map.put("restPPT", fs[i].getFreeSpace()*100/fs[i].getTotalSpace());
-	        	list.add(map);
-	        	log.info(map.toString());
-	        }
-	        res.setResult(list);
-	        res.success("查询成功");
-		} catch (Exception e) {
-			res.error500("查询失败"+e.getMessage());
-		}
-		return res;
-	}
-	
-	//-------------------------------------------------------------------------------------------
-	/**
-	 * 工作台首页的数据
-	 * @return
-	 */
-	@GetMapping(value = "/list/search/projects")
-	public String projects() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/workplace_projects.json");
-	}
-
-	@GetMapping(value = "/workplace/activity")
-	public String activity() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/workplace_activity.json");
-	}
-	
-	@GetMapping(value = "/workplace/teams")
-	public String teams() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/workplace_teams.json");
-	}
-	
-	@GetMapping(value = "/workplace/radar")
-	public String radar() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/workplace_radar.json");
-	}
-	
-	@GetMapping(value = "/task/process")
-	public String taskProcess() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/task_process.json");
-	}
-	//-------------------------------------------------------------------------------------------
-	
-	//author:lvdandan-----date:20190315---for:添加数据日志json----
-	public String sysDataLogJson() {
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/sysdatalog.json");
-	}
-	//author:lvdandan-----date:20190315---for:添加数据日志json----
-
-	//--update-begin--author:wangshuai-----date:20201023---for:返回用户信息json数据----
-	@GetMapping(value = "/getUserInfo")
-	public String getUserInfo(){
-		return readJson("classpath:org/jeecg/modules/demo/mock/json/userinfo.json");
-	}
-	//--update-end--author:wangshuai-----date:20201023---for:返回用户信息json数据----
-	/**
-	 * 读取json格式文件
-	 * @param jsonSrc
-	 * @return
-	 */
-	private String readJson(String jsonSrc) {
-		String json = "";
-		try {
-			//File jsonFile = ResourceUtils.getFile(jsonSrc);
-			//json = FileUtils.re.readFileToString(jsonFile);
-			//换个写法,解决springboot读取jar包中文件的问题
-			InputStream stream = getClass().getClassLoader().getResourceAsStream(jsonSrc.replace("classpath:", ""));
-			json = IOUtils.toString(stream,"UTF-8");
-		} catch (IOException e) {
-			log.error(e.getMessage(),e);
-		}
-		return json;
-	}
-
-}

文件差异内容过多而无法显示
+ 0 - 13551
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area.json


文件差异内容过多而无法显示
+ 0 - 1
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_mini.json


+ 0 - 36
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/area_options.json

@@ -1,36 +0,0 @@
-[
-  {"value": "110000", "label": "北京市"},
-  {"value": "120000", "label": "天津市"},
-  {"value": "130000", "label": "河北省"},
-  {"value": "140000", "label": "山西省"},
-  {"value": "150000", "label": "内蒙古自治区"},
-  {"value": "210000", "label": "辽宁省"},
-  {"value": "220000", "label": "吉林省"},
-  {"value": "230000", "label": "黑龙江省"},
-  {"value": "310000", "label": "上海市"},
-  {"value": "320000", "label": "江苏省"},
-  {"value": "330000", "label": "浙江省"},
-  {"value": "340000", "label": "安徽省"},
-  {"value": "350000", "label": "福建省"},
-  {"value": "360000", "label": "江西省"},
-  {"value": "370000", "label": "山东省"},
-  {"value": "410000", "label": "河南省"},
-  {"value": "420000", "label": "湖北省"},
-  {"value": "430000", "label": "湖南省"},
-  {"value": "440000", "label": "广东省"},
-  {"value": "450000", "label": "广西壮族自治区"},
-  {"value": "460000", "label": "海南省"},
-  {"value": "500000", "label": "重庆市"},
-  {"value": "510000", "label": "四川省"},
-  {"value": "520000", "label": "贵州省"},
-  {"value": "530000", "label": "云南省"},
-  {"value": "540000", "label": "西藏自治区"},
-  {"value": "610000", "label": "陕西省"},
-  {"value": "620000", "label": "甘肃省"},
-  {"value": "630000", "label": "青海省"},
-  {"value": "640000", "label": "宁夏回族自治区"},
-  {"value": "650000", "label": "新疆维吾尔自治区"},
-  {"value": "710000", "label": "台湾省"},
-  {"value": "810000", "label": "香港特别行政区"},
-  {"value": "820000", "label": "澳门特别行政区"}
-]

+ 0 - 29
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_0.json

@@ -1,29 +0,0 @@
-{
-	"status": 200,
-	"success": true,
-	"message": "ok",
-	"result": [
-		{
-			"id": 1,
-			"name": "首页",
-			"component": "dashboard/Analysis",
-			"orderNum": 1,
-			"hasChildren": false
-		},
-		{
-			"id": 2,
-			"name": "常见案例",
-			"component": "layouts/RouteView",
-			"orderNum": 2,
-			"hasChildren": true
-		},
-		{
-			"id": 3,
-			"name": "系统监控",
-			"component": "layouts/RouteView",
-			"orderNum": 3,
-			"hasChildren": true
-		}
-	],
-	"timestamp": 1554950583837
-}

+ 0 - 29
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_1.json

@@ -1,29 +0,0 @@
-{
-	"status": 200,
-	"success": true,
-	"message": "ok",
-	"result": [
-		{
-			"id": 11,
-			"name": "首页",
-			"component": "dashboard/Analysis",
-			"orderNum": 1,
-			"hasChildren": false
-		},
-		{
-			"id": 12,
-			"name": "系统管理",
-			"component": "layouts/RouteView",
-			"orderNum": 2,
-			"hasChildren": true
-		},
-		{
-			"id": 13,
-			"name": "常见案例",
-			"component": "layouts/RouteView",
-			"orderNum": 3,
-			"hasChildren": true
-		}
-	],
-	"timestamp": 1554950583837
-}

+ 0 - 29
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_2.json

@@ -1,29 +0,0 @@
-{
-	"status": 200,
-	"success": true,
-	"message": "ok",
-	"result": [
-		{
-			"id": 21,
-			"name": "弹框选择Demo",
-			"component": "jeecg/SelectDemo",
-			"orderNum": 1,
-			"hasChildren": false
-		},
-		{
-			"id": 22,
-			"name": "单表模型示例",
-			"component": "jeecg/JeecgDemoList",
-			"orderNum": 2,
-			"hasChildren": false
-		},
-		{
-			"id": 23,
-			"name": "一对多Tab示例",
-			"component": "jeecg/tablist/JeecgOrderDMainList",
-			"orderNum": 3,
-			"hasChildren": false
-		}
-	],
-	"timestamp": 1554950583837
-}

+ 0 - 29
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_3.json

@@ -1,29 +0,0 @@
-{
-	"status": 200,
-	"success": true,
-	"message": "ok",
-	"result": [
-		{
-			"id": 31,
-			"name": "性能监控",
-			"component": "layouts/RouteView",
-			"orderNum": 1,
-			"hasChildren": true
-		},
-		{
-			"id": 32,
-			"name": "在线文档",
-			"component": "layouts/IframePageView",
-			"orderNum": 2,
-			"hasChildren": false
-		},
-		{
-			"id": 33,
-			"name": "工作台",
-			"component": "dashboard/Workplace",
-			"orderNum": 3,
-			"hasChildren": false
-		}
-	],
-	"timestamp": 1554950583837
-}

+ 0 - 29
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/asyn_tree_list_31.json

@@ -1,29 +0,0 @@
-{
-	"status": 200,
-	"success": true,
-	"message": "ok",
-	"result": [
-		{
-			"id": 311,
-			"name": "Redis监控",
-			"component": "modules/monitor/RedisInfo",
-			"orderNum": 1,
-			"hasChildren": false
-		},
-		{
-			"id": 312,
-			"name": "JVM信息",
-			"component": "modules/monitor/JvmInfo",
-			"orderNum": 2,
-			"hasChildren": false
-		},
-		{
-			"id": 313,
-			"name": "Tomcat信息",
-			"component": "modules/monitor/TomcatInfo",
-			"orderNum": 3,
-			"hasChildren": false
-		}
-	],
-	"timestamp": 1554950583837
-}

+ 0 - 63
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getCntrNoCountInfo.json

@@ -1,63 +0,0 @@
-{
-	"success": true,
-	"message": "查询成功",
-	"code": null,
-	"result": [
-		{
-			"resultIndex": 0,
-			"yearcount": 623,
-			"year": 2016,
-			"month": "四月",
-			"monthcount": 3255,
-			"classifyname": "证明类",
-			"cntrnocount": 24,
-			"cabinetname": "一号柜",
-			"cabinetcocunt": 12
-		},
-		{
-			"resultIndex": 1,
-			"yearcount": 243,
-			"year": 2017,
-			"month": "五月",
-			"monthcount": 5673,
-			"classifyname": "产权类",
-			"cntrnocount": 52,
-			"cabinetname": "二号柜",
-			"cabinetcocunt": 52
-		},
-		{
-			"resultIndex": 2,
-			"yearcount": 345,
-			"year": 2018,
-			"month": "六月",
-			"monthcount": 2673,
-			"classifyname": "知识类",
-			"cntrnocount": 85,
-			"cabinetname": "三号柜",
-			"cabinetcocunt": 24
-		},
-		{
-			"resultIndex": 3,
-			"yearcount": 452,
-			"year": 2019,
-			"month": "七月",
-			"monthcount": 2341,
-			"classifyname": "技术类",
-			"cntrnocount": 67,
-			"cabinetname": "四号柜",
-			"cabinetcocunt": 45
-		},
-		{
-			"resultIndex": 4,
-			"yearcount": 645,
-			"year": 2020,
-			"month": "八月",
-			"monthcount": 7473,
-			"classifyname": "工具类",
-			"cntrnocount": 93,
-			"cabinetname": "五号柜",
-			"cabinetcocunt": 94
-		}
-	],
-	"timestamp": 1554285003594
-}

+ 0 - 10
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/getTubiao.json

@@ -1,10 +0,0 @@
-{"data":
-  [
-    {"day": "星期一", "step": 1234, "assess": "良"},
-    {"day": "星期二", "step": 1884, "assess": "优"},
-    {"day": "星期三", "step": 1671, "assess": "良+"},
-    {"day": "星期四", "step": 2197, "assess": "优+"},
-    {"day": "星期五", "step": 1342, "assess": "中"},
-    {"day": "星期六", "step": 545, "assess": "差"},
-    {"day": "星期日", "step": 244, "assess": "极差"}
-  ]}

+ 0 - 50
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/graphreport_chart.json

@@ -1,50 +0,0 @@
-{
-	"status": 200,
-	"success": true,
-	"message": "ok",
-	"result": {
-		"data": [
-			{
-				"id": 0,
-				"x": "1",
-				"y": 889
-			},
-			{
-				"id": 1,
-				"x": "2",
-				"y": 341
-			},
-			{
-				"id": 2,
-				"x": "3",
-				"y": 1028
-			},
-			{
-				"id": 3,
-				"x": "4",
-				"y": 1168
-			},
-			{
-				"id": 4,
-				"x": "5",
-				"y": 653
-			},
-			{
-				"id": 5,
-				"x": "6",
-				"y": 863
-			},
-			{
-				"id": 6,
-				"x": "7",
-				"y": 421
-			},
-			{
-				"id": 7,
-				"x": "8",
-				"y": 1320
-			}
-		]
-	},
-	"timestamp": 1554950583837
-}

+ 0 - 156
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission.json

@@ -1,156 +0,0 @@
-{
-  "message": "",
-  "result": {
-    "data": [
-      {
-        "id": "marketing",
-        "name": "营销管理",
-        "describe": null,
-        "status": 1,
-        "actionData": "[{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-        "sptDaTypes": null,
-        "optionalFields": null,
-        "parents": null,
-        "type": null,
-        "deleted": 0,
-        "actions": [
-          "add",
-          "query",
-          "get",
-          "update",
-          "delete"
-        ]
-      },
-      {
-        "id": "member",
-        "name": "会员管理",
-        "describe": null,
-        "status": 1,
-        "actionData": "[{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-        "sptDaTypes": null,
-        "optionalFields": "[]",
-        "parents": null,
-        "type": "default",
-        "deleted": 0,
-        "actions": [
-          "add",
-          "query",
-          "get",
-          "update",
-          "delete"
-        ]
-      },
-      {
-        "id": "menu",
-        "name": "菜单管理",
-        "describe": null,
-        "status": 1,
-        "actionData": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"import\",\"defaultCheck\":false,\"describe\":\"导入\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"}]",
-        "sptDaTypes": null,
-        "optionalFields": "[]",
-        "parents": null,
-        "type": "default",
-        "deleted": 0,
-        "actions": [
-          "add",
-          "import",
-          "get",
-          "update"
-        ]
-      },
-      {
-        "id": "order",
-        "name": "订单管理",
-        "describe": null,
-        "status": 1,
-        "actionData": "[{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-        "sptDaTypes": null,
-        "optionalFields": "[]",
-        "parents": null,
-        "type": "default",
-        "deleted": 0,
-        "actions": [
-          "add",
-          "query",
-          "get",
-          "update",
-          "delete"
-        ]
-      },
-      {
-        "id": "permission",
-        "name": "权限管理",
-        "describe": null,
-        "status": 1,
-        "actionData": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-        "sptDaTypes": null,
-        "optionalFields": "[]",
-        "parents": null,
-        "type": "default",
-        "deleted": 0,
-        "actions": [
-          "add",
-          "get",
-          "update",
-          "delete"
-        ]
-      },
-      {
-        "id": "role",
-        "name": "角色管理",
-        "describe": null,
-        "status": 1,
-        "actionData": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-        "sptDaTypes": null,
-        "optionalFields": "[]",
-        "parents": null,
-        "type": "default",
-        "deleted": 0,
-        "actions": [
-          "add",
-          "get",
-          "update",
-          "delete"
-        ]
-      },
-      {
-        "id": "test",
-        "name": "测试权限",
-        "describe": null,
-        "status": 1,
-        "actionData": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"}]",
-        "sptDaTypes": null,
-        "optionalFields": "[]",
-        "parents": null,
-        "type": "default",
-        "deleted": 0,
-        "actions": [
-          "add",
-          "get"
-        ]
-      },
-      {
-        "id": "user",
-        "name": "用户管理",
-        "describe": null,
-        "status": 1,
-        "actionData": "[{\"action\":\"add\",\"describe\":\"新增\",\"defaultCheck\":false},{\"action\":\"get\",\"describe\":\"查询\",\"defaultCheck\":false}]",
-        "sptDaTypes": null,
-        "optionalFields": "[]",
-        "parents": null,
-        "type": "default",
-        "deleted": 0,
-        "actions": [
-          "add",
-          "get"
-        ]
-      }
-    ],
-    "pageSize": 10,
-    "pageNo": 0,
-    "totalPage": 1,
-    "totalCount": 5
-  },
-  "status": 200,
-  "timestamp": 1537082021471
-}

文件差异内容过多而无法显示
+ 0 - 150
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/permission_no_page.json


+ 0 - 608
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/role.json

@@ -1,608 +0,0 @@
-{
-  "message": "",
-  "result": {
-    "data": [
-      {
-        "id": "admin",
-        "name": "管理员",
-        "describe": "拥有所有权限",
-        "status": 1,
-        "creatorId": "system",
-        "createTime": 1497160610259,
-        "deleted": 0,
-        "permissions": [
-          {
-            "roleId": "admin",
-            "permissionId": "comment",
-            "permissionName": "评论管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "query",
-                "describe": "查询",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              },
-              {
-                "action": "delete",
-                "describe": "删除",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "member",
-            "permissionName": "会员管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "query",
-                "describe": "查询",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              },
-              {
-                "action": "delete",
-                "describe": "删除",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "menu",
-            "permissionName": "菜单管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"import\",\"defaultCheck\":false,\"describe\":\"导入\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "import",
-                "describe": "导入",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "order",
-            "permissionName": "订单管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "query",
-                "describe": "查询",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              },
-              {
-                "action": "delete",
-                "describe": "删除",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "permission",
-            "permissionName": "权限管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              },
-              {
-                "action": "delete",
-                "describe": "删除",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "role",
-            "permissionName": "角色管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              },
-              {
-                "action": "delete",
-                "describe": "删除",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "test",
-            "permissionName": "测试权限",
-            "actions": "[]",
-            "actionEntitySet": [],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "user",
-            "permissionName": "用户管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"import\",\"defaultCheck\":false,\"describe\":\"导入\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"},{\"action\":\"export\",\"defaultCheck\":false,\"describe\":\"导出\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "import",
-                "describe": "导入",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              },
-              {
-                "action": "delete",
-                "describe": "删除",
-                "defaultCheck": false
-              },
-              {
-                "action": "export",
-                "describe": "导出",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          }
-        ]
-      },
-      {
-        "id": "svip",
-        "name": "SVIP",
-        "describe": "超级会员",
-        "status": 1,
-        "creatorId": "system",
-        "createTime": 1532417744846,
-        "deleted": 0,
-        "permissions": [
-          {
-            "roleId": "admin",
-            "permissionId": "comment",
-            "permissionName": "评论管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "query",
-                "describe": "查询",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              },
-              {
-                "action": "delete",
-                "describe": "删除",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "member",
-            "permissionName": "会员管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "query",
-                "describe": "查询",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "menu",
-            "permissionName": "菜单管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"import\",\"defaultCheck\":false,\"describe\":\"导入\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "import",
-                "describe": "导入",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "order",
-            "permissionName": "订单管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "query",
-                "describe": "查询",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "permission",
-            "permissionName": "权限管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "role",
-            "permissionName": "角色管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              },
-              {
-                "action": "delete",
-                "describe": "删除",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "test",
-            "permissionName": "测试权限",
-            "actions": "[]",
-            "actionEntitySet": [],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "admin",
-            "permissionId": "user",
-            "permissionName": "用户管理",
-            "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"import\",\"defaultCheck\":false,\"describe\":\"导入\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"},{\"action\":\"export\",\"defaultCheck\":false,\"describe\":\"导出\"}]",
-            "actionEntitySet": [
-              {
-                "action": "add",
-                "describe": "新增",
-                "defaultCheck": false
-              },
-              {
-                "action": "import",
-                "describe": "导入",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              },
-              {
-                "action": "update",
-                "describe": "修改",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          }
-        ]
-      },
-      {
-        "id": "user",
-        "name": "普通会员",
-        "describe": "普通用户,只能查询",
-        "status": 1,
-        "creatorId": "system",
-        "createTime": 1497160610259,
-        "deleted": 0,
-        "permissions": [
-          {
-            "roleId": "user",
-            "permissionId": "comment",
-            "permissionName": "评论管理",
-            "actions": "[{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"}]",
-            "actionEntitySet": [
-              {
-                "action": "query",
-                "describe": "查询",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "user",
-            "permissionId": "marketing",
-            "permissionName": "营销管理",
-            "actions": "[]",
-            "actionEntitySet": [],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "user",
-            "permissionId": "member",
-            "permissionName": "会员管理",
-            "actions": "[{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"}]",
-            "actionEntitySet": [
-              {
-                "action": "query",
-                "describe": "查询",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "user",
-            "permissionId": "menu",
-            "permissionName": "菜单管理",
-            "actions": "[]",
-            "actionEntitySet": [],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "user",
-            "permissionId": "order",
-            "permissionName": "订单管理",
-            "actions": "[{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"}]",
-            "actionEntitySet": [
-              {
-                "action": "query",
-                "describe": "查询",
-                "defaultCheck": false
-              },
-              {
-                "action": "get",
-                "describe": "详情",
-                "defaultCheck": false
-              }
-            ],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "user",
-            "permissionId": "permission",
-            "permissionName": "权限管理",
-            "actions": "[]",
-            "actionEntitySet": [],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "user",
-            "permissionId": "role",
-            "permissionName": "角色管理",
-            "actions": "[]",
-            "actionEntitySet": [],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "user",
-            "permissionId": "test",
-            "permissionName": "测试权限",
-            "actions": "[]",
-            "actionEntitySet": [],
-            "actionList": null,
-            "dataAccess": null
-          },
-          {
-            "roleId": "user",
-            "permissionId": "user",
-            "permissionName": "用户管理",
-            "actions": "[]",
-            "actionEntitySet": [],
-            "actionList": null,
-            "dataAccess": null
-          }
-        ]
-      }
-    ],
-    "pageSize": 10,
-    "pageNo": 0,
-    "totalPage": 1,
-    "totalCount": 5
-  },
-  "status": 200,
-  "timestamp": 1537079497645
-}

+ 0 - 103
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/service.json

@@ -1,103 +0,0 @@
-{
-  "message": "",
-  "result": {
-    "pageSize": 10,
-    "pageNo": 0,
-    "totalCount": 57,
-    "totalPage": 6,
-    "data": [
-      {
-        "key": 1,
-        "no": "No 1",
-        "description": "这是一段描述",
-        "callNo": 127,
-        "status": 2,
-        "updatedAt": "1970-06-24 11:51:20",
-        "editable": false
-      },
-      {
-        "key": 2,
-        "no": "No 2",
-        "description": "这是一段描述",
-        "callNo": 573,
-        "status": 2,
-        "updatedAt": "1994-12-11 00:37:35",
-        "editable": false
-      },
-      {
-        "key": 3,
-        "no": "No 3",
-        "description": "这是一段描述",
-        "callNo": 869,
-        "status": 2,
-        "updatedAt": "2013-11-11 08:04:03",
-        "editable": false
-      },
-      {
-        "key": 4,
-        "no": "No 4",
-        "description": "这是一段描述",
-        "callNo": 26,
-        "status": 2,
-        "updatedAt": "1990-11-04 15:41:42",
-        "editable": false
-      },
-      {
-        "key": 5,
-        "no": "No 5",
-        "description": "这是一段描述",
-        "callNo": 20,
-        "status": 2,
-        "updatedAt": "1970-01-05 11:04:56",
-        "editable": false
-      },
-      {
-        "key": 6,
-        "no": "No 6",
-        "description": "这是一段描述",
-        "callNo": 675,
-        "status": 2,
-        "updatedAt": "1983-06-06 04:09:04",
-        "editable": false
-      },
-      {
-        "key": 7,
-        "no": "No 7",
-        "description": "这是一段描述",
-        "callNo": 512,
-        "status": 3,
-        "updatedAt": "1996-08-26 21:47:44",
-        "editable": false
-      },
-      {
-        "key": 8,
-        "no": "No 8",
-        "description": "这是一段描述",
-        "callNo": 962,
-        "status": 2,
-        "updatedAt": "2004-08-15 23:15:22",
-        "editable": false
-      },
-      {
-        "key": 9,
-        "no": "No 9",
-        "description": "这是一段描述",
-        "callNo": 318,
-        "status": 3,
-        "updatedAt": "1988-08-10 14:36:35",
-        "editable": false
-      },
-      {
-        "key": 10,
-        "no": "No 10",
-        "description": "这是一段描述",
-        "callNo": 789,
-        "status": 0,
-        "updatedAt": "1988-12-27 23:39:41",
-        "editable": false
-      }
-    ]
-  },
-  "status": 200,
-  "timestamp": 1534955098193
-}

+ 0 - 12
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/sysdatalog.json

@@ -1,12 +0,0 @@
-{
-	"mobilePhone":"1872222222",
-	"officePhone":"1222222",
-	"email":"",
-	"createDate":"Jun 23, 2016 12:00:00 PM",
-	"sex":"1",
-	"depId":"402880e447e99cf10147e9a03b320003",
-	"userName":"9001",
-	"status":"1",
-	"content":"111",
-	"id":"4028ef81550c1a7901550c1cd6e70001"
-}

+ 0 - 55
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/task_process.json

@@ -1,55 +0,0 @@
-{
-	"success": true,
-	"message": "操作成功!",
-	"code": 0,
-	"result": {
-		"records": [
-			{
-				"taskId": "48701",
-				"name": "start",
-				"taskBeginTime": "2019-03-07 09:33:04",
-				"taskEndTime": "2019-03-08 04:03:01",
-				"principal": "测试体验账号",
-				"result": "已完成"
-			},
-			{
-				"taskId": "48702",
-				"name": "部门领导审批",
-				"taskBeginTime": "2019-03-07 09:33:04",
-				"taskEndTime": "2019-03-08 04:03:01",
-				"principal": "测试体验账号",
-				"result": "已完成"
-			},
-			{
-				"taskId": "48703",
-				"name": "调整申请",
-				"taskBeginTime": "2019-03-07 09:33:04",
-				"taskEndTime": "2019-03-08 04:03:01",
-				"principal": "测试体验账号",
-				"result": "已完成"
-			},
-			{
-				"taskId": "48704",
-				"name": "人事审批",
-				"taskBeginTime": "2019-03-07 09:33:04",
-				"taskEndTime": "2019-03-08 04:03:01",
-				"principal": "测试体验账号",
-				"result": "已完成"
-			},
-			{
-				"taskId": "48705",
-				"name": "end",
-				"taskBeginTime": "2019-03-07 09:33:04",
-				"taskEndTime": "2019-03-08 04:03:01",
-				"principal": "测试体验账号",
-				"result": "已完成"
-			}
-		],
-		"total": 0,
-		"size": 10,
-		"current": 1,
-		"searchCount": true,
-		"pages": 0
-	},
-	"timestamp": 1551922394641
-}

文件差异内容过多而无法显示
+ 0 - 2388
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user.json


+ 0 - 407
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/user_info.json

@@ -1,407 +0,0 @@
-{
-    "message": "", 
-    "result": {
-        "id": "4291d7da9005377ec9aec4a71ea837f", 
-        "name": "天野远子", 
-        "username": "admin", 
-        "password": "", 
-        "avatar": "/avatar2.jpg", 
-        "status": 1, 
-        "telephone": "", 
-        "lastLoginIp": "27.154.74.117", 
-        "lastLoginTime": 1534837621348, 
-        "creatorId": "admin", 
-        "createTime": 1497160610259, 
-        "merchantCode": "TLif2btpzg079h15bk", 
-        "deleted": 0, 
-        "roleId": "admin", 
-        "role": {
-            "id": "admin", 
-            "name": "管理员", 
-            "describe": "拥有所有权限", 
-            "status": 1, 
-            "creatorId": "system", 
-            "createTime": 1497160610259, 
-            "deleted": 0, 
-            "permissions": [
-                {
-                    "roleId": "admin", 
-                    "permissionId": "dashboard", 
-                    "permissionName": "仪表盘", 
-                    "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]", 
-                    "actionEntitySet": [
-                        {
-                            "action": "add", 
-                            "describe": "新增", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "query", 
-                            "describe": "查询", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "get", 
-                            "describe": "详情", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "update", 
-                            "describe": "修改", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "delete", 
-                            "describe": "删除", 
-                            "defaultCheck": false
-                        }
-                    ], 
-                    "actionList": null, 
-                    "dataAccess": null
-                }, 
-                {
-                    "roleId": "admin", 
-                    "permissionId": "exception", 
-                    "permissionName": "异常页面权限", 
-                    "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]", 
-                    "actionEntitySet": [
-                        {
-                            "action": "add", 
-                            "describe": "新增", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "query", 
-                            "describe": "查询", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "get", 
-                            "describe": "详情", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "update", 
-                            "describe": "修改", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "delete", 
-                            "describe": "删除", 
-                            "defaultCheck": false
-                        }
-                    ], 
-                    "actionList": null, 
-                    "dataAccess": null
-                }, 
-                {
-                    "roleId": "admin", 
-                    "permissionId": "result", 
-                    "permissionName": "结果权限", 
-                    "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]", 
-                    "actionEntitySet": [
-                        {
-                            "action": "add", 
-                            "describe": "新增", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "query", 
-                            "describe": "查询", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "get", 
-                            "describe": "详情", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "update", 
-                            "describe": "修改", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "delete", 
-                            "describe": "删除", 
-                            "defaultCheck": false
-                        }
-                    ], 
-                    "actionList": null, 
-                    "dataAccess": null
-                }, 
-                {
-                    "roleId": "admin", 
-                    "permissionId": "profile", 
-                    "permissionName": "详细页权限", 
-                    "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]", 
-                    "actionEntitySet": [
-                        {
-                            "action": "add", 
-                            "describe": "新增", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "query", 
-                            "describe": "查询", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "get", 
-                            "describe": "详情", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "update", 
-                            "describe": "修改", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "delete", 
-                            "describe": "删除", 
-                            "defaultCheck": false
-                        }
-                    ], 
-                    "actionList": null, 
-                    "dataAccess": null
-                }, 
-                {
-                    "roleId": "admin", 
-                    "permissionId": "table", 
-                    "permissionName": "表格权限", 
-                    "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"import\",\"defaultCheck\":false,\"describe\":\"导入\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"}]", 
-                    "actionEntitySet": [
-                        {
-                            "action": "add", 
-                            "describe": "新增", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "import", 
-                            "describe": "导入", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "get", 
-                            "describe": "详情", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "update", 
-                            "describe": "修改", 
-                            "defaultCheck": false
-                        }
-                    ], 
-                    "actionList": null, 
-                    "dataAccess": null
-                }, 
-                {
-                    "roleId": "admin", 
-                    "permissionId": "form", 
-                    "permissionName": "表单权限", 
-                    "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]", 
-                    "actionEntitySet": [
-                        {
-                            "action": "add", 
-                            "describe": "新增", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "get", 
-                            "describe": "详情", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "query", 
-                            "describe": "查询", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "update", 
-                            "describe": "修改", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "delete", 
-                            "describe": "删除", 
-                            "defaultCheck": false
-                        }
-                    ], 
-                    "actionList": null, 
-                    "dataAccess": null
-                }, 
-                {
-                    "roleId": "admin", 
-                    "permissionId": "order", 
-                    "permissionName": "订单管理", 
-                    "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]", 
-                    "actionEntitySet": [
-                        {
-                            "action": "add", 
-                            "describe": "新增", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "query", 
-                            "describe": "查询", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "get", 
-                            "describe": "详情", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "update", 
-                            "describe": "修改", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "delete", 
-                            "describe": "删除", 
-                            "defaultCheck": false
-                        }
-                    ], 
-                    "actionList": null, 
-                    "dataAccess": null
-                }, 
-                {
-                    "roleId": "admin", 
-                    "permissionId": "permission", 
-                    "permissionName": "权限管理", 
-                    "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]", 
-                    "actionEntitySet": [
-                        {
-                            "action": "add", 
-                            "describe": "新增", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "get", 
-                            "describe": "详情", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "update", 
-                            "describe": "修改", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "delete", 
-                            "describe": "删除", 
-                            "defaultCheck": false
-                        }
-                    ], 
-                    "actionList": null, 
-                    "dataAccess": null
-                }, 
-                {
-                    "roleId": "admin", 
-                    "permissionId": "role", 
-                    "permissionName": "角色管理", 
-                    "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]", 
-                    "actionEntitySet": [
-                        {
-                            "action": "add", 
-                            "describe": "新增", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "get", 
-                            "describe": "详情", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "update", 
-                            "describe": "修改", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "delete", 
-                            "describe": "删除", 
-                            "defaultCheck": false
-                        }
-                    ], 
-                    "actionList": null, 
-                    "dataAccess": null
-                }, 
-                {
-                    "roleId": "admin", 
-                    "permissionId": "table", 
-                    "permissionName": "桌子管理", 
-                    "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"query\",\"defaultCheck\":false,\"describe\":\"查询\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"}]", 
-                    "actionEntitySet": [
-                        {
-                            "action": "add", 
-                            "describe": "新增", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "get", 
-                            "describe": "详情", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "query", 
-                            "describe": "查询", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "update", 
-                            "describe": "修改", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "delete", 
-                            "describe": "删除", 
-                            "defaultCheck": false
-                        }
-                    ], 
-                    "actionList": null, 
-                    "dataAccess": null
-                }, 
-                {
-                    "roleId": "admin", 
-                    "permissionId": "user", 
-                    "permissionName": "用户管理", 
-                    "actions": "[{\"action\":\"add\",\"defaultCheck\":false,\"describe\":\"新增\"},{\"action\":\"import\",\"defaultCheck\":false,\"describe\":\"导入\"},{\"action\":\"get\",\"defaultCheck\":false,\"describe\":\"详情\"},{\"action\":\"update\",\"defaultCheck\":false,\"describe\":\"修改\"},{\"action\":\"delete\",\"defaultCheck\":false,\"describe\":\"删除\"},{\"action\":\"export\",\"defaultCheck\":false,\"describe\":\"导出\"}]", 
-                    "actionEntitySet": [
-                        {
-                            "action": "add", 
-                            "describe": "新增", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "import", 
-                            "describe": "导入", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "get", 
-                            "describe": "详情", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "update", 
-                            "describe": "修改", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "delete", 
-                            "describe": "删除", 
-                            "defaultCheck": false
-                        }, 
-                        {
-                            "action": "export", 
-                            "describe": "导出", 
-                            "defaultCheck": false
-                        }
-                    ], 
-                    "actionList": null, 
-                    "dataAccess": null
-                }
-            ]
-        }
-    }, 
-    "status": 200, 
-    "timestamp": 1534844188679
-}

+ 0 - 40
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/userinfo.json

@@ -1,40 +0,0 @@
-{
-  "data": [
-    {
-      "department": "技术部",
-      "post": "主管",
-      "data": "2020年6月25日",
-      "name": "张三",
-      "sex": "男",
-      "birth": "2020年6月25日",
-      "political": "党员",
-      "office": "法院",
-      "nation": "汉",
-      "health": "良好",
-      "register": "农民",
-      "education": "本科",
-      "major": "计算机",
-      "gdata": "2020年6月25日",
-      "mailbox": "123@qq.com",
-      "telphone": "18034569685",
-      "homephone": "",
-      "pworktime": "669633555222",
-      "entrytime": "2020年6月25日",
-      "school": "北京邮电大学",
-      "iDCard": "523698541123333",
-      "party": "2020年6月25日 上海",
-      "marital": "已婚",
-      "children": "有",
-      "hukoustreet": "北京市朝阳区亚运村街道",
-      "hukounum": "050000",
-      "hukoudi": "北京市朝阳区亚运村亚运村小区19号楼7单元901",
-      "Currentdi": "北京市朝阳区亚运村亚运村小区19号楼7单元901",
-      "Currentnum": "050000",
-      "socialsecurity": "是",
-      "providentfund": "是",
-      "hobby": "看书",
-      "sbtype": "城镇社保",
-      "archivesdi": "北京市朝阳区社保局"
-    }
-  ]
-}

+ 0 - 85
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_activity.json

@@ -1,85 +0,0 @@
-{
-  "message": "",
-  "result": [
-    {
-      "id": 1,
-      "user": {
-        "nickname": "Barbara Lee",
-        "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png"
-      },
-      "project": {
-        "name": "白鹭酱油开发组",
-        "action": "更新",
-        "event": "番组计划"
-      },
-      "time": "2018-08-23 14:47:00"
-    },
-    {
-      "id": 1,
-      "user": {
-        "nickname": "蓝莓酱",
-        "avatar": "https://gw.alipayobjects.com/zos/rmsportal/jZUIxmJycoymBprLOUbT.png"
-      },
-      "project": {
-        "name": "白鹭酱油开发组",
-        "action": "更新",
-        "event": "番组计划"
-      },
-      "time": "2018-08-23 09:35:37"
-    },
-    {
-      "id": 1,
-      "user": {
-        "nickname": "Brian Young",
-        "avatar": "http://dummyimage.com/64x64"
-      },
-      "project": {
-        "name": "白鹭酱油开发组",
-        "action": "创建",
-        "event": "番组计划"
-      },
-      "time": "2017-05-27 00:00:00"
-    },
-    {
-      "id": 1,
-      "user": {
-        "nickname": "曲丽丽",
-        "avatar": "http://dummyimage.com/64x64"
-      },
-      "project": {
-        "name": "高逼格设计天团",
-        "action": "更新",
-        "event": "六月迭代"
-      },
-      "time": "2018-08-23 14:47:00"
-    },
-    {
-      "id": 1,
-      "user": {
-        "nickname": "Dorothy Thompson",
-        "avatar": "http://dummyimage.com/64x64"
-      },
-      "project": {
-        "name": "高逼格设计天团",
-        "action": "created",
-        "event": "六月迭代"
-      },
-      "time": "2018-08-23 14:47:00"
-    },
-    {
-      "id": 1,
-      "user": {
-        "nickname": "曲丽丽",
-        "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png"
-      },
-      "project": {
-        "name": "高逼格设计天团",
-        "action": "created",
-        "event": "六月迭代"
-      },
-      "time": "2018-08-23 14:47:00"
-    }
-  ],
-  "status": 200,
-  "timestamp": 0
-}

+ 0 - 61
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_projects.json

@@ -1,61 +0,0 @@
-{
-  "message": "",
-  "result": {
-    "data": [
-      {
-        "id": 1,
-        "cover": "https://gw.alipayobjects.com/zos/rmsportal/WdGqmHpayyMjiEhcKoVE.png",
-        "title": "Alipay",
-        "description": "那是一种内在的东西, 他们到达不了,也无法触及的",
-        "status": 1,
-        "updatedAt": "2018-07-26 00:00:00"
-      },
-      {
-        "id": 2,
-        "cover": "https://gw.alipayobjects.com/zos/rmsportal/zOsKZmFRdUtvpqCImOVY.png",
-        "title": "Angular",
-        "description": "希望是一个好东西,也许是最好的,好东西是不会消亡的",
-        "status": 1,
-        "updatedAt": "2018-07-26 00:00:00"
-      },
-      {
-        "id": 3,
-        "cover": "https://gw.alipayobjects.com/zos/rmsportal/dURIMkkrRFpPgTuzkwnB.png",
-        "title": "Ant Design",
-        "description": "城镇中有那么多的酒馆,她却偏偏走进了我的酒馆",
-        "status": 1,
-        "updatedAt": "2018-07-26 00:00:00"
-      },
-      {
-        "id": 4,
-        "cover": "https://gw.alipayobjects.com/zos/rmsportal/sfjbOqnsXXJgNCjCzDBL.png",
-        "title": "Ant Design Pro",
-        "description": "那时候我只会想自己想要什么,从不想自己拥有什么",
-        "status": 1,
-        "updatedAt": "2018-07-26 00:00:00"
-      },
-      {
-        "id": 5,
-        "cover": "https://gw.alipayobjects.com/zos/rmsportal/siCrBXXhmvTQGWPNLBow.png",
-        "title": "Bootstrap",
-        "description": "凛冬将至",
-        "status": 1,
-        "updatedAt": "2018-07-26 00:00:00"
-      },
-      {
-        "id": 6,
-        "cover": "https://gw.alipayobjects.com/zos/rmsportal/ComBAopevLwENQdKWiIn.png",
-        "title": "Vue",
-        "description": "生命就像一盒巧克力,结果往往出人意料",
-        "status": 1,
-        "updatedAt": "2018-07-26 00:00:00"
-      }
-    ],
-    "pageSize": 10,
-    "pageNo": 1,
-    "totalPage": 6,
-    "totalCount": 57
-  },
-  "status": 200,
-  "timestamp": 1534955098193
-}

+ 0 - 43
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_radar.json

@@ -1,43 +0,0 @@
-{
-  "message": "",
-  "result": [
-    {
-      "item": "引用",
-      "个人": 70,
-      "团队": 30,
-      "部门": 40
-    },
-    {
-      "item": "口碑",
-      "个人": 60,
-      "团队": 70,
-      "部门": 40
-    },
-    {
-      "item": "产量",
-      "个人": 50,
-      "团队": 60,
-      "部门": 40
-    },
-    {
-      "item": "贡献",
-      "个人": 40,
-      "团队": 50,
-      "部门": 40
-    },
-    {
-      "item": "热度",
-      "个人": 60,
-      "团队": 70,
-      "部门": 40
-    },
-    {
-      "item": "引用",
-      "个人": 70,
-      "团队": 50,
-      "部门": 40
-    }
-  ],
-  "status": 200,
-  "timestamp": 1534955098193
-}

+ 0 - 32
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/json/workplace_teams.json

@@ -1,32 +0,0 @@
-{
-  "message": "",
-  "result": [
-    {
-      "id": 1,
-      "name": "科学搬砖组",
-      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png"
-    },
-    {
-      "id": 2,
-      "name": "程序员日常",
-      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/cnrhVkzwxjPwAaCfPbdc.png"
-    },
-    {
-      "id": 1,
-      "name": "设计天团",
-      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/gaOngJwsRYRaVAuXXcmB.png"
-    },
-    {
-      "id": 1,
-      "name": "中二少女团",
-      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/ubnKSIfAJTxIgXOKlciN.png"
-    },
-    {
-      "id": 1,
-      "name": "骗你学计算机",
-      "avatar": "https://gw.alipayobjects.com/zos/rmsportal/WhxKECPNujWoWEFNdnJE.png"
-    }
-  ],
-  "status": 200,
-  "timestamp": 0
-}

+ 0 - 388
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java

@@ -1,388 +0,0 @@
-package org.jeecg.modules.demo.mock.vxe.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.constant.VXESocketConst;
-import org.jeecg.common.system.query.MatchTypeEnum;
-import org.jeecg.common.system.query.QueryCondition;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.demo.mock.vxe.entity.MockEntity;
-import org.jeecg.modules.demo.mock.vxe.websocket.VXESocket;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLDecoder;
-import java.util.*;
-
-@RestController
-@RequestMapping("/mock/vxe")
-@Slf4j
-public class VxeMockController {
-
-    /**
-     * 模拟更改状态
-     *
-     * @param id
-     * @param status
-     * @return
-     */
-    @GetMapping("/change1")
-    public Result mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) {
-        /* id 为 行的id(rowId),只要获取到rowId,那么只需要调用 VXESocket.sendMessageToAll() 即可 */
-
-        // 封装行数据
-        JSONObject rowData = new JSONObject();
-        // 这个字段就是要更改的行数据ID
-        rowData.put("id", id);
-        // 这个字段就是要更改的列的key和具体的值
-        rowData.put("status", status);
-        // 模拟更改数据
-        this.mockChange(rowData);
-
-        return Result.ok();
-    }
-
-    /**
-     * 模拟更改拖轮状态
-     *
-     * @param id
-     * @param tug_status
-     * @return
-     */
-    @GetMapping("/change2")
-    public Result mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) {
-        /* id 为 行的id(rowId),只要获取到rowId,那么只需要调用 VXESocket.sendMessageToAll() 即可 */
-
-        // 封装行数据
-        JSONObject rowData = new JSONObject();
-        // 这个字段就是要更改的行数据ID
-        rowData.put("id", id);
-        // 这个字段就是要更改的列的key和具体的值
-        JSONObject tugStatus = JSON.parseObject(tug_status);
-        rowData.put("tug_status", tugStatus);
-        // 模拟更改数据
-        this.mockChange(rowData);
-
-        return Result.ok();
-    }
-
-    /**
-     * 模拟更改进度条状态
-     *
-     * @param id
-     * @param progress
-     * @return
-     */
-    @GetMapping("/change3")
-    public Result mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) {
-        /* id 为 行的id(rowId),只要获取到rowId,那么只需要调用 VXESocket.sendMessageToAll() 即可 */
-
-        // 封装行数据
-        JSONObject rowData = new JSONObject();
-        // 这个字段就是要更改的行数据ID
-        rowData.put("id", id);
-        // 这个字段就是要更改的列的key和具体的值
-        rowData.put("progress", progress);
-        // 模拟更改数据
-        this.mockChange(rowData);
-
-        return Result.ok();
-    }
-
-    private void mockChange(JSONObject rowData) {
-        // 封装socket数据
-        JSONObject socketData = new JSONObject();
-        // 这里的 socketKey 必须要和调度计划页面上写的 socketKey 属性保持一致
-        socketData.put("socketKey", "page-dispatch");
-        // 这里的 args 必须得是一个数组,下标0是行数据,下标1是caseId,一般不用传
-        socketData.put("args", new Object[]{rowData, ""});
-        // 封装消息字符串,这里的
-        // type 必须是 VXESocketConst.TYPE_UVT
-        String message = VXESocket.packageMessage(VXESocketConst.TYPE_UVT, socketData);
-        // 调用 sendMessageToAll 发送给所有在线的用户
-        VXESocket.sendMessageToAll(message);
-    }
-
-    /**
-     * 模拟更改【大船待审】状态
-     *
-     * @param status
-     * @return
-     */
-    @GetMapping("/change4")
-    public Result mockChange4(@RequestParam("status") String status) {
-        // 封装socket数据
-        JSONObject socketData = new JSONObject();
-        // 这里的 key 是前端注册时使用的key,必须保持一致
-        socketData.put("key", "dispatch-dcds-status");
-        // 这里的 args 必须得是一个数组,每一位都是注册方法的参数,按顺序传递
-        socketData.put("args", new Object[]{status});
-
-        // 封装消息字符串,这里的 type 必须是 VXESocketConst.TYPE_UVT
-        String message = VXESocket.packageMessage(VXESocketConst.TYPE_CSD, socketData);
-        // 调用 sendMessageToAll 发送给所有在线的用户
-        VXESocket.sendMessageToAll(message);
-
-        return Result.ok();
-    }
-
-    /**
-     * 【模拟】即时保存单行数据
-     *
-     * @param rowData 行数据,实际使用时可以替换成一个实体类
-     */
-    @PutMapping("/immediateSaveRow")
-    public Result mockImmediateSaveRow(@RequestBody JSONObject rowData) throws Exception {
-        // 延时1.5秒,模拟网慢堵塞真实感
-        Thread.sleep(500);
-        return Result.ok();
-    }
-
-    /**
-     * 【模拟】即时保存整个表格的数据
-     *
-     * @param tableData 表格数据(实际使用时可以替换成一个List实体类)
-     */
-    @PostMapping("/immediateSaveAll")
-    public Result mockImmediateSaveAll(@RequestBody JSONArray tableData) throws Exception {
-        // 【注】:
-        // 1、tableData里包含该页所有的数据
-        // 2、如果你实现了“即时保存”,那么除了新增的数据,其他的都是已经保存过的了,
-        //    不需要再进行一次update操作了,所以可以在前端传数据的时候就遍历判断一下,
-        //    只传新增的数据给后台insert即可,否者将会造成性能上的浪费。
-        // 3、新增的行是没有id的,通过这一点,就可以判断是否是新增的数据
-
-        log.info("即时保存.tableData:" + tableData.toJSONString());
-        // 延时1.5秒,模拟网慢堵塞真实感
-        Thread.sleep(1000);
-        return Result.ok();
-    }
-
-    /**
-     * 获取模拟数据
-     *
-     * @param pageNo   页码
-     * @param pageSize 页大小
-     * @param parentId 父ID,不传则查询顶级
-     * @return
-     */
-    @GetMapping("/getData")
-    public Result getMockData(
-            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-            // 父级id,根据父级id查询子级,如果为空则查询顶级
-            @RequestParam(name = "parentId", required = false) String parentId
-    ) {
-        // 模拟JSON数据路径
-        String path = "classpath:org/jeecg/modules/demo/mock/vxe/json/dlglong.json";
-        // 读取JSON数据
-        JSONArray dataList = readJsonData(path);
-        if (dataList == null) {
-            return Result.error("读取数据失败!");
-        }
-        IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
-        return Result.ok(page);
-    }
-
-    /**
-     * 获取模拟“调度计划”页面的数据
-     *
-     * @param pageNo   页码
-     * @param pageSize 页大小
-     * @param parentId 父ID,不传则查询顶级
-     * @return
-     */
-    @GetMapping("/getDdjhData")
-    public Result getMockDdjhData(
-            // SpringMVC 会自动将参数注入到实体里
-            MockEntity mockEntity,
-            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-            // 父级id,根据父级id查询子级,如果为空则查询顶级
-            @RequestParam(name = "parentId", required = false) String parentId,
-            @RequestParam(name = "status", required = false) String status,
-            // 高级查询条件
-            @RequestParam(name = "superQueryParams", required = false) String superQueryParams,
-            // 高级查询模式
-            @RequestParam(name = "superQueryMatchType", required = false) String superQueryMatchType,
-            HttpServletRequest request
-    ) {
-        // 获取查询条件(前台传递的查询参数)
-        Map<String, String[]> parameterMap = request.getParameterMap();
-        // 遍历输出到控制台
-        // 输出高级查询
-        try {
-            // 高级查询模式
-            MatchTypeEnum matchType = MatchTypeEnum.getByValue(superQueryMatchType);
-            superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8");
-            List<QueryCondition> conditions = JSON.parseArray(superQueryParams, QueryCondition.class);
-        } catch (Exception e) {
-            log.error("-- 高级查询操作失败:" + superQueryParams, e);
-            e.printStackTrace();
-        }
-
-        /* 注:实际使用中不用写上面那种繁琐的代码,这里只是为了直观的输出到控制台里而写的示例,
-              使用下面这种写法更简洁方便 */
-
-        // 封装成 MyBatisPlus 能识别的 QueryWrapper,可以直接使用这个对象进行SQL筛选条件拼接
-        // 这个方法也会自动封装高级查询条件,但是高级查询参数名必须是superQueryParams和superQueryMatchType
-        QueryWrapper<MockEntity> queryWrapper = QueryGenerator.initQueryWrapper(mockEntity, parameterMap);
-
-        // 模拟JSON数据路径
-        String path = "classpath:org/jeecg/modules/demo/mock/vxe/json/ddjh.json";
-        if ("8".equals(status)) {
-            path = "classpath:org/jeecg/modules/demo/mock/vxe/json/ddjh_s8.json";
-        }
-        // 读取JSON数据
-        JSONArray dataList = readJsonData(path);
-        if (dataList == null) {
-            return Result.error("读取数据失败!");
-        }
-
-        IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
-        // 逐行查询子表数据,用于计算拖轮状态
-        List<JSONObject> records = page.getRecords();
-        for (JSONObject record : records) {
-            Map<String, Integer> tugStatusMap = new HashMap<>();
-            String id = record.getString("id");
-            // 查询出主表的拖轮
-            String tugMain = record.getString("tug");
-            // 判断是否有值
-            if (StringUtils.isNotBlank(tugMain)) {
-                // 拖轮根据分号分割
-                String[] tugs = tugMain.split(";");
-                // 查询子表数据
-                List<JSONObject> subRecords = this.queryDataPage(dataList, id, null, null).getRecords();
-                // 遍历子表和拖轮数据,找出进行计算反推拖轮状态
-                for (JSONObject subData : subRecords) {
-                    String subTug = subData.getString("tug");
-                    if (StringUtils.isNotBlank(subTug)) {
-                        for (String tug : tugs) {
-                            if (tug.equals(subTug)) {
-                                // 计算拖轮状态逻辑
-                                int statusCode = 0;
-
-                                /* 如果有发船时间、作业开始时间、作业结束时间、回船时间,则主表中的拖轮列中的每个拖轮背景色要即时变色 */
-
-                                // 有发船时间,状态 +1
-                                String departureTime = subData.getString("departure_time");
-                                if (StringUtils.isNotBlank(departureTime)) {
-                                    statusCode += 1;
-                                }
-                                // 有作业开始时间,状态 +1
-                                String workBeginTime = subData.getString("work_begin_time");
-                                if (StringUtils.isNotBlank(workBeginTime)) {
-                                    statusCode += 1;
-                                }
-                                // 有作业结束时间,状态 +1
-                                String workEndTime = subData.getString("work_end_time");
-                                if (StringUtils.isNotBlank(workEndTime)) {
-                                    statusCode += 1;
-                                }
-                                // 有回船时间,状态 +1
-                                String returnTime = subData.getString("return_time");
-                                if (StringUtils.isNotBlank(returnTime)) {
-                                    statusCode += 1;
-                                }
-                                // 保存拖轮状态,key是拖轮的值,value是状态,前端根据不同的状态码,显示不同的颜色,这个颜色也可以后台计算完之后返回给前端直接使用
-                                tugStatusMap.put(tug, statusCode);
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            // 新加一个字段用于保存拖轮状态,不要直接覆盖原来的,这个字段可以不保存到数据库里
-            record.put("tug_status", tugStatusMap);
-        }
-        page.setRecords(records);
-        return Result.ok(page);
-    }
-
-    /**
-     * 模拟查询数据,可以根据父ID查询,可以分页
-     *
-     * @param dataList 数据列表
-     * @param parentId 父ID
-     * @param pageNo   页码
-     * @param pageSize 页大小
-     * @return
-     */
-    private IPage<JSONObject> queryDataPage(JSONArray dataList, String parentId, Integer pageNo, Integer pageSize) {
-        // 根据父级id查询子级
-        JSONArray dataDB = dataList;
-        if (StringUtils.isNotBlank(parentId)) {
-            JSONArray results = new JSONArray();
-            List<String> parentIds = Arrays.asList(parentId.split(","));
-            this.queryByParentId(dataDB, parentIds, results);
-            dataDB = results;
-        }
-        // 模拟分页(实际中应用SQL自带的分页)
-        List<JSONObject> records = new ArrayList<>();
-        IPage<JSONObject> page;
-        long beginIndex, endIndex;
-        // 如果任意一个参数为null,则不分页
-        if (pageNo == null || pageSize == null) {
-            page = new Page<>(0, dataDB.size());
-            beginIndex = 0;
-            endIndex = dataDB.size();
-        } else {
-            page = new Page<>(pageNo, pageSize);
-            beginIndex = page.offset();
-            endIndex = page.offset() + page.getSize();
-        }
-        for (long i = beginIndex; (i < endIndex && i < dataDB.size()); i++) {
-            JSONObject data = dataDB.getJSONObject((int) i);
-            data = JSON.parseObject(data.toJSONString());
-            // 不返回 children
-            data.remove("children");
-            records.add(data);
-        }
-        page.setRecords(records);
-        page.setTotal(dataDB.size());
-        return page;
-    }
-
-    private void queryByParentId(JSONArray dataList, List<String> parentIds, JSONArray results) {
-        for (int i = 0; i < dataList.size(); i++) {
-            JSONObject data = dataList.getJSONObject(i);
-            JSONArray children = data.getJSONArray("children");
-            // 找到了该父级
-            if (parentIds.contains(data.getString("id"))) {
-                if (children != null) {
-                    // addAll 的目的是将多个子表的数据合并在一起
-                    results.addAll(children);
-                }
-            } else {
-                if (children != null) {
-                    queryByParentId(children, parentIds, results);
-                }
-            }
-        }
-        results.addAll(new JSONArray());
-    }
-
-    private JSONArray readJsonData(String path) {
-        try {
-            InputStream stream = getClass().getClassLoader().getResourceAsStream(path.replace("classpath:", ""));
-            if (stream != null) {
-                String json = IOUtils.toString(stream, "UTF-8");
-                return JSON.parseArray(json);
-            }
-        } catch (IOException e) {
-            log.error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-}

+ 0 - 20
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/entity/MockEntity.java

@@ -1,20 +0,0 @@
-package org.jeecg.modules.demo.mock.vxe.entity;
-
-import lombok.Data;
-
-/**
- * 模拟实体
- */
-@Data
-public class MockEntity {
-
-    // id
-    private String id;
-    // 父级ID
-    private String parentId;
-    // 状态
-    private String status;
-
-    /* -- 省略其他字段 -- */
-
-}

文件差异内容过多而无法显示
+ 0 - 155907
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh.json


文件差异内容过多而无法显示
+ 0 - 1550
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/ddjh_s8.json


文件差异内容过多而无法显示
+ 0 - 1
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/json/dlglong.json


+ 0 - 216
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VXESocket.java

@@ -1,216 +0,0 @@
-package org.jeecg.modules.demo.mock.vxe.websocket;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.constant.VXESocketConst;
-import org.springframework.stereotype.Component;
-
-import javax.websocket.OnClose;
-import javax.websocket.OnMessage;
-import javax.websocket.OnOpen;
-import javax.websocket.Session;
-import javax.websocket.server.PathParam;
-import javax.websocket.server.ServerEndpoint;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * vxe WebSocket,用于实现实时无痕刷新的功能
- */
-@Slf4j
-@Component
-@ServerEndpoint("/vxeSocket/{userId}/{pageId}")
-public class VXESocket {
-
-    /**
-     * 当前 session
-     */
-    private Session session;
-    /**
-     * 当前用户id
-     */
-    private String userId;
-    /**
-     * 页面id,用于标识同一用户,不同页面的数据
-     */
-    private String pageId;
-    /**
-     * 当前socket唯一id
-     */
-    private String socketId;
-
-    /**
-     * 用户连接池,包含单个用户的所有socket连接;
-     * 因为一个用户可能打开多个页面,多个页面就会有多个连接;
-     * key是userId,value是Map对象;子Map的key是pageId,value是VXESocket对象
-     */
-    private static Map<String, Map<String, VXESocket>> userPool = new HashMap<>();
-    /**
-     * 连接池,包含所有WebSocket连接;
-     * key是socketId,value是VXESocket对象
-     */
-    private static Map<String, VXESocket> socketPool = new HashMap<>();
-
-    /**
-     * 获取某个用户所有的页面
-     */
-    public static Map<String, VXESocket> getUserPool(String userId) {
-        return userPool.computeIfAbsent(userId, k -> new HashMap<>());
-    }
-
-    /**
-     * 向当前用户发送消息
-     *
-     * @param message 消息内容
-     */
-    public void sendMessage(String message) {
-        try {
-            this.session.getAsyncRemote().sendText(message);
-        } catch (Exception e) {
-            log.error("【vxeSocket】消息发送失败:" + e.getMessage());
-        }
-    }
-
-    /**
-     * 封装消息json
-     *
-     * @param data 消息内容
-     */
-    public static String packageMessage(String type, Object data) {
-        JSONObject message = new JSONObject();
-        message.put(VXESocketConst.TYPE, type);
-        message.put(VXESocketConst.DATA, data);
-        return message.toJSONString();
-    }
-
-    /**
-     * 向指定用户的所有页面发送消息
-     *
-     * @param userId  接收消息的用户ID
-     * @param message 消息内容
-     */
-    public static void sendMessageTo(String userId, String message) {
-        Collection<VXESocket> values = getUserPool(userId).values();
-        if (values.size() > 0) {
-            for (VXESocket socketItem : values) {
-                socketItem.sendMessage(message);
-            }
-        } else {
-            log.warn("【vxeSocket】消息发送失败:userId\"" + userId + "\"不存在或未在线!");
-        }
-    }
-
-    /**
-     * 向指定用户的指定页面发送消息
-     *
-     * @param userId  接收消息的用户ID
-     * @param message 消息内容
-     */
-    public static void sendMessageTo(String userId, String pageId, String message) {
-        VXESocket socketItem = getUserPool(userId).get(pageId);
-        if (socketItem != null) {
-            socketItem.sendMessage(message);
-        } else {
-            log.warn("【vxeSocket】消息发送失败:userId\"" + userId + "\"的pageId\"" + pageId + "\"不存在或未在线!");
-        }
-    }
-
-    /**
-     * 向多个用户的所有页面发送消息
-     *
-     * @param userIds 接收消息的用户ID数组
-     * @param message 消息内容
-     */
-    public static void sendMessageTo(String[] userIds, String message) {
-        for (String userId : userIds) {
-            VXESocket.sendMessageTo(userId, message);
-        }
-    }
-
-    /**
-     * 向所有用户的所有页面发送消息
-     *
-     * @param message 消息内容
-     */
-    public static void sendMessageToAll(String message) {
-        for (VXESocket socketItem : socketPool.values()) {
-            socketItem.sendMessage(message);
-        }
-    }
-
-    /**
-     * websocket 开启连接
-     */
-    @OnOpen
-    public void onOpen(Session session, @PathParam("userId") String userId, @PathParam("pageId") String pageId) {
-        try {
-            this.userId = userId;
-            this.pageId = pageId;
-            this.socketId = userId + pageId;
-            this.session = session;
-
-            socketPool.put(this.socketId, this);
-            getUserPool(userId).put(this.pageId, this);
-
-            log.info("【vxeSocket】有新的连接,总数为:" + socketPool.size());
-        } catch (Exception ignored) {
-        }
-    }
-
-    /**
-     * websocket 断开连接
-     */
-    @OnClose
-    public void onClose() {
-        try {
-            socketPool.remove(this.socketId);
-            getUserPool(this.userId).remove(this.pageId);
-
-            log.info("【vxeSocket】连接断开,总数为:" + socketPool.size());
-        } catch (Exception ignored) {
-        }
-    }
-
-    /**
-     * websocket 收到消息
-     */
-    @OnMessage
-    public void onMessage(String message) {
-        // log.info("【vxeSocket】onMessage:" + message);
-        JSONObject json;
-        try {
-            json = JSON.parseObject(message);
-        } catch (Exception e) {
-            log.warn("【vxeSocket】收到不合法的消息:" + message);
-            return;
-        }
-        String type = json.getString(VXESocketConst.TYPE);
-        switch (type) {
-            // 心跳检测
-            case VXESocketConst.TYPE_HB:
-                this.sendMessage(VXESocket.packageMessage(type, true));
-                break;
-            // 更新form数据
-            case VXESocketConst.TYPE_UVT:
-                this.handleUpdateForm(json);
-                break;
-            default:
-                log.warn("【vxeSocket】收到不识别的消息类型:" + type);
-                break;
-        }
-
-
-    }
-
-    /**
-     * 处理 UpdateForm 事件
-     */
-    private void handleUpdateForm(JSONObject json) {
-        // 将事件转发给所有人
-        JSONObject data = json.getJSONObject(VXESocketConst.DATA);
-        VXESocket.sendMessageToAll(VXESocket.packageMessage(VXESocketConst.TYPE_UVT, data));
-    }
-
-}

+ 0 - 63
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/BigScreenTemplatController.java

@@ -1,63 +0,0 @@
-package org.jeecg.modules.demo.test.controller;
-
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.modules.demo.test.entity.JeecgDemo;
-import org.jeecg.modules.demo.test.service.IJeecgDemoService;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.ModelAndView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 大屏预览入口
- * @Author: scott
- * @Date:2019-12-12
- * @Version:V1.0
- */
-@Slf4j
-@Controller
-@RequestMapping("/test/bigScreen/templat")
-public class BigScreenTemplatController extends JeecgController<JeecgDemo, IJeecgDemoService> {
-
-    /**
-     * @param modelAndView
-     * @return
-     */
-    @RequestMapping("/html")
-    public ModelAndView ftl(ModelAndView modelAndView) {
-        modelAndView.setViewName("demo3");
-        List<String> userList = new ArrayList<String>();
-        userList.add("admin");
-        userList.add("user1");
-        userList.add("user2");
-        log.info("--------------test--------------");
-        modelAndView.addObject("userList", userList);
-        return modelAndView;
-    }
-
-    /**
-     * 生产销售监控模版
-     * @param modelAndView
-     * @return
-     */
-    @RequestMapping("/index1")
-    public ModelAndView index1(ModelAndView modelAndView) {
-        modelAndView.setViewName("/bigscreen/template1/index");
-        return modelAndView;
-    }
-
-    /**
-     * 智慧物流监控模版
-     * @param modelAndView
-     * @return
-     */
-    @RequestMapping("/index2")
-    public ModelAndView index2(ModelAndView modelAndView) {
-        modelAndView.setViewName("/bigscreen/template2/index");
-        return modelAndView;
-    }
-
-}

+ 0 - 285
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java

@@ -1,285 +0,0 @@
-package org.jeecg.modules.demo.test.controller;
-
-import com.alibaba.fastjson.JSONObject;
-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 io.swagger.annotations.ApiParam;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.aspect.annotation.PermissionData;
-import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.DateUtils;
-import org.jeecg.common.util.RedisUtil;
-import org.jeecg.modules.demo.test.entity.JeecgDemo;
-import org.jeecg.modules.demo.test.service.IJeecgDemoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @Description: 单表示例
- * @Author: jeecg-boot
- * @Date:2018-12-29
- * @Version:V2.0
- */
-@Slf4j
-@Api(tags = "单表DEMO")
-@RestController
-@RequestMapping("/test/jeecgDemo")
-public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoService> {
-    @Autowired
-    private IJeecgDemoService jeecgDemoService;
-
-    @Autowired
-    private RedisUtil redisUtil;
-
-    /**
-     * 分页列表查询
-     *
-     * @param jeecgDemo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @ApiOperation(value = "获取Demo数据列表", notes = "获取所有Demo数据列表")
-    @GetMapping(value = "/list")
-    @PermissionData(pageComponent = "jeecg/JeecgDemoList")
-    public Result<?> list(JeecgDemo jeecgDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                          HttpServletRequest req) {
-        QueryWrapper<JeecgDemo> queryWrapper = QueryGenerator.initQueryWrapper(jeecgDemo, req.getParameterMap());
-        Page<JeecgDemo> page = new Page<JeecgDemo>(pageNo, pageSize);
-
-        IPage<JeecgDemo> pageList = jeecgDemoService.page(page, queryWrapper);
-        log.info("查询当前页:" + pageList.getCurrent());
-        log.info("查询当前页数量:" + pageList.getSize());
-        log.info("查询结果数量:" + pageList.getRecords().size());
-        log.info("数据总数:" + pageList.getTotal());
-        return Result.OK(pageList);
-    }
-
-    /**
-     * 添加
-     *
-     * @param jeecgDemo
-     * @return
-     */
-    @PostMapping(value = "/add")
-    @AutoLog(value = "添加测试DEMO")
-    @ApiOperation(value = "添加DEMO", notes = "添加DEMO")
-    public Result<?> add(@RequestBody JeecgDemo jeecgDemo) {
-        jeecgDemoService.save(jeecgDemo);
-        return Result.OK("添加成功!");
-    }
-
-    /**
-     * 编辑
-     *
-     * @param jeecgDemo
-     * @return
-     */
-    @PutMapping(value = "/edit")
-    @ApiOperation(value = "编辑DEMO", notes = "编辑DEMO")
-    @AutoLog(value = "编辑DEMO", operateType = CommonConstant.OPERATE_TYPE_3)
-    public Result<?> edit(@RequestBody JeecgDemo jeecgDemo) {
-        jeecgDemoService.updateById(jeecgDemo);
-        return Result.OK("更新成功!");
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @AutoLog(value = "删除测试DEMO")
-    @DeleteMapping(value = "/delete")
-    @ApiOperation(value = "通过ID删除DEMO", notes = "通过ID删除DEMO")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        jeecgDemoService.removeById(id);
-        return Result.OK("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @DeleteMapping(value = "/deleteBatch")
-    @ApiOperation(value = "批量删除DEMO", notes = "批量删除DEMO")
-    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.jeecgDemoService.removeByIds(Arrays.asList(ids.split(",")));
-        return Result.OK("批量删除成功!");
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping(value = "/queryById")
-    @ApiOperation(value = "通过ID查询DEMO", notes = "通过ID查询DEMO")
-    public Result<?> queryById(@ApiParam(name = "id", value = "示例id", required = true) @RequestParam(name = "id", required = true) String id) {
-        JeecgDemo jeecgDemo = jeecgDemoService.getById(id);
-        return Result.OK(jeecgDemo);
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     */
-    @RequestMapping(value = "/exportXls")
-    @PermissionData(pageComponent = "jeecg/JeecgDemoList")
-    public ModelAndView exportXls(HttpServletRequest request, JeecgDemo jeecgDemo) {
-        //获取导出表格字段
-        String exportFields = jeecgDemoService.getExportFields();
-        //分sheet导出表格字段
-        return super.exportXlsSheet(request, jeecgDemo, JeecgDemo.class, "单表模型",exportFields,500);
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, JeecgDemo.class);
-    }
-
-    // =====Redis 示例===============================================================================================
-
-    /**
-     * redis操作 -- set
-     */
-    @GetMapping(value = "/redisSet")
-    public void redisSet() {
-        redisUtil.set("name", "张三" + DateUtils.now());
-    }
-
-    /**
-     * redis操作 -- get
-     */
-    @GetMapping(value = "/redisGet")
-    public String redisGet() {
-        return (String) redisUtil.get("name");
-    }
-
-    /**
-     * redis操作 -- setObj
-     */
-    @GetMapping(value = "/redisSetObj")
-    public void redisSetObj() {
-        JeecgDemo p = new JeecgDemo();
-        p.setAge(10);
-        p.setBirthday(new Date());
-        p.setContent("hello");
-        p.setName("张三");
-        p.setSex("男");
-        redisUtil.set("user-zdh", p);
-    }
-
-    /**
-     * redis操作 -- setObj
-     */
-    @GetMapping(value = "/redisGetObj")
-    public Object redisGetObj() {
-        return redisUtil.get("user-zdh");
-    }
-
-    /**
-     * redis操作 -- get
-     */
-    @GetMapping(value = "/redis/{id}")
-    public JeecgDemo redisGetJeecgDemo(@PathVariable("id") String id) {
-        JeecgDemo t = jeecgDemoService.getByIdCacheable(id);
-        log.info(t.toString());
-        return t;
-    }
-
-    // ===Freemaker示例================================================================================
-
-    /**
-     * freemaker方式 【页面路径: src/main/resources/templates】
-     *
-     * @param modelAndView
-     * @return
-     */
-    @RequestMapping("/html")
-    public ModelAndView ftl(ModelAndView modelAndView) {
-        modelAndView.setViewName("demo3");
-        List<String> userList = new ArrayList<String>();
-        userList.add("admin");
-        userList.add("user1");
-        userList.add("user2");
-        log.info("--------------test--------------");
-        modelAndView.addObject("userList", userList);
-        return modelAndView;
-    }
-
-
-    // ==========================================动态表单 JSON接收测试===========================================
-    @PostMapping(value = "/testOnlineAdd")
-    public Result<?> testOnlineAdd(@RequestBody JSONObject json) {
-        log.info(json.toJSONString());
-        return Result.OK("添加成功!");
-    }
-
-    /*----------------------------------------外部获取权限示例------------------------------------*/
-
-    /**
-     * 【数据权限示例 - 编程】mybatisPlus java类方式加载权限
-     *
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @GetMapping(value = "/mpList")
-    @PermissionData(pageComponent = "jeecg/JeecgDemoList")
-    public Result<?> loadMpPermissonList(@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                         HttpServletRequest req) {
-        QueryWrapper<JeecgDemo> queryWrapper = new QueryWrapper<JeecgDemo>();
-        //编程方式,给queryWrapper装载数据权限规则
-        QueryGenerator.installAuthMplus(queryWrapper, JeecgDemo.class);
-        Page<JeecgDemo> page = new Page<JeecgDemo>(pageNo, pageSize);
-        IPage<JeecgDemo> pageList = jeecgDemoService.page(page, queryWrapper);
-        return Result.OK(pageList);
-    }
-
-    /**
-     * 【数据权限示例 - 编程】mybatis xml方式加载权限
-     *
-     * @param jeecgDemo
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @GetMapping(value = "/sqlList")
-    @PermissionData(pageComponent = "jeecg/JeecgDemoList")
-    public Result<?> loadSqlPermissonList(JeecgDemo jeecgDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                          HttpServletRequest req) {
-        IPage<JeecgDemo> pageList = jeecgDemoService.queryListWithPermission(pageSize, pageNo);
-        return Result.OK(pageList);
-    }
-    /*----------------------------------------外部获取权限示例------------------------------------*/
-}

+ 0 - 254
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java

@@ -1,254 +0,0 @@
-package org.jeecg.modules.demo.test.controller;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.demo.test.entity.JeecgDemo;
-import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer;
-import org.jeecg.modules.demo.test.entity.JeecgOrderMain;
-import org.jeecg.modules.demo.test.entity.JeecgOrderTicket;
-import org.jeecg.modules.demo.test.service.IJeecgDemoService;
-import org.jeecg.modules.demo.test.service.IJeecgOrderCustomerService;
-import org.jeecg.modules.demo.test.service.IJeecgOrderMainService;
-import org.jeecg.modules.demo.test.service.IJeecgOrderTicketService;
-import org.jeecg.modules.demo.test.vo.JeecgOrderMainPage;
-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.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.extern.slf4j.Slf4j;
-
-/**
- * @Description: 一对多示例(JEditableTable行编辑)
- * @Author: jeecg-boot
- * @Date:2019-02-15
- * @Version: V2.0
- */
-@RestController
-@RequestMapping("/test/jeecgOrderMain")
-@Slf4j
-public class JeecgOrderMainController extends JeecgController<JeecgOrderMain, IJeecgOrderMainService> {
-
-    @Autowired
-    private IJeecgOrderMainService jeecgOrderMainService;
-    @Autowired
-    private IJeecgOrderCustomerService jeecgOrderCustomerService;
-    @Autowired
-    private IJeecgOrderTicketService jeecgOrderTicketService;
-
-    /**
-     * 分页列表查询
-     *
-     * @param jeecgOrderMain
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @GetMapping(value = "/list")
-    public Result<?> queryPageList(JeecgOrderMain jeecgOrderMain, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
-        QueryWrapper<JeecgOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeecgOrderMain, req.getParameterMap());
-        Page<JeecgOrderMain> page = new Page<JeecgOrderMain>(pageNo, pageSize);
-        IPage<JeecgOrderMain> pageList = jeecgOrderMainService.page(page, queryWrapper);
-        return Result.ok(pageList);
-    }
-
-    /**
-     * 添加
-     *
-     * @param jeecgOrderMainPage
-     * @return
-     */
-    @PostMapping(value = "/add")
-    public Result<?> add(@RequestBody JeecgOrderMainPage jeecgOrderMainPage) {
-        JeecgOrderMain jeecgOrderMain = new JeecgOrderMain();
-        BeanUtils.copyProperties(jeecgOrderMainPage, jeecgOrderMain);
-        jeecgOrderMainService.saveMain(jeecgOrderMain, jeecgOrderMainPage.getJeecgOrderCustomerList(), jeecgOrderMainPage.getJeecgOrderTicketList());
-        return Result.ok("添加成功!");
-    }
-
-    /**
-     * 编辑
-     *
-     * @param jeecgOrderMainPage
-     * @return
-     */
-    @PutMapping(value = "/edit")
-    public Result<?> eidt(@RequestBody JeecgOrderMainPage jeecgOrderMainPage) {
-        JeecgOrderMain jeecgOrderMain = new JeecgOrderMain();
-        BeanUtils.copyProperties(jeecgOrderMainPage, jeecgOrderMain);
-        jeecgOrderMainService.updateCopyMain(jeecgOrderMain, jeecgOrderMainPage.getJeecgOrderCustomerList(), jeecgOrderMainPage.getJeecgOrderTicketList());
-        return Result.ok("编辑成功!");
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        jeecgOrderMainService.delMain(id);
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.jeecgOrderMainService.delBatchMain(Arrays.asList(ids.split(",")));
-        return Result.ok("批量删除成功!");
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping(value = "/queryById")
-    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
-        JeecgOrderMain jeecgOrderMain = jeecgOrderMainService.getById(id);
-        return Result.ok(jeecgOrderMain);
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping(value = "/queryOrderCustomerListByMainId")
-    public Result<?> queryOrderCustomerListByMainId(@RequestParam(name = "id", required = true) String id) {
-        List<JeecgOrderCustomer> jeecgOrderCustomerList = jeecgOrderCustomerService.selectCustomersByMainId(id);
-        return Result.ok(jeecgOrderCustomerList);
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping(value = "/queryOrderTicketListByMainId")
-    public Result<?> queryOrderTicketListByMainId(@RequestParam(name = "id", required = true) String id) {
-        List<JeecgOrderTicket> jeecgOrderTicketList = jeecgOrderTicketService.selectTicketsByMainId(id);
-        return Result.ok(jeecgOrderTicketList);
-    }
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, JeecgOrderMain jeecgOrderMain) {
-        // Step.1 组装查询条件
-        QueryWrapper<JeecgOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeecgOrderMain, request.getParameterMap());
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        //获取当前用户
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-
-        List<JeecgOrderMainPage> pageList = new ArrayList<JeecgOrderMainPage>();
-
-        List<JeecgOrderMain> jeecgOrderMainList = jeecgOrderMainService.list(queryWrapper);
-        for (JeecgOrderMain orderMain : jeecgOrderMainList) {
-            JeecgOrderMainPage vo = new JeecgOrderMainPage();
-            BeanUtils.copyProperties(orderMain, vo);
-            // 查询机票
-            List<JeecgOrderTicket> jeecgOrderTicketList = jeecgOrderTicketService.selectTicketsByMainId(orderMain.getId());
-            vo.setJeecgOrderTicketList(jeecgOrderTicketList);
-            // 查询客户
-            List<JeecgOrderCustomer> jeecgOrderCustomerList = jeecgOrderCustomerService.selectCustomersByMainId(orderMain.getId());
-            vo.setJeecgOrderCustomerList(jeecgOrderCustomerList);
-            pageList.add(vo);
-        }
-
-        // 导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "一对多订单示例");
-        // 注解对象Class
-        mv.addObject(NormalExcelConstants.CLASS, JeecgOrderMainPage.class);
-        // 自定义表格参数
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("自定义导出Excel内容标题", "导出人:" + sysUser.getRealname(), "自定义Sheet名字"));
-        // 导出数据列表
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param
-     * @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(2);
-            params.setNeedSave(true);
-            try {
-                List<JeecgOrderMainPage> list = ExcelImportUtil.importExcel(file.getInputStream(), JeecgOrderMainPage.class, params);
-                for (JeecgOrderMainPage page : list) {
-                    JeecgOrderMain po = new JeecgOrderMain();
-                    BeanUtils.copyProperties(page, po);
-                    jeecgOrderMainService.saveMain(po, page.getJeecgOrderCustomerList(), page.getJeecgOrderTicketList());
-                }
-                return Result.ok("文件导入成功!");
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-                return Result.error("文件导入失败:" + e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.error("文件导入失败!");
-    }
-
-}

+ 0 - 265
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderTabMainController.java

@@ -1,265 +0,0 @@
-package org.jeecg.modules.demo.test.controller;
-
-import com.alibaba.dubbo.config.annotation.Reference;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.api.OrderService;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer;
-import org.jeecg.modules.demo.test.entity.JeecgOrderMain;
-import org.jeecg.modules.demo.test.entity.JeecgOrderTicket;
-import org.jeecg.modules.demo.test.service.IJeecgOrderCustomerService;
-import org.jeecg.modules.demo.test.service.IJeecgOrderMainService;
-import org.jeecg.modules.demo.test.service.IJeecgOrderTicketService;
-import org.jeecg.modules.demo.test.vo.JeecgOrderMainPage;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-
-/**
- * @Description: 一对多示例(ERP TAB风格)
- * @Author: ZhiLin
- * @Date: 2019-02-20
- * @Version: v2.0
- */
-@Slf4j
-@RestController
-@RequestMapping("/test/order")
-public class JeecgOrderTabMainController {
-    @Autowired
-    private IJeecgOrderMainService jeecgOrderMainService;
-    @Autowired
-    private IJeecgOrderCustomerService jeecgOrderCustomerService;
-    @Autowired
-    private IJeecgOrderTicketService jeecgOrderTicketService;
-
-    @Reference
-    private OrderService orderService;
-
-    @GetMapping("testOrder")
-    public String testOrder(){
-        return orderService.getOrderById(123L);
-    }
-
-    /**
-     * 分页列表查询
-     *
-     * @param jeecgOrderMain
-     * @param pageNo
-     * @param pageSize
-     * @param req
-     * @return
-     */
-    @GetMapping(value = "/orderList")
-    public Result<?> respondePagedData(JeecgOrderMain jeecgOrderMain,
-                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                       HttpServletRequest req) {
-        QueryWrapper<JeecgOrderMain> queryWrapper = QueryGenerator.initQueryWrapper(jeecgOrderMain, req.getParameterMap());
-        Page<JeecgOrderMain> page = new Page<JeecgOrderMain>(pageNo, pageSize);
-        IPage<JeecgOrderMain> pageList = jeecgOrderMainService.page(page, queryWrapper);
-        return Result.ok(pageList);
-    }
-
-    /**
-     * 添加
-     *
-     * @param jeecgOrderMainPage
-     * @return
-     */
-    @PostMapping(value = "/add")
-    public Result<?> add(@RequestBody JeecgOrderMainPage jeecgOrderMainPage) {
-        JeecgOrderMain jeecgOrderMain = new JeecgOrderMain();
-        BeanUtils.copyProperties(jeecgOrderMainPage, jeecgOrderMain);
-        jeecgOrderMainService.save(jeecgOrderMain);
-        return Result.ok("添加成功!");
-    }
-
-    /**
-     * 编辑
-     *
-     * @param jeecgOrderMainPage
-     * @return
-     */
-    @PutMapping("/edit")
-    public Result<?> edit(@RequestBody JeecgOrderMainPage jeecgOrderMainPage) {
-        JeecgOrderMain jeecgOrderMain = new JeecgOrderMain();
-        BeanUtils.copyProperties(jeecgOrderMainPage, jeecgOrderMain);
-        jeecgOrderMainService.updateById(jeecgOrderMain);
-        return Result.ok("编辑成功!");
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @DeleteMapping(value = "/delete")
-    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
-        jeecgOrderMainService.delMain(id);
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @DeleteMapping(value = "/deleteBatch")
-    public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
-        this.jeecgOrderMainService.removeByIds(Arrays.asList(ids.split(",")));
-        return Result.ok("批量删除成功!");
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param id
-     * @return
-     */
-    @GetMapping(value = "/queryById")
-    public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
-        JeecgOrderMain jeecgOrderMain = jeecgOrderMainService.getById(id);
-        return Result.ok(jeecgOrderMain);
-    }
-
-
-    /**
-     * 通过id查询
-     *
-     * @param jeecgOrderCustomer
-     * @return
-     */
-    @GetMapping(value = "/listOrderCustomerByMainId")
-    public Result<?> queryOrderCustomerListByMainId(JeecgOrderCustomer jeecgOrderCustomer,
-                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                    HttpServletRequest req) {
-        QueryWrapper<JeecgOrderCustomer> queryWrapper = QueryGenerator.initQueryWrapper(jeecgOrderCustomer, req.getParameterMap());
-        Page<JeecgOrderCustomer> page = new Page<JeecgOrderCustomer>(pageNo, pageSize);
-        IPage<JeecgOrderCustomer> pageList = jeecgOrderCustomerService.page(page, queryWrapper);
-        return Result.ok(pageList);
-    }
-
-    /**
-     * 通过id查询
-     *
-     * @param jeecgOrderTicket
-     * @return
-     */
-    @GetMapping(value = "/listOrderTicketByMainId")
-    public Result<?> queryOrderTicketListByMainId(JeecgOrderTicket jeecgOrderTicket,
-                                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                  HttpServletRequest req) {
-        QueryWrapper<JeecgOrderTicket> queryWrapper = QueryGenerator.initQueryWrapper(jeecgOrderTicket, req.getParameterMap());
-        Page<JeecgOrderTicket> page = new Page<JeecgOrderTicket>(pageNo, pageSize);
-        IPage<JeecgOrderTicket> pageList = jeecgOrderTicketService.page(page, queryWrapper);
-        return Result.ok(pageList);
-    }
-
-    /**
-     * 添加
-     *
-     * @param jeecgOrderCustomer
-     * @return
-     */
-    @PostMapping(value = "/addCustomer")
-    public Result<?> addCustomer(@RequestBody JeecgOrderCustomer jeecgOrderCustomer) {
-        jeecgOrderCustomerService.save(jeecgOrderCustomer);
-        return Result.ok("添加成功!");
-    }
-
-    /**
-     * 编辑
-     *
-     * @param jeecgOrderCustomer
-     * @return
-     */
-    @PutMapping("/editCustomer")
-    public Result<?> editCustomer(@RequestBody JeecgOrderCustomer jeecgOrderCustomer) {
-        jeecgOrderCustomerService.updateById(jeecgOrderCustomer);
-        return Result.ok("添加成功!");
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @DeleteMapping(value = "/deleteCustomer")
-    public Result<?> deleteCustomer(@RequestParam(name = "id", required = true) String id) {
-        jeecgOrderCustomerService.removeById(id);
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @DeleteMapping(value = "/deleteBatchCustomer")
-    public Result<?> deleteBatchCustomer(@RequestParam(name = "ids", required = true) String ids) {
-        this.jeecgOrderCustomerService.removeByIds(Arrays.asList(ids.split(",")));
-        return Result.ok("批量删除成功!");
-    }
-
-    /**
-     * 添加
-     *
-     * @param jeecgOrderTicket
-     * @return
-     */
-    @PostMapping(value = "/addTicket")
-    public Result<?> addTicket(@RequestBody JeecgOrderTicket jeecgOrderTicket) {
-        jeecgOrderTicketService.save(jeecgOrderTicket);
-        return Result.ok("添加成功!");
-    }
-
-    /**
-     * 编辑
-     *
-     * @param jeecgOrderTicket
-     * @return
-     */
-    @PutMapping("/editTicket")
-    public Result<?> editTicket(@RequestBody JeecgOrderTicket jeecgOrderTicket) {
-        jeecgOrderTicketService.updateById(jeecgOrderTicket);
-        return Result.ok("编辑成功!");
-    }
-
-    /**
-     * 通过id删除
-     *
-     * @param id
-     * @return
-     */
-    @DeleteMapping(value = "/deleteTicket")
-    public Result<?> deleteTicket(@RequestParam(name = "id", required = true) String id) {
-        jeecgOrderTicketService.removeById(id);
-        return Result.ok("删除成功!");
-    }
-
-    /**
-     * 批量删除
-     *
-     * @param ids
-     * @return
-     */
-    @DeleteMapping(value = "/deleteBatchTicket")
-    public Result<?> deleteBatchTicket(@RequestParam(name = "ids", required = true) String ids) {
-        this.jeecgOrderTicketService.removeByIds(Arrays.asList(ids.split(",")));
-        return Result.ok("批量删除成功!");
-    }
-
-}

+ 0 - 244
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java

@@ -1,244 +0,0 @@
-package org.jeecg.modules.demo.test.controller;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.demo.test.entity.JoaDemo;
-import org.jeecg.modules.demo.test.service.IJoaDemoService;
-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.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-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 lombok.extern.slf4j.Slf4j;
-
- /**
- * @Description: 流程测试
- * @Author: jeecg-boot
- * @Date:   2019-05-14
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/test/joaDemo")
-@Slf4j
-public class JoaDemoController {
-	@Autowired
-	private IJoaDemoService joaDemoService;
-	
-	/**
-	  * 分页列表查询
-	 * @param joaDemo
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@GetMapping(value = "/list")
-	public Result<IPage<JoaDemo>> queryPageList(JoaDemo joaDemo,
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<JoaDemo>> result = new Result<IPage<JoaDemo>>();
-		QueryWrapper<JoaDemo> queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, req.getParameterMap());
-		Page<JoaDemo> page = new Page<JoaDemo>(pageNo, pageSize);
-		IPage<JoaDemo> pageList = joaDemoService.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param joaDemo
-	 * @return
-	 */
-	@PostMapping(value = "/add")
-	public Result<JoaDemo> add(@RequestBody JoaDemo joaDemo) {
-		Result<JoaDemo> result = new Result<JoaDemo>();
-		try {
-			joaDemoService.save(joaDemo);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param joaDemo
-	 * @return
-	 */
-	@PutMapping(value = "/edit")
-	public Result<JoaDemo> edit(@RequestBody JoaDemo joaDemo) {
-		Result<JoaDemo> result = new Result<JoaDemo>();
-		JoaDemo joaDemoEntity = joaDemoService.getById(joaDemo.getId());
-		if(joaDemoEntity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = joaDemoService.updateById(joaDemo);
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@DeleteMapping(value = "/delete")
-	public Result<JoaDemo> delete(@RequestParam(name="id",required=true) String id) {
-		Result<JoaDemo> result = new Result<JoaDemo>();
-		JoaDemo joaDemo = joaDemoService.getById(id);
-		if(joaDemo==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = joaDemoService.removeById(id);
-			if(ok) {
-				result.success("删除成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<JoaDemo> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<JoaDemo> result = new Result<JoaDemo>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.joaDemoService.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@GetMapping(value = "/queryById")
-	public Result<JoaDemo> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<JoaDemo> result = new Result<JoaDemo>();
-		JoaDemo joaDemo = joaDemoService.getById(id);
-		if(joaDemo==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(joaDemo);
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<JoaDemo> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              JoaDemo joaDemo = JSON.parseObject(deString, JoaDemo.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(joaDemo, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<JoaDemo> pageList = joaDemoService.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "流程测试列表");
-      mv.addObject(NormalExcelConstants.CLASS, JoaDemo.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<JoaDemo> listJoaDemos = ExcelImportUtil.importExcel(file.getInputStream(), JoaDemo.class, params);
-              for (JoaDemo joaDemoExcel : listJoaDemos) {
-                  joaDemoService.save(joaDemoExcel);
-              }
-              return Result.ok("文件导入成功!数据行数:" + listJoaDemos.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 - 29
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/TestAlinkController.java

@@ -1,29 +0,0 @@
-package org.jeecg.modules.demo.test.controller;
-
-import com.alibaba.alink.operator.batch.BatchOperator;
-import com.alibaba.alink.operator.batch.source.CsvSourceBatchOp;
-import com.alibaba.alink.pipeline.Pipeline;
-import com.alibaba.alink.pipeline.clustering.KMeans;
-import com.alibaba.alink.pipeline.dataproc.vector.VectorAssembler;
-
-public class TestAlinkController {
-    public static void main(String[] args) throws Exception {
-        String URL = "https://alink-release.oss-cn-beijing.aliyuncs.com/data-files/iris.csv";
-        String SCHEMA_STR = "sepal_length double, sepal_width double, petal_length double, petal_width double, category string";
-
-        BatchOperator data = new CsvSourceBatchOp().setFilePath(URL).setSchemaStr(SCHEMA_STR);
-
-        VectorAssembler va = new VectorAssembler()
-                .setSelectedCols(new String[]{"sepal_length", "sepal_width", "petal_length", "petal_width"})
-                .setOutputCol("features");
-
-        KMeans kMeans = new KMeans().setVectorCol("features").setK(3)
-                .setPredictionCol("prediction_result")
-                .setPredictionDetailCol("prediction_detail")
-                .setReservedCols("category")
-                .setMaxIter(100);
-
-        Pipeline pipeline = new Pipeline().add(va).add(kMeans);
-        pipeline.fit(data).transform(data).print();
-    }
-}

+ 0 - 78
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java

@@ -1,78 +0,0 @@
-package org.jeecg.modules.demo.test.entity;
-
-import java.io.Serializable;
-
-import org.jeecg.common.system.base.entity.JeecgEntity;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-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;
-
-/**
- * @Description: jeecg 测试demo 
- * @Author: jeecg-boot 
- * @Date:	2018-12-29 
- * @Version:V1.0
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="测试DEMO对象", description="测试DEMO")
-@TableName("demo")
-public class JeecgDemo extends JeecgEntity implements Serializable {
-	private static final long serialVersionUID = 1L;
-	/** 部门编码 */
-	@Excel(name="部门编码",width=25)
-	@ApiModelProperty(value = "部门编码")
-	private java.lang.String sysOrgCode;
-	/** 姓名 */
-	@Excel(name="姓名",width=25)
-	@ApiModelProperty(value = "姓名")
-	private java.lang.String name;
-	/** 关键词 */
-	@ApiModelProperty(value = "关键词")
-	@Excel(name="关键词",width=15)
-	private java.lang.String keyWord;
-	/** 打卡时间 */
-	@ApiModelProperty(value = "打卡时间")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@Excel(name="打卡时间",width=20,format="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date punchTime;
-	/** 工资 */
-	@ApiModelProperty(value = "工资",example = "0")
-	@Excel(name="工资",width=15)
-	private java.math.BigDecimal salaryMoney;
-	/** 奖金 */
-	@ApiModelProperty(value = "奖金",example = "0")
-	@Excel(name="奖金",width=15)
-	private java.lang.Double bonusMoney;
-	/** 性别 {男:1,女:2} */
-	@ApiModelProperty(value = "性别")
-	@Excel(name = "性别", width = 15, dicCode = "sex")
-	private java.lang.String sex;
-	/** 年龄 */
-	@ApiModelProperty(value = "年龄",example = "0")
-	@Excel(name="年龄",width=15)
-	private java.lang.Integer age;
-	/** 生日 */
-	@ApiModelProperty(value = "生日")
-	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
-	@DateTimeFormat(pattern = "yyyy-MM-dd")
-	@Excel(name="生日",format="yyyy-MM-dd")
-	private java.util.Date birthday;
-	/** 邮箱 */
-	@ApiModelProperty(value = "邮箱")
-	@Excel(name="邮箱",width=30)
-	private java.lang.String email;
-	/** 个人简介 */
-	@ApiModelProperty(value = "个人简介")
-	private java.lang.String content;
-}

+ 0 - 54
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderCustomer.java

@@ -1,54 +0,0 @@
-package org.jeecg.modules.demo.test.entity;
-
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * @Description: 订单客户
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-@Data
-@TableName("jeecg_order_customer")
-public class JeecgOrderCustomer implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-	/**主键*/
-    @TableId(type = IdType.ASSIGN_ID)
-	private java.lang.String id;
-	/**客户名*/
-	@Excel(name="客户名字",width=15)
-	private java.lang.String name;
-	/**性别*/
-	private java.lang.String sex;
-	/**身份证号码*/
-	@Excel(name="身份证号码",width=15)
-	private java.lang.String idcard;
-	/**身份证扫描件*/
-	private java.lang.String idcardPic;
-	/**电话1*/
-	@Excel(name="电话",width=15)
-	private java.lang.String telphone;
-	/**外键*/
-	private java.lang.String orderId;
-	/**创建人*/
-	private java.lang.String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date createTime;
-	/**修改人*/
-	private java.lang.String updateBy;
-	/**修改时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date updateTime;
-}

+ 0 - 50
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderMain.java

@@ -1,50 +0,0 @@
-package org.jeecg.modules.demo.test.entity;
-
-import java.io.Serializable;
-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;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * @Description: 订单
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-@Data
-@TableName("jeecg_order_main")
-public class JeecgOrderMain implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-	/**主键*/
-    @TableId(type = IdType.ASSIGN_ID)
-	private java.lang.String id;
-	/**订单号*/
-	private java.lang.String orderCode;
-	/**订单类型*/
-	private java.lang.String ctype;
-	/**订单日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date orderDate;
-	/**订单金额*/
-	private java.lang.Double orderMoney;
-	/**订单备注*/
-	private java.lang.String content;
-	/**创建人*/
-	private java.lang.String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date createTime;
-	/**修改人*/
-	private java.lang.String updateBy;
-	/**修改时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date updateTime;
-}

+ 0 - 48
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgOrderTicket.java

@@ -1,48 +0,0 @@
-package org.jeecg.modules.demo.test.entity;
-
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * @Description: 订单机票
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-@Data
-@TableName("jeecg_order_ticket")
-public class JeecgOrderTicket implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-	/**主键*/
-    @TableId(type = IdType.ASSIGN_ID)
-	private java.lang.String id;
-	/**航班号*/
-	@Excel(name="航班号",width=15)
-	private java.lang.String ticketCode;
-	/**航班时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	@Excel(name="航班时间",width=15,format = "yyyy-MM-dd")
-	private java.util.Date tickectDate;
-	/**外键*/
-	private java.lang.String orderId;
-	/**创建人*/
-	private java.lang.String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date createTime;
-	/**修改人*/
-	private java.lang.String updateBy;
-	/**修改时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date updateTime;
-}

+ 0 - 67
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JoaDemo.java

@@ -1,67 +0,0 @@
-package org.jeecg.modules.demo.test.entity;
-
-import java.io.Serializable;
-
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import lombok.Data;
-
-/**
- * @Description: 流程测试
- * @Author: jeecg-boot
- * @Date:   2019-05-14
- * @Version: V1.0
- */
-@Data
-@TableName("joa_demo")
-public class JoaDemo implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-	/**ID*/
-	@TableId(type = IdType.ASSIGN_ID)
-	private java.lang.String id;
-	/**请假人*/
-	@Excel(name = "请假人", width = 15)
-	private java.lang.String name;
-	/**请假天数*/
-	@Excel(name = "请假天数", width = 15)
-	private java.lang.Integer days;
-	/**开始时间*/
-	@Excel(name = "开始时间", width = 20, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-	private java.util.Date beginDate;
-	/**请假结束时间*/
-	@Excel(name = "请假结束时间", width = 20, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-	private java.util.Date endDate;
-	/**请假原因*/
-	@Excel(name = "请假原因", width = 15)
-	private java.lang.String reason;
-	/**流程状态*/
-	@Excel(name = "流程状态", width = 15)
-	private java.lang.String bpmStatus;
-	/**创建人id*/
-	@Excel(name = "创建人id", width = 15)
-	private java.lang.String createBy;
-	/**创建时间*/
-	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date createTime;
-	/**修改时间*/
-	@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private java.util.Date updateTime;
-	/**修改人id*/
-	@Excel(name = "修改人id", width = 15)
-	private java.lang.String updateBy;
-}

+ 0 - 45
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgDemoMapper.java

@@ -1,45 +0,0 @@
-package org.jeecg.modules.demo.test.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.demo.test.entity.JeecgDemo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-/**
- * @Description: jeecg 测试demo
- * @Author: jeecg-boot
- * @Date:  2018-12-29
- * @Version: V1.0
- */
-public interface JeecgDemoMapper extends BaseMapper<JeecgDemo> {
-
-	public List<JeecgDemo> getDemoByName(@Param("name") String name);
-	
-	/**
-	 * 查询列表数据 直接传数据权限的sql进行数据过滤
-	 * @param page
-	 * @param permissionSql
-	 * @return
-	 */
-	public IPage<JeecgDemo> queryListWithPermission(Page<JeecgDemo> page,@Param("permissionSql")String permissionSql);
-
-	/**
-	 * 根据前缀获取所有有效权限
-	 * @param permsPrefix
-	 * @return
-	 */
-	public List<String> queryAllAuth(@Param("permsPrefix")String permsPrefix);
-
-	/**
-	 * 查询用户已授权字段
-	 * @param userId
-	 * @param permsPrefix
-	 * @return
-	 */
-	public List<String> queryUserAuth(@Param("userId")String userId,@Param("permsPrefix")String permsPrefix);
-
-}

+ 0 - 29
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderCustomerMapper.java

@@ -1,29 +0,0 @@
-package org.jeecg.modules.demo.test.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Select;
-import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 订单客户
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-public interface JeecgOrderCustomerMapper extends BaseMapper<JeecgOrderCustomer> {
-	
-	/**
-	 *  通过主表外键批量删除客户
-	 * @param mainId
-	 * @return
-	 */
-    @Delete("DELETE FROM JEECG_ORDER_CUSTOMER WHERE ORDER_ID = #{mainId}")
-	public boolean deleteCustomersByMainId(String mainId);
-    
-    @Select("SELECT * FROM JEECG_ORDER_CUSTOMER WHERE ORDER_ID = #{mainId}")
-	public List<JeecgOrderCustomer> selectCustomersByMainId(String mainId);
-}

+ 0 - 17
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderMainMapper.java

@@ -1,17 +0,0 @@
-package org.jeecg.modules.demo.test.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.demo.test.entity.JeecgOrderMain;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 订单
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-public interface JeecgOrderMainMapper extends BaseMapper<JeecgOrderMain> {
-
-}

+ 0 - 29
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JeecgOrderTicketMapper.java

@@ -1,29 +0,0 @@
-package org.jeecg.modules.demo.test.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Delete;
-import org.apache.ibatis.annotations.Select;
-import org.jeecg.modules.demo.test.entity.JeecgOrderTicket;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 订单机票
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-public interface JeecgOrderTicketMapper extends BaseMapper<JeecgOrderTicket> {
-
-	/**
-	 *  通过主表外键批量删除客户
-	 * @param mainId
-	 * @return
-	 */
-    @Delete("DELETE FROM JEECG_ORDER_TICKET WHERE ORDER_ID = #{mainId}")
-	public boolean deleteTicketsByMainId(String mainId);
-    
-    
-    @Select("SELECT * FROM JEECG_ORDER_TICKET WHERE ORDER_ID = #{mainId}")
-	public List<JeecgOrderTicket> selectTicketsByMainId(String mainId);
-}

+ 0 - 15
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/JoaDemoMapper.java

@@ -1,15 +0,0 @@
-package org.jeecg.modules.demo.test.mapper;
-
-import org.jeecg.modules.demo.test.entity.JoaDemo;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: 流程测试
- * @Author: jeecg-boot
- * @Date:   2019-05-14
- * @Version: V1.0
- */
-public interface JoaDemoMapper extends BaseMapper<JoaDemo> {
-
-}

+ 0 - 34
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml

@@ -1,34 +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="org.jeecg.modules.demo.test.mapper.JeecgDemoMapper">
-
-	<!-- 根据用户名查询 -->
-	<select id="getDemoByName" resultType="org.jeecg.modules.demo.test.entity.JeecgDemo">
-		select * from  demo  where name = #{name}
-	</select>
-	
-	<!-- 根据权限sql查询数据集 -->
-	<select id="queryListWithPermission" parameterType="Object" resultType="org.jeecg.modules.demo.test.entity.JeecgDemo">
-		select * from demo where 1=1 ${permissionSql}
-	</select>
-
-	<!-- 查询所有符合前缀且有效字段 -->
-	<select id="queryAllAuth" resultType="java.lang.String">
-        select perms from sys_permission
-        where perms
-        like concat(concat('%',#{permsPrefix}),'%')
-        and del_flag=0
-        and status='1'
-    </select>
-
-	<!-- 查询用户已授权字段 -->
-	<select id="queryUserAuth" resultType="java.lang.String">
-        select perms from sys_user_role sur,
-        sys_role_permission srp,
-        sys_permission sp
-        where sur.role_id = srp.role_id
-        and sp.id = srp.permission_id
-        and user_id = #{userId}
-        and sp.perms like concat(concat('%',#{permsPrefix}),'%')
-    </select>
-</mapper>

+ 0 - 5
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.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="org.jeecg.modules.demo.test.mapper.JeecgOrderCustomerMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.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="org.jeecg.modules.demo.test.mapper.JeecgOrderMainMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.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="org.jeecg.modules.demo.test.mapper.JeecgOrderTicketMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.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="org.jeecg.modules.demo.test.mapper.JoaDemoMapper">
-
-</mapper>

+ 0 - 33
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgDemoService.java

@@ -1,33 +0,0 @@
-package org.jeecg.modules.demo.test.service;
-
-import org.jeecg.common.system.base.service.JeecgService;
-import org.jeecg.modules.demo.test.entity.JeecgDemo;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-
-/**
- * @Description: jeecg 测试demo
- * @Author: jeecg-boot
- * @Date:  2018-12-29
- * @Version: V1.0
- */
-public interface IJeecgDemoService extends JeecgService<JeecgDemo> {
-	
-	public void testTran();
-	
-	public JeecgDemo getByIdCacheable(String id);
-	
-	/**
-	 * 查询列表数据 在service中获取数据权限sql信息
-	 * @param pageSize
-	 * @param pageNo
-	 * @return
-	 */
-	IPage<JeecgDemo> queryListWithPermission(int pageSize,int pageNo);
-
-	/**
-	 * 根据用户权限获取导出字段
-	 * @return
-	 */
-	String getExportFields();
-}

+ 0 - 18
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderCustomerService.java

@@ -1,18 +0,0 @@
-package org.jeecg.modules.demo.test.service;
-
-import java.util.List;
-
-import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 订单客户
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-public interface IJeecgOrderCustomerService extends IService<JeecgOrderCustomer> {
-	
-	public List<JeecgOrderCustomer> selectCustomersByMainId(String mainId);
-}

+ 0 - 46
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderMainService.java

@@ -1,46 +0,0 @@
-package org.jeecg.modules.demo.test.service;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-
-import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer;
-import org.jeecg.modules.demo.test.entity.JeecgOrderMain;
-import org.jeecg.modules.demo.test.entity.JeecgOrderTicket;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 订单
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-public interface IJeecgOrderMainService extends IService<JeecgOrderMain> {
-
-	/**
-	 * 添加一对多
-	 * 
-	 */
-	public void saveMain(JeecgOrderMain jeecgOrderMain,List<JeecgOrderCustomer> jeecgOrderCustomerList,List<JeecgOrderTicket> jeecgOrderTicketList) ;
-	
-	/**
-	 * 修改一对多
-	 * 
-	 */
-	public void updateMain(JeecgOrderMain jeecgOrderMain,List<JeecgOrderCustomer> jeecgOrderCustomerList,List<JeecgOrderTicket> jeecgOrderTicketList);
-	
-	/**
-	 * 删除一对多
-	 * @param jformOrderMain
-	 */
-	public void delMain (String id);
-	
-	/**
-	 * 批量删除一对多
-	 * @param jformOrderMain
-	 */
-	public void delBatchMain (Collection<? extends Serializable> idList);
-
-	public void updateCopyMain(JeecgOrderMain jeecgOrderMain, List<JeecgOrderCustomer> jeecgOrderCustomerList, List<JeecgOrderTicket> jeecgOrderTicketList);
-}

+ 0 - 18
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJeecgOrderTicketService.java

@@ -1,18 +0,0 @@
-package org.jeecg.modules.demo.test.service;
-
-import java.util.List;
-
-import org.jeecg.modules.demo.test.entity.JeecgOrderTicket;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 订单机票
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-public interface IJeecgOrderTicketService extends IService<JeecgOrderTicket> {
-	
-	public List<JeecgOrderTicket> selectTicketsByMainId(String mainId);
-}

+ 0 - 15
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/IJoaDemoService.java

@@ -1,15 +0,0 @@
-package org.jeecg.modules.demo.test.service;
-
-import org.jeecg.modules.demo.test.entity.JoaDemo;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 流程测试
- * @Author: jeecg-boot
- * @Date:   2019-05-14
- * @Version: V1.0
- */
-public interface IJoaDemoService extends IService<JoaDemo> {
-
-}

+ 0 - 109
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgDemoServiceImpl.java

@@ -1,109 +0,0 @@
-package org.jeecg.modules.demo.test.service.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.constant.CacheConstant;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.demo.test.entity.JeecgDemo;
-import org.jeecg.modules.demo.test.mapper.JeecgDemoMapper;
-import org.jeecg.modules.demo.test.service.IJeecgDemoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @Description: jeecg 测试demo
- * @Author: jeecg-boot
- * @Date:  2018-12-29
- * @Version: V1.0
- */
-@Service
-public class JeecgDemoServiceImpl extends ServiceImpl<JeecgDemoMapper, JeecgDemo> implements IJeecgDemoService {
-	@Autowired
-	JeecgDemoMapper jeecgDemoMapper;
-	
-	/**
-	 * 事务控制在service层面
-	 * 加上注解:@Transactional,声明的方法就是一个独立的事务(有异常DB操作全部回滚)
-	 */
-	@Override
-	@Transactional
-	public void testTran() {
-		JeecgDemo pp = new JeecgDemo();
-		pp.setAge(1111);
-		pp.setName("测试事务  小白兔 1");
-		jeecgDemoMapper.insert(pp);
-		
-		JeecgDemo pp2 = new JeecgDemo();
-		pp2.setAge(2222);
-		pp2.setName("测试事务  小白兔 2");
-		jeecgDemoMapper.insert(pp2);
-		
-		Integer.parseInt("hello");//自定义异常
-		
-		JeecgDemo pp3 = new JeecgDemo();
-		pp3.setAge(3333);
-		pp3.setName("测试事务  小白兔 3");
-		jeecgDemoMapper.insert(pp3);
-		return ;
-	}
-
-
-	/**
-	 * 缓存注解测试: redis
-	 */
-	@Override
-	@Cacheable(cacheNames = CacheConstant.TEST_DEMO_CACHE, key = "#id")
-	public JeecgDemo getByIdCacheable(String id) {
-		JeecgDemo t = jeecgDemoMapper.selectById(id);
-		return t;
-	}
-
-
-	@Override
-	public IPage<JeecgDemo> queryListWithPermission(int pageSize,int pageNo) {
-		Page<JeecgDemo> page = new Page<>(pageNo, pageSize);
-		//编程方式,获取当前请求的数据权限规则SQL片段
-		String sql = QueryGenerator.installAuthJdbc(JeecgDemo.class);
-		return this.baseMapper.queryListWithPermission(page, sql);
-	}
-
-	@Override
-	public String getExportFields() {
-		LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-		//权限配置列导出示例
-		//1.配置前缀与菜单中配置的列前缀一致
-		List<String> noAuthList = new ArrayList<>();
-		List<String> exportFieldsList = new ArrayList<>();
-		String permsPrefix = "testdemo:";
-		//查询配置菜单有效字段
-		List<String> allAuth = this.jeecgDemoMapper.queryAllAuth(permsPrefix);
-		//查询已授权字段
-		List<String> userAuth = this.jeecgDemoMapper.queryUserAuth(sysUser.getId(),permsPrefix);
-		//列出未授权字段
-		for(String perms : allAuth){
-			if(!userAuth.contains(perms)){
-				noAuthList.add(perms.substring(permsPrefix.length()));
-			}
-		}
-		//实体类中字段与未授权字段比较,列出需导出字段
-		Field[] fileds = JeecgDemo.class.getDeclaredFields();
-		List<Field> list = new ArrayList(Arrays.asList(fileds));
-		for(Field field : list){
-			if(!noAuthList.contains(field.getName())){
-				exportFieldsList.add(field.getName());
-			}
-		}
-		return exportFieldsList != null && exportFieldsList.size()>0 ? String.join(",", exportFieldsList) : "";
-	}
-
-}

+ 0 - 30
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderCustomerServiceImpl.java

@@ -1,30 +0,0 @@
-package org.jeecg.modules.demo.test.service.impl;
-
-import java.util.List;
-
-import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer;
-import org.jeecg.modules.demo.test.mapper.JeecgOrderCustomerMapper;
-import org.jeecg.modules.demo.test.service.IJeecgOrderCustomerService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 订单客户
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-@Service
-public class JeecgOrderCustomerServiceImpl extends ServiceImpl<JeecgOrderCustomerMapper, JeecgOrderCustomer> implements IJeecgOrderCustomerService {
-
-	@Autowired
-	private JeecgOrderCustomerMapper jeecgOrderCustomerMapper;
-	
-	@Override
-	public List<JeecgOrderCustomer> selectCustomersByMainId(String mainId) {
-		return jeecgOrderCustomerMapper.selectCustomersByMainId(mainId);
-	}
-
-}

+ 0 - 162
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderMainServiceImpl.java

@@ -1,162 +0,0 @@
-package org.jeecg.modules.demo.test.service.impl;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer;
-import org.jeecg.modules.demo.test.entity.JeecgOrderMain;
-import org.jeecg.modules.demo.test.entity.JeecgOrderTicket;
-import org.jeecg.modules.demo.test.mapper.JeecgOrderCustomerMapper;
-import org.jeecg.modules.demo.test.mapper.JeecgOrderMainMapper;
-import org.jeecg.modules.demo.test.mapper.JeecgOrderTicketMapper;
-import org.jeecg.modules.demo.test.service.IJeecgOrderMainService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 订单
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-@Service
-public class JeecgOrderMainServiceImpl extends ServiceImpl<JeecgOrderMainMapper, JeecgOrderMain> implements IJeecgOrderMainService {
-
-    @Autowired
-    private JeecgOrderMainMapper jeecgOrderMainMapper;
-    @Autowired
-    private JeecgOrderCustomerMapper jeecgOrderCustomerMapper;
-    @Autowired
-    private JeecgOrderTicketMapper jeecgOrderTicketMapper;
-
-    @Override
-    @Transactional
-    public void saveMain(JeecgOrderMain jeecgOrderMain, List<JeecgOrderCustomer> jeecgOrderCustomerList, List<JeecgOrderTicket> jeecgOrderTicketList) {
-        jeecgOrderMainMapper.insert(jeecgOrderMain);
-        if (jeecgOrderCustomerList != null) {
-            for (JeecgOrderCustomer entity : jeecgOrderCustomerList) {
-                entity.setOrderId(jeecgOrderMain.getId());
-                jeecgOrderCustomerMapper.insert(entity);
-            }
-        }
-        if (jeecgOrderTicketList != null) {
-            for (JeecgOrderTicket entity : jeecgOrderTicketList) {
-                entity.setOrderId(jeecgOrderMain.getId());
-                jeecgOrderTicketMapper.insert(entity);
-            }
-        }
-    }
-
-    @Override
-    @Transactional
-    public void updateMain(JeecgOrderMain jeecgOrderMain, List<JeecgOrderCustomer> jeecgOrderCustomerList, List<JeecgOrderTicket> jeecgOrderTicketList) {
-        jeecgOrderMainMapper.updateById(jeecgOrderMain);
-
-        //1.先删除子表数据
-        jeecgOrderTicketMapper.deleteTicketsByMainId(jeecgOrderMain.getId());
-        jeecgOrderCustomerMapper.deleteCustomersByMainId(jeecgOrderMain.getId());
-
-        //2.子表数据重新插入
-        if (jeecgOrderCustomerList != null) {
-            for (JeecgOrderCustomer entity : jeecgOrderCustomerList) {
-                entity.setOrderId(jeecgOrderMain.getId());
-                jeecgOrderCustomerMapper.insert(entity);
-            }
-        }
-        if (jeecgOrderTicketList != null) {
-            for (JeecgOrderTicket entity : jeecgOrderTicketList) {
-                entity.setOrderId(jeecgOrderMain.getId());
-                jeecgOrderTicketMapper.insert(entity);
-            }
-        }
-    }
-
-    /**
-     * 一对多维护逻辑改造  LOWCOD-315
-     * @param jeecgOrderMain
-     * @param jeecgOrderCustomerList
-     * @param jeecgOrderTicketList
-     */
-    @Override
-    @Transactional
-    public void updateCopyMain(JeecgOrderMain jeecgOrderMain, List<JeecgOrderCustomer> jeecgOrderCustomerList, List<JeecgOrderTicket> jeecgOrderTicketList) {
-        jeecgOrderMainMapper.updateById(jeecgOrderMain);
-
-        // 循环前台传过来的数据
-        for (JeecgOrderTicket ticket:jeecgOrderTicketList){
-            // 先查询子表数据库
-            JeecgOrderTicket orderTicket = jeecgOrderTicketMapper.selectById(ticket.getId());
-            if(orderTicket == null){
-                // 当传过来的id数据库不存在时,说明数据库没有,走新增逻辑
-                ticket.setOrderId(jeecgOrderMain.getId());
-                jeecgOrderTicketMapper.insert(ticket);
-                break;
-            }
-            if(orderTicket.getId().equals(ticket.getId())){
-                // 传过来的id和数据库id一至时,说明数据库存在该数据,走更新逻辑
-                jeecgOrderTicketMapper.updateById(ticket);
-            }
-        }
-        for (JeecgOrderCustomer customer:jeecgOrderCustomerList){
-            // 先查询子表数据库
-            JeecgOrderCustomer customers = jeecgOrderCustomerMapper.selectById(customer.getId());
-            if(customers == null){
-                // 当传过来的id数据库不存在时,说明数据库没有,走新增逻辑
-                customer.setOrderId(jeecgOrderMain.getId());
-                jeecgOrderCustomerMapper.insert(customer);
-                break;
-            }
-            if(customers.getId().equals(customer.getId())){
-                //TODO 传过来的id和数据库id一至时,说明数据库存在该数据,走更新逻辑
-                jeecgOrderCustomerMapper.updateById(customer);
-            }
-        }
-        // 当跟新和删除之后取差集, 当传过来的id不存在,而数据库存在时,说明已删除,走删除逻辑
-        List<JeecgOrderTicket> jeecgOrderTickets = jeecgOrderTicketMapper.selectTicketsByMainId(jeecgOrderMain.getId());
-        List<JeecgOrderTicket> collect = jeecgOrderTickets.stream()
-                .filter(item -> !jeecgOrderTicketList.stream()
-                .map(e -> e.getId())
-                .collect(Collectors.toList())
-                .contains(item.getId()))
-                .collect(Collectors.toList());
-        // for循环删除id
-        for (JeecgOrderTicket ticket:collect){
-            jeecgOrderTicketMapper.deleteById(ticket.getId());
-        }
-
-        List<JeecgOrderCustomer> jeecgOrderCustomers = jeecgOrderCustomerMapper.selectCustomersByMainId(jeecgOrderMain.getId());
-        List<JeecgOrderCustomer> customersCollect = jeecgOrderCustomers.stream()
-                .filter(item -> !jeecgOrderCustomerList.stream()
-                        .map(e -> e.getId())
-                        .collect(Collectors.toList())
-                        .contains(item.getId()))
-                .collect(Collectors.toList());
-        //TODO for循环删除id
-        for (JeecgOrderCustomer c:customersCollect){
-            jeecgOrderCustomerMapper.deleteById(c.getId());
-        }
-    }
-	@Override
-	@Transactional
-	public void delMain(String id) {
-		jeecgOrderMainMapper.deleteById(id);
-		jeecgOrderTicketMapper.deleteTicketsByMainId(id);
-		jeecgOrderCustomerMapper.deleteCustomersByMainId(id);
-	}
-
-	@Override
-	@Transactional
-	public void delBatchMain(Collection<? extends Serializable> idList) {
-		for(Serializable id:idList) {
-			jeecgOrderMainMapper.deleteById(id);
-			jeecgOrderTicketMapper.deleteTicketsByMainId(id.toString());
-			jeecgOrderCustomerMapper.deleteCustomersByMainId(id.toString());
-		}
-	}
-
-}

+ 0 - 29
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JeecgOrderTicketServiceImpl.java

@@ -1,29 +0,0 @@
-package org.jeecg.modules.demo.test.service.impl;
-
-import java.util.List;
-
-import org.jeecg.modules.demo.test.entity.JeecgOrderTicket;
-import org.jeecg.modules.demo.test.mapper.JeecgOrderTicketMapper;
-import org.jeecg.modules.demo.test.service.IJeecgOrderTicketService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 订单机票
- * @Author: jeecg-boot
- * @Date:  2019-02-15
- * @Version: V1.0
- */
-@Service
-public class JeecgOrderTicketServiceImpl extends ServiceImpl<JeecgOrderTicketMapper, JeecgOrderTicket> implements IJeecgOrderTicketService {
-	@Autowired
-	private JeecgOrderTicketMapper jeecgOrderTicketMapper;
-	
-	@Override
-	public List<JeecgOrderTicket> selectTicketsByMainId(String mainId) {
-		return jeecgOrderTicketMapper.selectTicketsByMainId(mainId);
-	}
-
-}

+ 0 - 19
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/service/impl/JoaDemoServiceImpl.java

@@ -1,19 +0,0 @@
-package org.jeecg.modules.demo.test.service.impl;
-
-import org.jeecg.modules.demo.test.entity.JoaDemo;
-import org.jeecg.modules.demo.test.mapper.JoaDemoMapper;
-import org.jeecg.modules.demo.test.service.IJoaDemoService;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: 流程测试
- * @Author: jeecg-boot
- * @Date:   2019-05-14
- * @Version: V1.0
- */
-@Service
-public class JoaDemoServiceImpl extends ServiceImpl<JoaDemoMapper, JoaDemo> implements IJoaDemoService {
-
-}

+ 0 - 44
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/test/vo/JeecgOrderMainPage.java

@@ -1,44 +0,0 @@
-package org.jeecg.modules.demo.test.vo;
-
-import java.util.List;
-
-import org.jeecg.modules.demo.test.entity.JeecgOrderCustomer;
-import org.jeecg.modules.demo.test.entity.JeecgOrderTicket;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelCollection;
-
-import lombok.Data;
-
-@Data
-public class JeecgOrderMainPage {
-	
-	/**主键*/
-	private java.lang.String id;
-	/**订单号*/
-	@Excel(name="订单号",width=15)
-	private java.lang.String orderCode;
-	/**订单类型*/
-	private java.lang.String ctype;
-	/**订单日期*/
-	@Excel(name="订单日期",width=15,format = "yyyy-MM-dd")
-	private java.util.Date orderDate;
-	/**订单金额*/
-	@Excel(name="订单金额",width=15)
-	private java.lang.Double orderMoney;
-	/**订单备注*/
-	private java.lang.String content;
-	/**创建人*/
-	private java.lang.String createBy;
-	/**创建时间*/
-	private java.util.Date createTime;
-	/**修改人*/
-	private java.lang.String updateBy;
-	/**修改时间*/
-	private java.util.Date updateTime;
-	
-	@ExcelCollection(name="客户")
-	private List<JeecgOrderCustomer> jeecgOrderCustomerList;
-	@ExcelCollection(name="机票")
-	private List<JeecgOrderTicket> jeecgOrderTicketList;
-	
-}

+ 0 - 40
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/demo/xxljob/TestJobHandler.java

@@ -1,40 +0,0 @@
-//
-//package org.jeecg.modules.demo.xxljob;
-//
-//import com.xxl.job.core.biz.model.ReturnT;
-//import com.xxl.job.core.handler.annotation.XxlJob;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.stereotype.Component;
-//
-//
-///**
-// * xxl-job定时任务测试
-// */
-//@Component
-//@Slf4j
-//public class TestJobHandler {
-//
-//
-//    /**
-//     * 简单任务
-//     *
-//     * @param params
-//     * @return
-//     */
-//
-//    @XxlJob(value = "testJob")
-//    public ReturnT<String> demoJobHandler(String params) {
-//        log.info("我是demo服务里的定时任务testJob,我执行了...............................");
-//        return ReturnT.SUCCESS;
-//    }
-//
-//    public void init() {
-//        log.info("init");
-//    }
-//
-//    public void destroy() {
-//        log.info("destory");
-//    }
-//
-//}
-//

+ 0 - 406
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java

@@ -1,406 +0,0 @@
-package org.jeecg.modules.dlglong.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.MatchTypeEnum;
-import org.jeecg.common.system.query.QueryCondition;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.constant.VXESocketConst;
-import org.jeecg.modules.demo.mock.vxe.websocket.VXESocket;
-import org.jeecg.modules.dlglong.entity.MockEntity;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLDecoder;
-import java.util.*;
-
-@Slf4j
-@RestController
-@RequestMapping("/mock/dlglong")
-public class DlMockController {
-
-    /**
-     * 模拟更改状态
-     *
-     * @param id
-     * @param status
-     * @return
-     */
-    @GetMapping("/change1")
-    public Result mockChange1(@RequestParam("id") String id, @RequestParam("status") String status) {
-        /* id 为 行的id(rowId),只要获取到rowId,那么只需要调用 VXESocket.sendMessageToAll() 即可 */
-
-        // 封装行数据
-        JSONObject rowData = new JSONObject();
-        // 这个字段就是要更改的行数据ID
-        rowData.put("id", id);
-        // 这个字段就是要更改的列的key和具体的值
-        rowData.put("status", status);
-        // 模拟更改数据
-        this.mockChange(rowData);
-
-        return Result.ok();
-    }
-
-    /**
-     * 模拟更改拖轮状态
-     *
-     * @param id
-     * @param tug_status
-     * @return
-     */
-    @GetMapping("/change2")
-    public Result mockChange2(@RequestParam("id") String id, @RequestParam("tug_status") String tug_status) {
-        /* id 为 行的id(rowId),只要获取到rowId,那么只需要调用 VXESocket.sendMessageToAll() 即可 */
-
-        // 封装行数据
-        JSONObject rowData = new JSONObject();
-        // 这个字段就是要更改的行数据ID
-        rowData.put("id", id);
-        // 这个字段就是要更改的列的key和具体的值
-        JSONObject tugStatus = JSON.parseObject(tug_status);
-        rowData.put("tug_status", tugStatus);
-        // 模拟更改数据
-        this.mockChange(rowData);
-
-        return Result.ok();
-    }
-
-    /**
-     * 模拟更改进度条状态
-     *
-     * @param id
-     * @param progress
-     * @return
-     */
-    @GetMapping("/change3")
-    public Result mockChange3(@RequestParam("id") String id, @RequestParam("progress") String progress) {
-        /* id 为 行的id(rowId),只要获取到rowId,那么只需要调用 VXESocket.sendMessageToAll() 即可 */
-
-        // 封装行数据
-        JSONObject rowData = new JSONObject();
-        // 这个字段就是要更改的行数据ID
-        rowData.put("id", id);
-        // 这个字段就是要更改的列的key和具体的值
-        rowData.put("progress", progress);
-        // 模拟更改数据
-        this.mockChange(rowData);
-
-        return Result.ok();
-    }
-
-    private void mockChange(JSONObject rowData) {
-        // 封装socket数据
-        JSONObject socketData = new JSONObject();
-        // 这里的 socketKey 必须要和调度计划页面上写的 socketKey 属性保持一致
-        socketData.put("socketKey", "page-dispatch");
-        // 这里的 args 必须得是一个数组,下标0是行数据,下标1是caseId,一般不用传
-        socketData.put("args", new Object[]{rowData, ""});
-        // 封装消息字符串,这里的 type 必须是 VXESocketConst.TYPE_UVT
-        String message = VXESocket.packageMessage(VXESocketConst.TYPE_UVT, socketData);
-        // 调用 sendMessageToAll 发送给所有在线的用户
-        VXESocket.sendMessageToAll(message);
-    }
-
-    /**
-     * 模拟更改【大船待审】状态
-     *
-     * @param status
-     * @return
-     */
-    @GetMapping("/change4")
-    public Result mockChange4(@RequestParam("status") String status) {
-        // 封装socket数据
-        JSONObject socketData = new JSONObject();
-        // 这里的 key 是前端注册时使用的key,必须保持一致
-        socketData.put("key", "dispatch-dcds-status");
-        // 这里的 args 必须得是一个数组,每一位都是注册方法的参数,按顺序传递
-        socketData.put("args", new Object[]{status});
-
-        // 封装消息字符串,这里的 type 必须是 VXESocketConst.TYPE_UVT
-        String message = VXESocket.packageMessage(VXESocketConst.TYPE_CSD, socketData);
-        // 调用 sendMessageToAll 发送给所有在线的用户
-        VXESocket.sendMessageToAll(message);
-
-        return Result.ok();
-    }
-
-    /**
-     * 【模拟】即时保存单行数据
-     *
-     * @param rowData 行数据,实际使用时可以替换成一个实体类
-     */
-    @PutMapping("/immediateSaveRow")
-    public Result mockImmediateSaveRow(@RequestBody JSONObject rowData) throws Exception {
-        log.info("即时保存.rowData:" + rowData.toJSONString());
-        // 延时1.5秒,模拟网慢堵塞真实感
-        Thread.sleep(500);
-        return Result.ok();
-    }
-
-    /**
-     * 【模拟】即时保存整个表格的数据
-     *
-     * @param tableData 表格数据(实际使用时可以替换成一个List实体类)
-     */
-    @PostMapping("/immediateSaveAll")
-    public Result mockImmediateSaveAll(@RequestBody JSONArray tableData) throws Exception {
-        // 【注】:
-        // 1、tableData里包含该页所有的数据
-        // 2、如果你实现了“即时保存”,那么除了新增的数据,其他的都是已经保存过的了,
-        //    不需要再进行一次update操作了,所以可以在前端传数据的时候就遍历判断一下,
-        //    只传新增的数据给后台insert即可,否者将会造成性能上的浪费。
-        // 3、新增的行是没有id的,通过这一点,就可以判断是否是新增的数据
-
-        log.info("即时保存.tableData:" + tableData.toJSONString());
-        // 延时1.5秒,模拟网慢堵塞真实感
-        Thread.sleep(1000);
-        return Result.ok();
-    }
-
-    /**
-     * 获取模拟数据
-     *
-     * @param pageNo   页码
-     * @param pageSize 页大小
-     * @param parentId 父ID,不传则查询顶级
-     * @return
-     */
-    @GetMapping("/getData")
-    public Result getMockData(
-            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-            // 父级id,根据父级id查询子级,如果为空则查询顶级
-            @RequestParam(name = "parentId", required = false) String parentId
-    ) {
-        // 模拟JSON数据路径
-        String path = "classpath:org/jeecg/modules/dlglong/json/dlglong.json";
-        // 读取JSON数据
-        JSONArray dataList = readJsonData(path);
-        if (dataList == null) {
-            return Result.error("读取数据失败!");
-        }
-        IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
-        return Result.ok(page);
-    }
-
-    /**
-     * 获取模拟“调度计划”页面的数据
-     *
-     * @param pageNo   页码
-     * @param pageSize 页大小
-     * @param parentId 父ID,不传则查询顶级
-     * @return
-     */
-    @GetMapping("/getDdjhData")
-    public Result getMockDdjhData(
-            // SpringMVC 会自动将参数注入到实体里
-            MockEntity mockEntity,
-            @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-            @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-            // 父级id,根据父级id查询子级,如果为空则查询顶级
-            @RequestParam(name = "parentId", required = false) String parentId,
-            @RequestParam(name = "status", required = false) String status,
-            // 高级查询条件
-            @RequestParam(name = "superQueryParams", required = false) String superQueryParams,
-            // 高级查询模式
-            @RequestParam(name = "superQueryMatchType", required = false) String superQueryMatchType,
-            HttpServletRequest request
-    ) {
-        // 获取查询条件(前台传递的查询参数)
-        Map<String, String[]> parameterMap = request.getParameterMap();
-        // 遍历输出到控制台
-        log.info("\ngetDdjhData - 普通查询条件:");
-        for (String key : parameterMap.keySet()) {
-            log.info("-- " + key + ": " + JSON.toJSONString(parameterMap.get(key)));
-        }
-        // 输出高级查询
-        try {
-            log.info("\ngetDdjhData - 高级查询条件:");
-            // 高级查询模式
-            MatchTypeEnum matchType = MatchTypeEnum.getByValue(superQueryMatchType);
-            if (matchType == null) {
-                log.info("-- 高级查询模式:不识别(" + superQueryMatchType + ")");
-            } else {
-                log.info("-- 高级查询模式:" + matchType.getValue());
-            }
-            superQueryParams = URLDecoder.decode(superQueryParams, "UTF-8");
-            List<QueryCondition> conditions = JSON.parseArray(superQueryParams, QueryCondition.class);
-            if (conditions != null) {
-                for (QueryCondition condition : conditions) {
-                    log.info("-- " + JSON.toJSONString(condition));
-                }
-            } else {
-                log.info("-- 没有传递任何高级查询条件");
-            }
-        } catch (Exception e) {
-            log.error("-- 高级查询操作失败:" + superQueryParams, e);
-            e.printStackTrace();
-        }
-
-        /* 注:实际使用中不用写上面那种繁琐的代码,这里只是为了直观的输出到控制台里而写的示例,
-              使用下面这种写法更简洁方便 */
-
-        // 封装成 MyBatisPlus 能识别的 QueryWrapper,可以直接使用这个对象进行SQL筛选条件拼接
-        // 这个方法也会自动封装高级查询条件,但是高级查询参数名必须是superQueryParams和superQueryMatchType
-        QueryWrapper<MockEntity> queryWrapper = QueryGenerator.initQueryWrapper(mockEntity, parameterMap);
-        log.info("queryWrapper: " + queryWrapper.getCustomSqlSegment());
-
-        // 模拟JSON数据路径
-        String path = "classpath:org/jeecg/modules/dlglong/json/ddjh.json";
-        if ("8".equals(status)) {
-            path = "classpath:org/jeecg/modules/dlglong/json/ddjh_s8.json";
-        }
-        // 读取JSON数据
-        JSONArray dataList = readJsonData(path);
-        if (dataList == null) {
-            return Result.error("读取数据失败!");
-        }
-
-        IPage<JSONObject> page = this.queryDataPage(dataList, parentId, pageNo, pageSize);
-        // 逐行查询子表数据,用于计算拖轮状态
-        List<JSONObject> records = page.getRecords();
-        for (JSONObject record : records) {
-            Map<String, Integer> tugStatusMap = new HashMap<>();
-            String id = record.getString("id");
-            // 查询出主表的拖轮
-            String tugMain = record.getString("tug");
-            // 判断是否有值
-            if (StringUtils.isNotBlank(tugMain)) {
-                // 拖轮根据分号分割
-                String[] tugs = tugMain.split(";");
-                // 查询子表数据
-                List<JSONObject> subRecords = this.queryDataPage(dataList, id, null, null).getRecords();
-                // 遍历子表和拖轮数据,找出进行计算反推拖轮状态
-                for (JSONObject subData : subRecords) {
-                    String subTug = subData.getString("tug");
-                    if (StringUtils.isNotBlank(subTug)) {
-                        for (String tug : tugs) {
-                            if (tug.equals(subTug)) {
-                                // 计算拖轮状态逻辑
-                                int statusCode = 0;
-
-                                /* 如果有发船时间、作业开始时间、作业结束时间、回船时间,则主表中的拖轮列中的每个拖轮背景色要即时变色 */
-
-                                // 有发船时间,状态 +1
-                                String departureTime = subData.getString("departure_time");
-                                if (StringUtils.isNotBlank(departureTime)) {
-                                    statusCode += 1;
-                                }
-                                // 有作业开始时间,状态 +1
-                                String workBeginTime = subData.getString("work_begin_time");
-                                if (StringUtils.isNotBlank(workBeginTime)) {
-                                    statusCode += 1;
-                                }
-                                // 有作业结束时间,状态 +1
-                                String workEndTime = subData.getString("work_end_time");
-                                if (StringUtils.isNotBlank(workEndTime)) {
-                                    statusCode += 1;
-                                }
-                                // 有回船时间,状态 +1
-                                String returnTime = subData.getString("return_time");
-                                if (StringUtils.isNotBlank(returnTime)) {
-                                    statusCode += 1;
-                                }
-                                // 保存拖轮状态,key是拖轮的值,value是状态,前端根据不同的状态码,显示不同的颜色,这个颜色也可以后台计算完之后返回给前端直接使用
-                                tugStatusMap.put(tug, statusCode);
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-            // 新加一个字段用于保存拖轮状态,不要直接覆盖原来的,这个字段可以不保存到数据库里
-            record.put("tug_status", tugStatusMap);
-        }
-        page.setRecords(records);
-        return Result.ok(page);
-    }
-
-    /**
-     * 模拟查询数据,可以根据父ID查询,可以分页
-     *
-     * @param dataList 数据列表
-     * @param parentId 父ID
-     * @param pageNo   页码
-     * @param pageSize 页大小
-     * @return
-     */
-    private IPage<JSONObject> queryDataPage(JSONArray dataList, String parentId, Integer pageNo, Integer pageSize) {
-        // 根据父级id查询子级
-        JSONArray dataDB = dataList;
-        if (StringUtils.isNotBlank(parentId)) {
-            JSONArray results = new JSONArray();
-            List<String> parentIds = Arrays.asList(parentId.split(","));
-            this.queryByParentId(dataDB, parentIds, results);
-            dataDB = results;
-        }
-        // 模拟分页(实际中应用SQL自带的分页)
-        List<JSONObject> records = new ArrayList<>();
-        IPage<JSONObject> page;
-        long beginIndex, endIndex;
-        // 如果任意一个参数为null,则不分页
-        if (pageNo == null || pageSize == null) {
-            page = new Page<>(0, dataDB.size());
-            beginIndex = 0;
-            endIndex = dataDB.size();
-        } else {
-            page = new Page<>(pageNo, pageSize);
-            beginIndex = page.offset();
-            endIndex = page.offset() + page.getSize();
-        }
-        for (long i = beginIndex; (i < endIndex && i < dataDB.size()); i++) {
-            JSONObject data = dataDB.getJSONObject((int) i);
-            data = JSON.parseObject(data.toJSONString());
-            // 不返回 children
-            data.remove("children");
-            records.add(data);
-        }
-        page.setRecords(records);
-        page.setTotal(dataDB.size());
-        return page;
-    }
-
-    private void queryByParentId(JSONArray dataList, List<String> parentIds, JSONArray results) {
-        for (int i = 0; i < dataList.size(); i++) {
-            JSONObject data = dataList.getJSONObject(i);
-            JSONArray children = data.getJSONArray("children");
-            // 找到了该父级
-            if (parentIds.contains(data.getString("id"))) {
-                if (children != null) {
-                    // addAll 的目的是将多个子表的数据合并在一起
-                    results.addAll(children);
-                }
-            } else {
-                if (children != null) {
-                    queryByParentId(children, parentIds, results);
-                }
-            }
-        }
-        results.addAll(new JSONArray());
-    }
-
-    private JSONArray readJsonData(String path) {
-        try {
-            InputStream stream = getClass().getClassLoader().getResourceAsStream(path.replace("classpath:", ""));
-            if (stream != null) {
-                String json = IOUtils.toString(stream, "UTF-8");
-                return JSON.parseArray(json);
-            }
-        } catch (IOException e) {
-            log.error(e.getMessage(), e);
-        }
-        return null;
-    }
-
-}

+ 0 - 20
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/entity/MockEntity.java

@@ -1,20 +0,0 @@
-package org.jeecg.modules.dlglong.entity;
-
-import lombok.Data;
-
-/**
- * 模拟实体
- */
-@Data
-public class MockEntity {
-
-    // id
-    private String id;
-    // 父级ID
-    private String parentId;
-    // 状态
-    private String status;
-
-    /* -- 省略其他字段 -- */
-
-}

文件差异内容过多而无法显示
+ 0 - 155907
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh.json


文件差异内容过多而无法显示
+ 0 - 1550
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/json/ddjh_s8.json


文件差异内容过多而无法显示
+ 0 - 1
jeecg-boot-module-demo/src/main/java/org/jeecg/modules/dlglong/json/dlglong.json


+ 0 - 7
jeecg-boot-module-demo/src/main/resources/application.yml

@@ -1,7 +0,0 @@
-server:
-  port: 7002
-spring:
-  application:
-    name: jeecg-demo
-  main:
-    allow-bean-definition-overriding: true

文件差异内容过多而无法显示
+ 0 - 3360
jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/css/easyui.css


文件差异内容过多而无法显示
+ 0 - 1225
jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/css/jquery-ui.css


+ 0 - 66
jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/css/main_design1.css

@@ -1,66 +0,0 @@
-body,html{width:100%;height:100%;margin:0px;padding:0px;font-size:12px;color:#555;background-color:#000;font-family:'微软雅黑'}
-#main{width:4352px;height:1536px;display:inline-block; background:url(../images/screenbg_design1.jpg) left top no-repeat}
-
-/*年月日文字*/
-#currentYear{width:213px;height:107px;position:absolute;left:430px;top:100px;color:#FFF;font-size:36px; font-family:'微软雅黑';text-align:center}
-#currentMonth{width:213px;height:107px;position:absolute;left:1504px;top:75px;color:#FFF;font-size:36px; font-family:'微软雅黑';text-align:center}
-#currentDay{width:213px;height:107px;position:absolute;left:2574px;top:100px;color:#FFF;font-size:36px; font-family:'微软雅黑';text-align:center}
-
-/*年的进度条*/
-#y_gauge1{width:250px;height:250px;position:absolute;left:60px;top:200px;}
-#y_gauge2{width:250px;height:250px;position:absolute;left:290px;top:200px;}
-#y_gauge3{width:250px;height:250px;position:absolute;left:530px;top:200px;}
-#y_gauge4{width:250px;height:250px;position:absolute;left:770px;top:200px;}
-
-/*月的进度条*/
-#m_gauge1{width:250px;height:250px;position:absolute;left:1140px;top:130px;}
-#m_gauge2{width:250px;height:250px;position:absolute;left:1370px;top:130px;}
-#m_gauge3{width:250px;height:250px;position:absolute;left:1610px;top:130px;}
-#m_gauge4{width:250px;height:250px;position:absolute;left:1850px;top:130px;}
-
-/*日的进度条*/
-#d_gauge1{width:250px;height:250px;position:absolute;left:2210px;top:200px;}
-#d_gauge2{width:250px;height:250px;position:absolute;left:2440px;top:200px;}
-#d_gauge3{width:250px;height:250px;position:absolute;left:2680px;top:200px;}
-#d_gauge4{width:250px;height:250px;position:absolute;left:2920px;top:200px;}
-
-/*监控的仪表盘*/
-#gauge1{width:250px;height:250px;position:absolute;left:2200px;top:1050px;}
-#gauge2{width:250px;height:250px;position:absolute;left:2550px;top:1050px;}
-#gauge3{width:250px;height:250px;position:absolute;left:2910px;top:1050px;}
-#gauge4{width:250px;height:250px;position:absolute;left:2380px;top:1190px;}
-#gauge5{width:250px;height:250px;position:absolute;left:2730px;top:1190px;}
-
-/*仪表盘文字*/
-.gaugeTitle{width:250px;height:40px;position:absolute;left:0px;top:200px;color:#B7E1FF;font-size:24px;display:inline-block;text-align:center;font-family:Arial;}
-
-/*地图*/
-#map{width:1100px;height:800px;position:absolute;left:0px;top:620px;display:inline-block;color:#E1E1E1;font-size:24px;}
-
-#plan{width:900px;height:420px;position:absolute;left:1170px;top:520px;display:inline-block;color:#E1E1E1;font-size:24px;}
-#quality{width:900px;height:420px;position:absolute;left:1170px;top:1030px;display:inline-block;color:#E1E1E1;font-size:24px;}
-
-#orderTable{width:1000px;height:430px;position:absolute;left:2160px;top:930px;display:inline-block}
-#orderTable table{width:100%;color:#666;font-size:24px}
-#orderTable table td{text-align:center;}
-#orderTable table .head{height:80px;font-size:24px;color:#FFF}
-#orderTable table .row2{color:#000}
-#orderTable table .row1{background-color:#CCC}
-
-#orderMessage{width:800px;position:absolute;left:33px;top:1420px;display:inline-block;color:#E1E1E1;font-size:24px}
-
-/*生产情况展示表*/
-#produce{width:1000px;height:380px;position:absolute;left:2190px;top:600px;display:inline-block;color:#B7E2FF;font-size:24px;}
-#produce table{width:100%;font-size:24px;}
-#produce table td{text-align:center;border:1px solid #069}
-#produce table .row1{}
-#produce table .row2{}
-
-/*视频*/
-#video{width:960px;height:540px;position:absolute;left:3280px;top:140px;display:inline-block;}
-
-/*监控视频*/
-#Monitor{width:960px;height:540px;position:absolute;left:3280px;top:940px;display:inline-block;color:#E1E1E1;font-size:24px;}
-
-/*刷新时间*/
-#refresh{width:800px;position:absolute;left:3350px;top:40px;display:inline-block;color:#FFF;font-size:24px;}

+ 0 - 62
jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/css/room.css

@@ -1,62 +0,0 @@
-body,html{width:100%;height:100%;margin:0px;padding:0px;font-size:12px;color:#555;background-color:#000;font-family:'微软雅黑'}
-#main{width:4352px;height:1536px;display:inline-block; background:url(../images/war_room_main.jpg) left top no-repeat}
-
-/*下钻按钮*/
-.contentButton{width:218px;height:100px;position:absolute;}
-.contentButton a{width:218px;height:100px;display:inline-block; background:url(../images/content_comm.png) no-repeat top left}
-.contentButton a:hover{width:218px;height:100px;display:inline-block; background:url(../images/content_down.png) no-repeat top left}
-.contentButton .a1{width:218px;height:100px;display:inline-block; background:url(../images/content_comm1.png) no-repeat top left}
-.contentButton .a1:hover{width:218px;height:100px;display:inline-block; background:url(../images/content_down1.png) no-repeat top left}
-
-/*弹出窗口*/
-#popWindow{width:2200px;height:1000px;display:inline-block;position:absolute;top:240px;left:1070px;background-color:#06274A;border:1px solid #09f}
-
-/*年的进度条*/
-#y_gauge1{width:250px;height:250px;position:absolute;left:60px;top:200px;}
-#y_gauge2{width:250px;height:250px;position:absolute;left:290px;top:200px;}
-#y_gauge3{width:250px;height:250px;position:absolute;left:530px;top:200px;}
-#y_gauge4{width:250px;height:250px;position:absolute;left:770px;top:200px;}
-
-/*螺旋DNA*/
-#orderStatus{width:1000px;height:320px;position:absolute;left:80px;top:460px;}
-
-/*监控的仪表盘*/
-#gauge1{width:250px;height:250px;position:absolute;left:2200px;top:280px;}
-#gauge2{width:250px;height:250px;position:absolute;left:2550px;top:280px;}
-#gauge3{width:250px;height:250px;position:absolute;left:2910px;top:280px;}
-#gauge4{width:250px;height:250px;position:absolute;left:2380px;top:550px;}
-#gauge5{width:250px;height:250px;position:absolute;left:2730px;top:550px;}
-
-/*仪表盘文字*/
-.gaugeTitle{width:250px;height:40px;position:absolute;left:0px;top:200px;color:#B7E1FF;font-size:24px;display:inline-block;text-align:center;font-family:Arial;}
-
-/*地图*/
-#map{width:1100px;height:800px;position:absolute;left:1080px;top:170px;display:inline-block;color:#E1E1E1;font-size:24px;}
-
-#productPie{width:1000px;height:680px;position:absolute;left:2210px;top:260px;display:inline-block;color:#E1E1E1;font-size:24px;}
-
-/*业务进展图*/
-#businessProgress{width:1000px;height:640px;position:absolute;left:3330px;top:180px;display:inline-block;color:#E1E1E1;font-size:24px;}
-
-/*计划完成情况*/
-#plan{width:1000px;height:400px;position:absolute;left:80px;top:1020px;display:inline-block;color:#E1E1E1;font-size:24px;}
-/*质量指标分析*/
-#quality{width:1000px;height:400px;position:absolute;left:1170px;top:1020px;display:inline-block;color:#E1E1E1;font-size:24px;}
-/*舆情文字云*/
-#wordCloud{width:900px;height:420px;position:absolute;left:3330px;top:1000px;display:inline-block;color:#E1E1E1;font-size:24px;}
-
-/*投诉情况展示表*/
-#produce{width:900px;height:380px;position:absolute;left:2250px;top:1050px;display:inline-block;color:#B7E2FF;font-size:24px;}
-#produce table{width:100%;font-size:24px;}
-#produce table td{text-align:center;border:1px solid #069}
-#produce table .row1{}
-#produce table .row2{}
-
-/*视频*/
-#video{width:960px;height:540px;position:absolute;left:3280px;top:140px;display:inline-block;}
-
-/*监控视频*/
-#Monitor{width:960px;height:540px;position:absolute;left:3280px;top:940px;display:inline-block;color:#E1E1E1;font-size:24px;}
-
-/*刷新时间*/
-#refresh{width:800px;position:absolute;left:3350px;top:40px;display:inline-block;color:#FFF;font-size:24px;}

二进制
jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm.png


二进制
jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/images/content_comm1.png


二进制
jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/images/content_down.png


二进制
jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/images/content_down1.png


+ 0 - 0
jeecg-boot-module-demo/src/main/resources/static/bigscreen/template1/images/index.gif


部分文件因为文件数量过多而无法显示