Home Explore Help
Sign In
ytrd-project-management
/
DC-SERVER
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

修改包名为ozs

hexiao 2 years ago
parent
58d4bb82dc
commit
b219de1fac
100 changed files with 502 additions and 513 deletions
Split View Show Diff Stats
  1. 1 1
      rpm/rpm.iml
  2. 158 158
      rpm/rpm.log
  3. 0 16
      rpm/src/main/java/com/datau/rpm/dto/data/ReportDataDTO.java
  4. 2 2
      rpm/src/main/java/com/datau/rpm/RpmApplication.java
  5. 1 1
      rpm/src/main/java/com/datau/rpm/config/DruidDataSourceConfiguration.java
  6. 1 1
      rpm/src/main/java/com/datau/rpm/config/SwaggerConfig.java
  7. 6 6
      rpm/src/main/java/com/datau/rpm/controller/ChartClassController.java
  8. 6 6
      rpm/src/main/java/com/datau/rpm/controller/MenuController.java
  9. 11 13
      rpm/src/main/java/com/datau/rpm/controller/ReportAutoViewController.java
  10. 25 25
      rpm/src/main/java/com/datau/rpm/controller/ReportController.java
  11. 2 3
      rpm/src/main/java/com/datau/rpm/controller/SystemController.java
  12. 4 4
      rpm/src/main/java/com/datau/rpm/controller/test/TestController.java
  13. 1 1
      rpm/src/main/java/com/datau/rpm/dto/KpiListColumnDTO.java
  14. 1 1
      rpm/src/main/java/com/datau/rpm/dto/MenuDTO.java
  15. 1 1
      rpm/src/main/java/com/datau/rpm/dto/MenuViewDTO.java
  16. 1 1
      rpm/src/main/java/com/datau/rpm/dto/ReportDTO.java
  17. 1 1
      rpm/src/main/java/com/datau/rpm/dto/ReportDataDTO.java
  18. 1 1
      rpm/src/main/java/com/datau/rpm/dto/ReportKPIDTO.java
  19. 1 1
      rpm/src/main/java/com/datau/rpm/dto/ReportKpiRelUserDTO.java
  20. 1 1
      rpm/src/main/java/com/datau/rpm/dto/ReportRelUserDTO.java
  21. 1 1
      rpm/src/main/java/com/datau/rpm/dto/ReportShowTypeDTO.java
  22. 1 1
      rpm/src/main/java/com/datau/rpm/dto/ReportSqlDTO.java
  23. 1 1
      rpm/src/main/java/com/datau/rpm/dto/RpmDimReportColorGroup.java
  24. 1 1
      rpm/src/main/java/com/datau/rpm/dto/RpmDimTypeAll.java
  25. 1 1
      rpm/src/main/java/com/datau/rpm/dto/RpmRelReportKpiUserDTO.java
  26. 1 1
      rpm/src/main/java/com/datau/rpm/dto/RpmRelReportUserDTO.java
  27. 1 1
      rpm/src/main/java/com/datau/rpm/dto/UserDTO.java
  28. 1 1
      rpm/src/main/java/com/datau/rpm/dto/chart/ChartClassDTO.java
  29. 1 1
      rpm/src/main/java/com/datau/rpm/dto/chart/ChartInfoDTO.java
  30. 1 1
      rpm/src/main/java/com/datau/rpm/dto/chart/ChartTypeDTO.java
  31. 1 1
      rpm/src/main/java/com/datau/rpm/dto/chart/GetChartViewDTO.java
  32. 1 1
      rpm/src/main/java/com/datau/rpm/dto/chart/ListSubjectDTO.java
  33. 1 1
      rpm/src/main/java/com/datau/rpm/dto/chart/RelSubjectChartDTO.java
  34. 1 1
      rpm/src/main/java/com/datau/rpm/dto/chart/RelSubjectChartParam.java
  35. 1 1
      rpm/src/main/java/com/datau/rpm/dto/chart/RichTextFileR.java
  36. 1 1
      rpm/src/main/java/com/datau/rpm/dto/chart/SubjectInfoDTO.java
  37. 1 1
      rpm/src/main/java/com/datau/rpm/dto/chart/SubjectPageInfoDTO.java
  38. 1 1
      rpm/src/main/java/com/datau/rpm/dto/chart/UserDTO.java
  39. 1 1
      rpm/src/main/java/com/datau/rpm/dto/data/KovDTO.java
  40. 16 0
      rpm/src/main/java/com/ozs/rpm/dto/data/ReportDataDTO.java
  41. 1 1
      rpm/src/main/java/com/datau/rpm/dto/data/barOrLine/BarOrLine.java
  42. 1 1
      rpm/src/main/java/com/datau/rpm/dto/data/barOrLine/Series.java
  43. 1 1
      rpm/src/main/java/com/datau/rpm/dto/data/barOrLine/XAxis.java
  44. 1 1
      rpm/src/main/java/com/datau/rpm/dto/data/barOrLine/YAxis.java
  45. 1 1
      rpm/src/main/java/com/datau/rpm/dto/data/pie/Pie.java
  46. 1 1
      rpm/src/main/java/com/datau/rpm/dto/data/pie/SeriesData.java
  47. 2 2
      rpm/src/main/java/com/datau/rpm/dto/data/table/Table.java
  48. 1 1
      rpm/src/main/java/com/datau/rpm/dto/data/table/TableHeader.java
  49. 1 1
      rpm/src/main/java/com/datau/rpm/dto/kpim/ColumnConfigDTO.java
  50. 1 1
      rpm/src/main/java/com/datau/rpm/dto/kpim/ComputedTypeInfoDTO.java
  51. 1 1
      rpm/src/main/java/com/datau/rpm/dto/kpim/DefinedTypeInfoDTO.java
  52. 1 1
      rpm/src/main/java/com/datau/rpm/dto/kpim/KpiConfigDTO.java
  53. 1 3
      rpm/src/main/java/com/datau/rpm/dto/kpim/KpiConfigForListDTO.java
  54. 1 1
      rpm/src/main/java/com/datau/rpm/dto/kpim/KpiConfigPO.java
  55. 1 1
      rpm/src/main/java/com/datau/rpm/dto/kpim/KpiFunctionDTO.java
  56. 1 1
      rpm/src/main/java/com/datau/rpm/dto/kpim/RelColumnConfigDTO.java
  57. 1 1
      rpm/src/main/java/com/datau/rpm/dto/kpim/RuleConfigDTO.java
  58. 1 1
      rpm/src/main/java/com/datau/rpm/dto/kpim/TopicZtreeDTO.java
  59. 1 1
      rpm/src/main/java/com/datau/rpm/dto/mdm/KpiListColumnDTO.java
  60. 1 1
      rpm/src/main/java/com/datau/rpm/dto/mdm/MdmCreateTableDTO.java
  61. 1 1
      rpm/src/main/java/com/datau/rpm/dto/mdm/MdmInfoColumn.java
  62. 1 1
      rpm/src/main/java/com/datau/rpm/dto/mdm/MdmInfoDatabase.java
  63. 1 1
      rpm/src/main/java/com/datau/rpm/dto/mdm/MdmInfoTable.java
  64. 1 1
      rpm/src/main/java/com/datau/rpm/dto/save/RelReportKpiDrillDTO.java
  65. 1 1
      rpm/src/main/java/com/datau/rpm/dto/save/RelReportOutsideParamDTO.java
  66. 1 1
      rpm/src/main/java/com/datau/rpm/dto/save/ReportKpiDrillDown.java
  67. 1 1
      rpm/src/main/java/com/datau/rpm/dto/save/RpmInfoReportChartDTO.java
  68. 1 1
      rpm/src/main/java/com/datau/rpm/dto/save/SaveFiveDTO.java
  69. 1 2
      rpm/src/main/java/com/datau/rpm/dto/save/SaveFourDTO.java
  70. 1 1
      rpm/src/main/java/com/datau/rpm/dto/save/SaveOneDTO.java
  71. 1 1
      rpm/src/main/java/com/datau/rpm/dto/save/SaveReportDTO.java
  72. 1 1
      rpm/src/main/java/com/datau/rpm/dto/save/SaveRportKpiDTO.java
  73. 1 1
      rpm/src/main/java/com/datau/rpm/dto/save/SaveThreeDTO.java
  74. 1 1
      rpm/src/main/java/com/datau/rpm/dto/save/SaveTwoDTO.java
  75. 3 3
      rpm/src/main/java/com/datau/rpm/dto/util/ChartParameterDTO.java
  76. 1 1
      rpm/src/main/java/com/datau/rpm/dto/util/SqlDTO.java
  77. 1 1
      rpm/src/main/java/com/datau/rpm/dto/view/GroupKpiViewDTO.java
  78. 1 1
      rpm/src/main/java/com/datau/rpm/dto/view/ReportGroupKpiDTO.java
  79. 4 4
      rpm/src/main/java/com/datau/rpm/dto/view/ReportViewDTO.java
  80. 1 1
      rpm/src/main/java/com/datau/rpm/dto/view/ReportViewDataParam.java
  81. 1 1
      rpm/src/main/java/com/datau/rpm/dto/view/ReportViewPieDTO.java
  82. 1 1
      rpm/src/main/java/com/datau/rpm/dto/view/ReportViewQueryDTO.java
  83. 2 3
      rpm/src/main/java/com/datau/rpm/mapper/ChartClassMapper.java
  84. 2 2
      rpm/src/main/java/com/datau/rpm/mapper/MenuMapper.java
  85. 7 7
      rpm/src/main/java/com/datau/rpm/mapper/ReportAutoViewMapper.java
  86. 21 21
      rpm/src/main/java/com/datau/rpm/mapper/ReportMapper.java
  87. 3 3
      rpm/src/main/java/com/datau/rpm/service/ChartClassService.java
  88. 6 6
      rpm/src/main/java/com/datau/rpm/service/MenuService.java
  89. 4 5
      rpm/src/main/java/com/datau/rpm/service/ReportAutoViewService.java
  90. 3 3
      rpm/src/main/java/com/datau/rpm/service/ReportDataAllService.java
  91. 2 2
      rpm/src/main/java/com/datau/rpm/service/ReportDataService.java
  92. 21 21
      rpm/src/main/java/com/datau/rpm/service/ReportService.java
  93. 6 6
      rpm/src/main/java/com/datau/rpm/service/impl/ChartClassServiceImpl.java
  94. 9 9
      rpm/src/main/java/com/datau/rpm/service/impl/MenuServiceImpl.java
  95. 25 27
      rpm/src/main/java/com/datau/rpm/service/impl/ReportAutoViewServiceImpl.java
  96. 4 4
      rpm/src/main/java/com/datau/rpm/service/impl/ReportDataAllServiceImpl.java
  97. 19 19
      rpm/src/main/java/com/datau/rpm/service/impl/ReportDataServiceImpl.java
  98. 11 11
      rpm/src/main/java/com/datau/rpm/service/impl/ReportDataServiceImplUtil.java
  99. 49 50
      rpm/src/main/java/com/datau/rpm/service/impl/ReportServiceImpl.java
  100. 0 0
      rpm/src/main/java/com/datau/rpm/service/impl/ReportServiceImplUtil.java

+ 1 - 1
rpm/rpm.iml
View File 

@@ -215,7 +215,7 @@
 
     <orderEntry type="module-library">
 
       <library name="Maven: jdk.tools:jdk.tools:1.8">
 
         <CLASSES>
 
-          <root url="jar://$MODULE_DIR$/../../../../Program Files/Java/jdk1.8.0_181/lib/tools.jar!/" />
 
+          <root url="jar://$MODULE_DIR$/../../../Program Files/Java/jdk1.8.0_181/lib/tools.jar!/" />
 
         </CLASSES>
 
         <JAVADOC />
 
         <SOURCES />

+ 158 - 158
rpm/rpm.log
View File 

@@ -1,4 +1,4 @@
 
-2022-12-22 14:01:57,804 [main] INFO  com.datau.rpm.RpmApplication:659 - No active profile set, falling back to default profiles: default
 
+2022-12-22 14:01:57,804 [main] INFO  RpmApplication:659 - No active profile set, falling back to default profiles: default
 
 2022-12-22 14:01:57,822 [main] INFO  o.s.b.w.s.c.AnnotationConfigServletWebServerApplicationContext:590 - Refreshing org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext@627d8516: startup date [Thu Dec 22 14:01:57 CST 2022]; parent: org.springframework.context.annotation.AnnotationConfigApplicationContext@12bcd0c0
 
 2022-12-22 14:01:58,606 [main] INFO  o.s.d.r.config.RepositoryConfigurationDelegate:163 - Multiple Spring Data modules found, entering strict repository configuration mode!
 
 2022-12-22 14:01:58,964 [main] INFO  o.springframework.cloud.context.scope.GenericScope:294 - BeanFactory id=a42253b8-2f7b-3509-a4ab-1f119183bdd3
 
@@ -28,56 +28,56 @@
 
 2022-12-22 14:02:02,227 [main] INFO  o.s.b.f.a.AutowiredAnnotationBeanPostProcessor:154 - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
 
 2022-12-22 14:02:02,276 [main] INFO  o.s.c.a.AnnotationConfigApplicationContext:590 - Refreshing FeignContext-mdm: startup date [Thu Dec 22 14:02:02 CST 2022]; parent: org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext@627d8516
 
 2022-12-22 14:02:02,288 [main] INFO  o.s.b.f.a.AutowiredAnnotationBeanPostProcessor:154 - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
 
-2022-12-22 14:02:02,693 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.chart.ChartClassDTO> com.datau.rpm.controller.ChartClassController.getChartClass(java.lang.String)
 
-2022-12-22 14:02:02,694 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ChartClassController.saveChartClass(com.datau.rpm.dto.chart.ChartClassDTO,java.lang.String)
 
-2022-12-22 14:02:02,694 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[DELETE]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ChartClassController.removeChartClass(java.lang.String)
 
-2022-12-22 14:02:02,695 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[PUT]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ChartClassController.updateChartClass(com.datau.rpm.dto.chart.ChartClassDTO,java.lang.String,java.lang.String)
 
-2022-12-22 14:02:02,695 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/tree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.chart.ChartClassDTO>> com.datau.rpm.controller.ChartClassController.listChartClassTree(java.lang.String)
 
-2022-12-22 14:02:02,696 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.MenuDTO> com.datau.rpm.controller.MenuController.getMenu(java.lang.String)
 
-2022-12-22 14:02:02,696 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/tree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.MenuDTO>> com.datau.rpm.controller.MenuController.getMenuTree(java.lang.String)
 
-2022-12-22 14:02:02,697 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[DELETE]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.MenuController.removeMenu(java.lang.String)
 
-2022-12-22 14:02:02,697 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.MenuController.saveMenu(com.datau.rpm.dto.MenuDTO,java.lang.String)
 
-2022-12-22 14:02:02,697 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[PUT]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.MenuController.updateMenu(com.datau.rpm.dto.MenuDTO,java.lang.String,java.lang.String)
 
-2022-12-22 14:02:02,698 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/leafTree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.MenuDTO>> com.datau.rpm.controller.MenuController.listMenuTreeOnlyLeaf(java.lang.String,java.lang.String)
 
-2022-12-22 14:02:02,699 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/getReportData],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.data.ReportDataDTO> com.datau.rpm.controller.ReportAutoViewController.getReportData(com.datau.rpm.dto.view.ReportViewDataParam,java.lang.String)
 
-2022-12-22 14:02:02,699 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/view/{id}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.view.ReportViewDTO> com.datau.rpm.controller.ReportAutoViewController.reportView(java.lang.String,java.lang.String)
 
-2022-12-22 14:02:02,699 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByUserAndMenu],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportAutoViewController.listReportByUserAndMenu(java.lang.String,java.lang.String)
 
-2022-12-22 14:02:02,700 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/downloadReportFile],methods=[POST],produces=[application/octet-stream]}" onto public void com.datau.rpm.controller.ReportAutoViewController.downloadReportFile(com.datau.rpm.dto.view.ReportViewDataParam,java.lang.String,javax.servlet.http.HttpServletResponse)
 
-2022-12-22 14:02:02,704 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/status/{id}],methods=[PUT]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.updateStatus(java.lang.String,com.datau.rpm.dto.ReportDTO)
 
-2022-12-22 14:02:02,704 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/list],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listReport(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.String,java.lang.String)
 
-2022-12-22 14:02:02,704 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[DELETE]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.removeReport(java.lang.String)
 
-2022-12-22 14:02:02,705 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listType/{typeId}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.RpmDimTypeAll>> com.datau.rpm.controller.ReportController.listReportType(java.lang.Integer)
 
-2022-12-22 14:02:02,705 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/topicForZtree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.kpim.TopicZtreeDTO>> com.datau.rpm.controller.ReportController.topicForZtree(java.lang.String) throws java.lang.Exception
 
-2022-12-22 14:02:02,705 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveOne],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveOne(com.datau.rpm.dto.save.SaveOneDTO,java.lang.String)
 
-2022-12-22 14:02:02,705 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveTwo],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveTwo(com.datau.rpm.dto.save.SaveTwoDTO,java.lang.String)
 
-2022-12-22 14:02:02,706 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveThree],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveThree(com.datau.rpm.dto.save.SaveThreeDTO,java.lang.String)
 
-2022-12-22 14:02:02,706 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFour],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveFour(com.datau.rpm.dto.save.SaveFourDTO,java.lang.String)
 
-2022-12-22 14:02:02,706 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFive],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveFive(com.datau.rpm.dto.save.SaveFiveDTO,java.lang.String)
 
-2022-12-22 14:02:02,706 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listSonReport],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listSonReport()
 
-2022-12-22 14:02:02,707 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listUser],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.UserDTO>> com.datau.rpm.controller.ReportController.listUser()
 
-2022-12-22 14:02:02,707 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadChartFile],methods=[POST],consumes=[multipart/form-data || multipart/*]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.loadChartFile(org.springframework.web.multipart.MultipartFile,java.lang.String)
 
-2022-12-22 14:02:02,707 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportRelUsers],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.reportRelUsers(com.datau.rpm.dto.ReportRelUserDTO)
 
-2022-12-22 14:02:02,707 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportsRelUsers],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.reportsRelUsers(com.datau.rpm.dto.ReportRelUserDTO)
 
-2022-12-22 14:02:02,708 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listDatabase],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.mdm.MdmInfoDatabase>> com.datau.rpm.controller.ReportController.listDatabase(java.lang.String)
 
-2022-12-22 14:02:02,708 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/getDML],methods=[GET]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.getDML(java.lang.String,java.lang.String)
 
-2022-12-22 14:02:02,708 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listPReport],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listParentReport(java.lang.String)
 
-2022-12-22 14:02:02,708 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartType],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.chart.ChartTypeDTO>> com.datau.rpm.controller.ReportController.listChartType()
 
-2022-12-22 14:02:02,709 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveSix],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.saveSix(com.datau.rpm.dto.save.SaveReportDTO,java.lang.String)
 
-2022-12-22 14:02:02,709 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByMenu],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listReportByMenu(java.lang.String)
 
-2022-12-22 14:02:02,709 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listRelUser/{id}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportKpiRelUserDTO>> com.datau.rpm.controller.ReportController.listRelUser(java.lang.String)
 
-2022-12-22 14:02:02,709 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadRichTextFile],methods=[POST],consumes=[multipart/form-data || multipart/*],produces=[application/json;charset=UTF-8]}" onto public com.datau.rpm.dto.chart.RichTextFileR com.datau.rpm.controller.ReportController.uploadRichTextFile(org.springframework.web.multipart.MultipartFile,java.lang.String,java.lang.String,javax.servlet.http.HttpServletResponse)
 
-2022-12-22 14:02:02,710 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.getReportInfoById(java.lang.String)
 
-2022-12-22 14:02:02,710 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportAndUser],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportKPIDTO>> com.datau.rpm.controller.ReportController.listKpiByReportAndUser(java.lang.String,java.lang.String)
 
-2022-12-22 14:02:02,710 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listColumnByTableId],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.mdm.MdmInfoColumn>> com.datau.rpm.controller.ReportController.listColumnByTableId(java.lang.String)
 
-2022-12-22 14:02:02,710 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiConfigs/{topicId}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.kpim.KpiConfigForListDTO>> com.datau.rpm.controller.ReportController.listKpiConfigsByTopic(java.lang.String)
 
-2022-12-22 14:02:02,711 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listTableByDatabaseId],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.mdm.MdmInfoTable>> com.datau.rpm.controller.ReportController.listTableByDatabaseId(java.lang.String)
 
-2022-12-22 14:02:02,711 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportId/{reportId}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportKPIDTO>> com.datau.rpm.controller.ReportController.listKpiByReportId(java.lang.String)
 
-2022-12-22 14:02:02,711 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/system/usedKPI/{kpi}],methods=[GET]}" onto int com.datau.rpm.controller.SystemController.usedKPI(java.lang.String)
 
-2022-12-22 14:02:02,714 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/test],methods=[GET]}" onto public java.lang.String com.datau.rpm.controller.test.TestController.test()
 
-2022-12-22 14:02:02,714 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/getReoprt],methods=[GET]}" onto public com.alibaba.fastjson.JSON com.datau.rpm.controller.test.TestController.getReoprt(java.lang.String,int)
 
-2022-12-22 14:02:02,715 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReportSql],methods=[GET]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.test.TestController.saveReportSql(java.lang.String)
 
-2022-12-22 14:02:02,715 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReport],methods=[POST]}" onto public com.alibaba.fastjson.JSON com.datau.rpm.controller.test.TestController.saveReport(com.alibaba.fastjson.JSONObject)
 
-2022-12-22 14:02:02,715 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/updateReport],methods=[PUT]}" onto public com.alibaba.fastjson.JSON com.datau.rpm.controller.test.TestController.updateReport(com.alibaba.fastjson.JSONObject)
 
+2022-12-22 14:02:02,693 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[GET]}" onto public R<ChartClassDTO> ChartClassController.getChartClass(java.lang.String)
 
+2022-12-22 14:02:02,694 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass],methods=[POST]}" onto public R<java.lang.String> ChartClassController.saveChartClass(ChartClassDTO,java.lang.String)
 
+2022-12-22 14:02:02,694 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[DELETE]}" onto public R<java.lang.String> ChartClassController.removeChartClass(java.lang.String)
 
+2022-12-22 14:02:02,695 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[PUT]}" onto public R<java.lang.String> ChartClassController.updateChartClass(ChartClassDTO,java.lang.String,java.lang.String)
 
+2022-12-22 14:02:02,695 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/tree],methods=[GET]}" onto public R<java.util.List<ChartClassDTO>> ChartClassController.listChartClassTree(java.lang.String)
 
+2022-12-22 14:02:02,696 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[GET]}" onto public R<MenuDTO> MenuController.getMenu(java.lang.String)
 
+2022-12-22 14:02:02,696 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/tree],methods=[GET]}" onto public R<java.util.List<MenuDTO>> MenuController.getMenuTree(java.lang.String)
 
+2022-12-22 14:02:02,697 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[DELETE]}" onto public R<java.lang.String> MenuController.removeMenu(java.lang.String)
 
+2022-12-22 14:02:02,697 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu],methods=[POST]}" onto public R<java.lang.String> MenuController.saveMenu(MenuDTO,java.lang.String)
 
+2022-12-22 14:02:02,697 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[PUT]}" onto public R<java.lang.String> MenuController.updateMenu(MenuDTO,java.lang.String,java.lang.String)
 
+2022-12-22 14:02:02,698 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/leafTree],methods=[GET]}" onto public R<java.util.List<MenuDTO>> MenuController.listMenuTreeOnlyLeaf(java.lang.String,java.lang.String)
 
+2022-12-22 14:02:02,699 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/getReportData],methods=[POST]}" onto public R<ReportDataDTO> ReportAutoViewController.getReportData(ReportViewDataParam,java.lang.String)
 
+2022-12-22 14:02:02,699 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/view/{id}],methods=[GET]}" onto public R<ReportViewDTO> ReportAutoViewController.reportView(java.lang.String,java.lang.String)
 
+2022-12-22 14:02:02,699 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByUserAndMenu],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportAutoViewController.listReportByUserAndMenu(java.lang.String,java.lang.String)
 
+2022-12-22 14:02:02,700 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/downloadReportFile],methods=[POST],produces=[application/octet-stream]}" onto public void ReportAutoViewController.downloadReportFile(ReportViewDataParam,java.lang.String,javax.servlet.http.HttpServletResponse)
 
+2022-12-22 14:02:02,704 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/status/{id}],methods=[PUT]}" onto public R<java.lang.String> ReportController.updateStatus(java.lang.String,ReportDTO)
 
+2022-12-22 14:02:02,704 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/list],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listReport(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.String,java.lang.String)
 
+2022-12-22 14:02:02,704 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[DELETE]}" onto public R<java.lang.String> ReportController.removeReport(java.lang.String)
 
+2022-12-22 14:02:02,705 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listType/{typeId}],methods=[GET]}" onto public R<java.util.List<RpmDimTypeAll>> ReportController.listReportType(java.lang.Integer)
 
+2022-12-22 14:02:02,705 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/topicForZtree],methods=[GET]}" onto public R<java.util.List<TopicZtreeDTO>> ReportController.topicForZtree(java.lang.String) throws java.lang.Exception
 
+2022-12-22 14:02:02,705 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveOne],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveOne(SaveOneDTO,java.lang.String)
 
+2022-12-22 14:02:02,705 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveTwo],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveTwo(SaveTwoDTO,java.lang.String)
 
+2022-12-22 14:02:02,706 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveThree],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveThree(SaveThreeDTO,java.lang.String)
 
+2022-12-22 14:02:02,706 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFour],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveFour(SaveFourDTO,java.lang.String)
 
+2022-12-22 14:02:02,706 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFive],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveFive(SaveFiveDTO,java.lang.String)
 
+2022-12-22 14:02:02,706 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listSonReport],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listSonReport()
 
+2022-12-22 14:02:02,707 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listUser],methods=[GET]}" onto public R<java.util.List<UserDTO>> ReportController.listUser()
 
+2022-12-22 14:02:02,707 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadChartFile],methods=[POST],consumes=[multipart/form-data || multipart/*]}" onto public R<java.lang.String> ReportController.loadChartFile(org.springframework.web.multipart.MultipartFile,java.lang.String)
 
+2022-12-22 14:02:02,707 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportRelUsers],methods=[POST]}" onto public R<java.lang.String> ReportController.reportRelUsers(ReportRelUserDTO)
 
+2022-12-22 14:02:02,707 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportsRelUsers],methods=[POST]}" onto public R<java.lang.String> ReportController.reportsRelUsers(ReportRelUserDTO)
 
+2022-12-22 14:02:02,708 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listDatabase],methods=[GET]}" onto public R<java.util.List<MdmInfoDatabase>> ReportController.listDatabase(java.lang.String)
 
+2022-12-22 14:02:02,708 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/getDML],methods=[GET]}" onto public R<java.lang.String> ReportController.getDML(java.lang.String,java.lang.String)
 
+2022-12-22 14:02:02,708 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listPReport],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listParentReport(java.lang.String)
 
+2022-12-22 14:02:02,708 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartType],methods=[GET]}" onto public R<java.util.List<ChartTypeDTO>> ReportController.listChartType()
 
+2022-12-22 14:02:02,709 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveSix],methods=[POST]}" onto public R<java.lang.String> ReportController.saveSix(SaveReportDTO,java.lang.String)
 
+2022-12-22 14:02:02,709 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByMenu],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listReportByMenu(java.lang.String)
 
+2022-12-22 14:02:02,709 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listRelUser/{id}],methods=[GET]}" onto public R<java.util.List<ReportKpiRelUserDTO>> ReportController.listRelUser(java.lang.String)
 
+2022-12-22 14:02:02,709 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadRichTextFile],methods=[POST],consumes=[multipart/form-data || multipart/*],produces=[application/json;charset=UTF-8]}" onto public RichTextFileR ReportController.uploadRichTextFile(org.springframework.web.multipart.MultipartFile,java.lang.String,java.lang.String,javax.servlet.http.HttpServletResponse)
 
+2022-12-22 14:02:02,710 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[GET]}" onto public R<SaveReportDTO> ReportController.getReportInfoById(java.lang.String)
 
+2022-12-22 14:02:02,710 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportAndUser],methods=[GET]}" onto public R<java.util.List<ReportKPIDTO>> ReportController.listKpiByReportAndUser(java.lang.String,java.lang.String)
 
+2022-12-22 14:02:02,710 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listColumnByTableId],methods=[GET]}" onto public R<java.util.List<MdmInfoColumn>> ReportController.listColumnByTableId(java.lang.String)
 
+2022-12-22 14:02:02,710 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiConfigs/{topicId}],methods=[GET]}" onto public R<java.util.List<KpiConfigForListDTO>> ReportController.listKpiConfigsByTopic(java.lang.String)
 
+2022-12-22 14:02:02,711 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listTableByDatabaseId],methods=[GET]}" onto public R<java.util.List<MdmInfoTable>> ReportController.listTableByDatabaseId(java.lang.String)
 
+2022-12-22 14:02:02,711 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportId/{reportId}],methods=[GET]}" onto public R<java.util.List<ReportKPIDTO>> ReportController.listKpiByReportId(java.lang.String)
 
+2022-12-22 14:02:02,711 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/system/usedKPI/{kpi}],methods=[GET]}" onto int SystemController.usedKPI(java.lang.String)
 
+2022-12-22 14:02:02,714 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/test],methods=[GET]}" onto public java.lang.String TestController.test()
 
+2022-12-22 14:02:02,714 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/getReoprt],methods=[GET]}" onto public com.alibaba.fastjson.JSON TestController.getReoprt(java.lang.String,int)
 
+2022-12-22 14:02:02,715 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReportSql],methods=[GET]}" onto public R<java.lang.String> TestController.saveReportSql(java.lang.String)
 
+2022-12-22 14:02:02,715 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReport],methods=[POST]}" onto public com.alibaba.fastjson.JSON TestController.saveReport(com.alibaba.fastjson.JSONObject)
 
+2022-12-22 14:02:02,715 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/updateReport],methods=[PUT]}" onto public com.alibaba.fastjson.JSON TestController.updateReport(com.alibaba.fastjson.JSONObject)
 
 2022-12-22 14:02:02,718 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/swagger-resources/configuration/security]}" onto public org.springframework.http.ResponseEntity<springfox.documentation.swagger.web.SecurityConfiguration> springfox.documentation.swagger.web.ApiResourceController.securityConfiguration()
 
 2022-12-22 14:02:02,719 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/swagger-resources]}" onto public org.springframework.http.ResponseEntity<java.util.List<springfox.documentation.swagger.web.SwaggerResource>> springfox.documentation.swagger.web.ApiResourceController.swaggerResources()
 
 2022-12-22 14:02:02,720 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/swagger-resources/configuration/ui]}" onto public org.springframework.http.ResponseEntity<springfox.documentation.swagger.web.UiConfiguration> springfox.documentation.swagger.web.ApiResourceController.uiConfiguration()
 
@@ -190,7 +190,7 @@ com.sun.jersey.api.client.ClientHandlerException: java.net.ConnectException: Con
 
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:327)
 
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1255)
 
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1243)
 
-	at com.datau.rpm.RpmApplication.main(RpmApplication.java:19)
 
+	at RpmApplication.main(RpmApplication.java:19)
 
 Caused by: java.net.ConnectException: Connection refused: connect
 
 	at java.net.DualStackPlainSocketImpl.waitForConnect(Native Method)
 
 	at java.net.DualStackPlainSocketImpl.socketConnect(DualStackPlainSocketImpl.java:85)
 
@@ -265,7 +265,7 @@ com.netflix.discovery.shared.transport.TransportException: Cannot execute reques
 
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:327)
 
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1255)
 
 	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1243)
 
-	at com.datau.rpm.RpmApplication.main(RpmApplication.java:19)
 
+	at RpmApplication.main(RpmApplication.java:19)
 
 2022-12-22 14:02:09,784 [main] WARN  com.netflix.discovery.DiscoveryClient:290 - Using default backup registry implementation which does not do anything.
 
 2022-12-22 14:02:09,785 [main] INFO  com.netflix.discovery.DiscoveryClient:1264 - Starting heartbeat executor: renew interval is: 1
 
 2022-12-22 14:02:09,787 [main] INFO  com.netflix.discovery.InstanceInfoReplicator:60 - InstanceInfoReplicator onDemand update allowed rate per min is 4
 
@@ -281,7 +281,7 @@ com.netflix.discovery.shared.transport.TransportException: Cannot execute reques
 
 2022-12-22 14:02:10,624 [main] INFO  org.apache.tomcat.util.net.NioSelectorPool:180 - Using a shared selector for servlet write/read
 
 2022-12-22 14:02:10,684 [main] INFO  o.s.boot.web.embedded.tomcat.TomcatWebServer:206 - Tomcat started on port(s): 9193 (http) with context path ''
 
 2022-12-22 14:02:10,687 [main] INFO  o.s.c.n.e.s.EurekaAutoServiceRegistration:124 - Updating port to 9193
 
-2022-12-22 14:02:10,694 [main] INFO  com.datau.rpm.RpmApplication:59 - Started RpmApplication in 14.47 seconds (JVM running for 15.36)
 
+2022-12-22 14:02:10,694 [main] INFO  RpmApplication:59 - Started RpmApplication in 14.47 seconds (JVM running for 15.36)
 
 2022-12-22 14:02:11,472 [RMI TCP Connection(2)-192.168.0.103] INFO  o.a.c.core.ContainerBase.[Tomcat].[localhost].[/]:180 - Initializing Spring FrameworkServlet 'dispatcherServlet'
 
 2022-12-22 14:02:11,472 [RMI TCP Connection(2)-192.168.0.103] INFO  org.springframework.web.servlet.DispatcherServlet:494 - FrameworkServlet 'dispatcherServlet': initialization started
 
 2022-12-22 14:02:11,508 [RMI TCP Connection(2)-192.168.0.103] INFO  org.springframework.web.servlet.DispatcherServlet:509 - FrameworkServlet 'dispatcherServlet': initialization completed in 35 ms
 
@@ -1505,7 +1505,7 @@ com.netflix.discovery.shared.transport.TransportException: Cannot execute reques
 
 	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
 
 	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
 
 	at java.lang.Thread.run(Thread.java:748)
 
-2022-12-22 14:03:22,489 [main] INFO  com.datau.rpm.RpmApplication:659 - No active profile set, falling back to default profiles: default
 
+2022-12-22 14:03:22,489 [main] INFO  RpmApplication:659 - No active profile set, falling back to default profiles: default
 
 2022-12-22 14:03:22,503 [main] INFO  o.s.b.w.s.c.AnnotationConfigServletWebServerApplicationContext:590 - Refreshing org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext@3cec79d3: startup date [Thu Dec 22 14:03:22 CST 2022]; parent: org.springframework.context.annotation.AnnotationConfigApplicationContext@75c9e76b
 
 2022-12-22 14:03:23,226 [main] INFO  o.s.d.r.config.RepositoryConfigurationDelegate:163 - Multiple Spring Data modules found, entering strict repository configuration mode!
 
 2022-12-22 14:03:23,570 [main] INFO  o.springframework.cloud.context.scope.GenericScope:294 - BeanFactory id=a42253b8-2f7b-3509-a4ab-1f119183bdd3
 
@@ -1535,56 +1535,56 @@ com.netflix.discovery.shared.transport.TransportException: Cannot execute reques
 
 2022-12-22 14:03:26,332 [main] INFO  o.s.b.f.a.AutowiredAnnotationBeanPostProcessor:154 - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
 
 2022-12-22 14:03:26,383 [main] INFO  o.s.c.a.AnnotationConfigApplicationContext:590 - Refreshing FeignContext-mdm: startup date [Thu Dec 22 14:03:26 CST 2022]; parent: org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext@3cec79d3
 
 2022-12-22 14:03:26,395 [main] INFO  o.s.b.f.a.AutowiredAnnotationBeanPostProcessor:154 - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
 
-2022-12-22 14:03:26,756 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/tree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.chart.ChartClassDTO>> com.datau.rpm.controller.ChartClassController.listChartClassTree(java.lang.String)
 
-2022-12-22 14:03:26,757 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.chart.ChartClassDTO> com.datau.rpm.controller.ChartClassController.getChartClass(java.lang.String)
 
-2022-12-22 14:03:26,757 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ChartClassController.saveChartClass(com.datau.rpm.dto.chart.ChartClassDTO,java.lang.String)
 
-2022-12-22 14:03:26,757 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[PUT]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ChartClassController.updateChartClass(com.datau.rpm.dto.chart.ChartClassDTO,java.lang.String,java.lang.String)
 
-2022-12-22 14:03:26,758 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[DELETE]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ChartClassController.removeChartClass(java.lang.String)
 
-2022-12-22 14:03:26,759 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.MenuDTO> com.datau.rpm.controller.MenuController.getMenu(java.lang.String)
 
-2022-12-22 14:03:26,759 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/leafTree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.MenuDTO>> com.datau.rpm.controller.MenuController.listMenuTreeOnlyLeaf(java.lang.String,java.lang.String)
 
-2022-12-22 14:03:26,759 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/tree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.MenuDTO>> com.datau.rpm.controller.MenuController.getMenuTree(java.lang.String)
 
-2022-12-22 14:03:26,759 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[PUT]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.MenuController.updateMenu(com.datau.rpm.dto.MenuDTO,java.lang.String,java.lang.String)
 
-2022-12-22 14:03:26,760 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[DELETE]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.MenuController.removeMenu(java.lang.String)
 
-2022-12-22 14:03:26,760 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.MenuController.saveMenu(com.datau.rpm.dto.MenuDTO,java.lang.String)
 
-2022-12-22 14:03:26,761 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByUserAndMenu],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportAutoViewController.listReportByUserAndMenu(java.lang.String,java.lang.String)
 
-2022-12-22 14:03:26,761 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/downloadReportFile],methods=[POST],produces=[application/octet-stream]}" onto public void com.datau.rpm.controller.ReportAutoViewController.downloadReportFile(com.datau.rpm.dto.view.ReportViewDataParam,java.lang.String,javax.servlet.http.HttpServletResponse)
 
-2022-12-22 14:03:26,762 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/view/{id}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.view.ReportViewDTO> com.datau.rpm.controller.ReportAutoViewController.reportView(java.lang.String,java.lang.String)
 
-2022-12-22 14:03:26,762 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/getReportData],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.data.ReportDataDTO> com.datau.rpm.controller.ReportAutoViewController.getReportData(com.datau.rpm.dto.view.ReportViewDataParam,java.lang.String)
 
-2022-12-22 14:03:26,765 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/status/{id}],methods=[PUT]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.updateStatus(java.lang.String,com.datau.rpm.dto.ReportDTO)
 
-2022-12-22 14:03:26,766 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportAndUser],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportKPIDTO>> com.datau.rpm.controller.ReportController.listKpiByReportAndUser(java.lang.String,java.lang.String)
 
-2022-12-22 14:03:26,766 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.getReportInfoById(java.lang.String)
 
-2022-12-22 14:03:26,766 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadRichTextFile],methods=[POST],consumes=[multipart/form-data || multipart/*],produces=[application/json;charset=UTF-8]}" onto public com.datau.rpm.dto.chart.RichTextFileR com.datau.rpm.controller.ReportController.uploadRichTextFile(org.springframework.web.multipart.MultipartFile,java.lang.String,java.lang.String,javax.servlet.http.HttpServletResponse)
 
-2022-12-22 14:03:26,767 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listColumnByTableId],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.mdm.MdmInfoColumn>> com.datau.rpm.controller.ReportController.listColumnByTableId(java.lang.String)
 
-2022-12-22 14:03:26,767 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportId/{reportId}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportKPIDTO>> com.datau.rpm.controller.ReportController.listKpiByReportId(java.lang.String)
 
-2022-12-22 14:03:26,767 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listTableByDatabaseId],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.mdm.MdmInfoTable>> com.datau.rpm.controller.ReportController.listTableByDatabaseId(java.lang.String)
 
-2022-12-22 14:03:26,767 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiConfigs/{topicId}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.kpim.KpiConfigForListDTO>> com.datau.rpm.controller.ReportController.listKpiConfigsByTopic(java.lang.String)
 
-2022-12-22 14:03:26,768 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFour],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveFour(com.datau.rpm.dto.save.SaveFourDTO,java.lang.String)
 
-2022-12-22 14:03:26,768 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveThree],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveThree(com.datau.rpm.dto.save.SaveThreeDTO,java.lang.String)
 
-2022-12-22 14:03:26,768 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFive],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveFive(com.datau.rpm.dto.save.SaveFiveDTO,java.lang.String)
 
-2022-12-22 14:03:26,768 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/list],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listReport(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.String,java.lang.String)
 
-2022-12-22 14:03:26,769 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveOne],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveOne(com.datau.rpm.dto.save.SaveOneDTO,java.lang.String)
 
-2022-12-22 14:03:26,769 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[DELETE]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.removeReport(java.lang.String)
 
-2022-12-22 14:03:26,769 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/topicForZtree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.kpim.TopicZtreeDTO>> com.datau.rpm.controller.ReportController.topicForZtree(java.lang.String) throws java.lang.Exception
 
-2022-12-22 14:03:26,769 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listSonReport],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listSonReport()
 
-2022-12-22 14:03:26,770 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listPReport],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listParentReport(java.lang.String)
 
-2022-12-22 14:03:26,770 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listUser],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.UserDTO>> com.datau.rpm.controller.ReportController.listUser()
 
-2022-12-22 14:03:26,770 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listType/{typeId}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.RpmDimTypeAll>> com.datau.rpm.controller.ReportController.listReportType(java.lang.Integer)
 
-2022-12-22 14:03:26,770 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveTwo],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveTwo(com.datau.rpm.dto.save.SaveTwoDTO,java.lang.String)
 
-2022-12-22 14:03:26,771 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveSix],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.saveSix(com.datau.rpm.dto.save.SaveReportDTO,java.lang.String)
 
-2022-12-22 14:03:26,771 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/getDML],methods=[GET]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.getDML(java.lang.String,java.lang.String)
 
-2022-12-22 14:03:26,771 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartType],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.chart.ChartTypeDTO>> com.datau.rpm.controller.ReportController.listChartType()
 
-2022-12-22 14:03:26,771 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listRelUser/{id}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportKpiRelUserDTO>> com.datau.rpm.controller.ReportController.listRelUser(java.lang.String)
 
-2022-12-22 14:03:26,772 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadChartFile],methods=[POST],consumes=[multipart/form-data || multipart/*]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.loadChartFile(org.springframework.web.multipart.MultipartFile,java.lang.String)
 
-2022-12-22 14:03:26,772 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportRelUsers],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.reportRelUsers(com.datau.rpm.dto.ReportRelUserDTO)
 
-2022-12-22 14:03:26,772 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listDatabase],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.mdm.MdmInfoDatabase>> com.datau.rpm.controller.ReportController.listDatabase(java.lang.String)
 
-2022-12-22 14:03:26,772 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportsRelUsers],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.reportsRelUsers(com.datau.rpm.dto.ReportRelUserDTO)
 
-2022-12-22 14:03:26,773 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByMenu],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listReportByMenu(java.lang.String)
 
-2022-12-22 14:03:26,773 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/system/usedKPI/{kpi}],methods=[GET]}" onto int com.datau.rpm.controller.SystemController.usedKPI(java.lang.String)
 
-2022-12-22 14:03:26,775 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/test],methods=[GET]}" onto public java.lang.String com.datau.rpm.controller.test.TestController.test()
 
-2022-12-22 14:03:26,775 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/getReoprt],methods=[GET]}" onto public com.alibaba.fastjson.JSON com.datau.rpm.controller.test.TestController.getReoprt(java.lang.String,int)
 
-2022-12-22 14:03:26,775 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReportSql],methods=[GET]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.test.TestController.saveReportSql(java.lang.String)
 
-2022-12-22 14:03:26,775 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/updateReport],methods=[PUT]}" onto public com.alibaba.fastjson.JSON com.datau.rpm.controller.test.TestController.updateReport(com.alibaba.fastjson.JSONObject)
 
-2022-12-22 14:03:26,775 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReport],methods=[POST]}" onto public com.alibaba.fastjson.JSON com.datau.rpm.controller.test.TestController.saveReport(com.alibaba.fastjson.JSONObject)
 
+2022-12-22 14:03:26,756 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/tree],methods=[GET]}" onto public R<java.util.List<ChartClassDTO>> ChartClassController.listChartClassTree(java.lang.String)
 
+2022-12-22 14:03:26,757 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[GET]}" onto public R<ChartClassDTO> ChartClassController.getChartClass(java.lang.String)
 
+2022-12-22 14:03:26,757 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass],methods=[POST]}" onto public R<java.lang.String> ChartClassController.saveChartClass(ChartClassDTO,java.lang.String)
 
+2022-12-22 14:03:26,757 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[PUT]}" onto public R<java.lang.String> ChartClassController.updateChartClass(ChartClassDTO,java.lang.String,java.lang.String)
 
+2022-12-22 14:03:26,758 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[DELETE]}" onto public R<java.lang.String> ChartClassController.removeChartClass(java.lang.String)
 
+2022-12-22 14:03:26,759 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[GET]}" onto public R<MenuDTO> MenuController.getMenu(java.lang.String)
 
+2022-12-22 14:03:26,759 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/leafTree],methods=[GET]}" onto public R<java.util.List<MenuDTO>> MenuController.listMenuTreeOnlyLeaf(java.lang.String,java.lang.String)
 
+2022-12-22 14:03:26,759 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/tree],methods=[GET]}" onto public R<java.util.List<MenuDTO>> MenuController.getMenuTree(java.lang.String)
 
+2022-12-22 14:03:26,759 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[PUT]}" onto public R<java.lang.String> MenuController.updateMenu(MenuDTO,java.lang.String,java.lang.String)
 
+2022-12-22 14:03:26,760 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[DELETE]}" onto public R<java.lang.String> MenuController.removeMenu(java.lang.String)
 
+2022-12-22 14:03:26,760 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu],methods=[POST]}" onto public R<java.lang.String> MenuController.saveMenu(MenuDTO,java.lang.String)
 
+2022-12-22 14:03:26,761 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByUserAndMenu],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportAutoViewController.listReportByUserAndMenu(java.lang.String,java.lang.String)
 
+2022-12-22 14:03:26,761 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/downloadReportFile],methods=[POST],produces=[application/octet-stream]}" onto public void ReportAutoViewController.downloadReportFile(ReportViewDataParam,java.lang.String,javax.servlet.http.HttpServletResponse)
 
+2022-12-22 14:03:26,762 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/view/{id}],methods=[GET]}" onto public R<ReportViewDTO> ReportAutoViewController.reportView(java.lang.String,java.lang.String)
 
+2022-12-22 14:03:26,762 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/getReportData],methods=[POST]}" onto public R<ReportDataDTO> ReportAutoViewController.getReportData(ReportViewDataParam,java.lang.String)
 
+2022-12-22 14:03:26,765 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/status/{id}],methods=[PUT]}" onto public R<java.lang.String> ReportController.updateStatus(java.lang.String,ReportDTO)
 
+2022-12-22 14:03:26,766 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportAndUser],methods=[GET]}" onto public R<java.util.List<ReportKPIDTO>> ReportController.listKpiByReportAndUser(java.lang.String,java.lang.String)
 
+2022-12-22 14:03:26,766 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[GET]}" onto public R<SaveReportDTO> ReportController.getReportInfoById(java.lang.String)
 
+2022-12-22 14:03:26,766 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadRichTextFile],methods=[POST],consumes=[multipart/form-data || multipart/*],produces=[application/json;charset=UTF-8]}" onto public RichTextFileR ReportController.uploadRichTextFile(org.springframework.web.multipart.MultipartFile,java.lang.String,java.lang.String,javax.servlet.http.HttpServletResponse)
 
+2022-12-22 14:03:26,767 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listColumnByTableId],methods=[GET]}" onto public R<java.util.List<MdmInfoColumn>> ReportController.listColumnByTableId(java.lang.String)
 
+2022-12-22 14:03:26,767 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportId/{reportId}],methods=[GET]}" onto public R<java.util.List<ReportKPIDTO>> ReportController.listKpiByReportId(java.lang.String)
 
+2022-12-22 14:03:26,767 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listTableByDatabaseId],methods=[GET]}" onto public R<java.util.List<MdmInfoTable>> ReportController.listTableByDatabaseId(java.lang.String)
 
+2022-12-22 14:03:26,767 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiConfigs/{topicId}],methods=[GET]}" onto public R<java.util.List<KpiConfigForListDTO>> ReportController.listKpiConfigsByTopic(java.lang.String)
 
+2022-12-22 14:03:26,768 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFour],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveFour(SaveFourDTO,java.lang.String)
 
+2022-12-22 14:03:26,768 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveThree],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveThree(SaveThreeDTO,java.lang.String)
 
+2022-12-22 14:03:26,768 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFive],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveFive(SaveFiveDTO,java.lang.String)
 
+2022-12-22 14:03:26,768 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/list],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listReport(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.String,java.lang.String)
 
+2022-12-22 14:03:26,769 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveOne],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveOne(SaveOneDTO,java.lang.String)
 
+2022-12-22 14:03:26,769 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[DELETE]}" onto public R<java.lang.String> ReportController.removeReport(java.lang.String)
 
+2022-12-22 14:03:26,769 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/topicForZtree],methods=[GET]}" onto public R<java.util.List<TopicZtreeDTO>> ReportController.topicForZtree(java.lang.String) throws java.lang.Exception
 
+2022-12-22 14:03:26,769 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listSonReport],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listSonReport()
 
+2022-12-22 14:03:26,770 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listPReport],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listParentReport(java.lang.String)
 
+2022-12-22 14:03:26,770 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listUser],methods=[GET]}" onto public R<java.util.List<UserDTO>> ReportController.listUser()
 
+2022-12-22 14:03:26,770 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listType/{typeId}],methods=[GET]}" onto public R<java.util.List<RpmDimTypeAll>> ReportController.listReportType(java.lang.Integer)
 
+2022-12-22 14:03:26,770 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveTwo],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveTwo(SaveTwoDTO,java.lang.String)
 
+2022-12-22 14:03:26,771 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveSix],methods=[POST]}" onto public R<java.lang.String> ReportController.saveSix(SaveReportDTO,java.lang.String)
 
+2022-12-22 14:03:26,771 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/getDML],methods=[GET]}" onto public R<java.lang.String> ReportController.getDML(java.lang.String,java.lang.String)
 
+2022-12-22 14:03:26,771 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartType],methods=[GET]}" onto public R<java.util.List<ChartTypeDTO>> ReportController.listChartType()
 
+2022-12-22 14:03:26,771 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listRelUser/{id}],methods=[GET]}" onto public R<java.util.List<ReportKpiRelUserDTO>> ReportController.listRelUser(java.lang.String)
 
+2022-12-22 14:03:26,772 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadChartFile],methods=[POST],consumes=[multipart/form-data || multipart/*]}" onto public R<java.lang.String> ReportController.loadChartFile(org.springframework.web.multipart.MultipartFile,java.lang.String)
 
+2022-12-22 14:03:26,772 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportRelUsers],methods=[POST]}" onto public R<java.lang.String> ReportController.reportRelUsers(ReportRelUserDTO)
 
+2022-12-22 14:03:26,772 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listDatabase],methods=[GET]}" onto public R<java.util.List<MdmInfoDatabase>> ReportController.listDatabase(java.lang.String)
 
+2022-12-22 14:03:26,772 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportsRelUsers],methods=[POST]}" onto public R<java.lang.String> ReportController.reportsRelUsers(ReportRelUserDTO)
 
+2022-12-22 14:03:26,773 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByMenu],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listReportByMenu(java.lang.String)
 
+2022-12-22 14:03:26,773 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/system/usedKPI/{kpi}],methods=[GET]}" onto int SystemController.usedKPI(java.lang.String)
 
+2022-12-22 14:03:26,775 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/test],methods=[GET]}" onto public java.lang.String TestController.test()
 
+2022-12-22 14:03:26,775 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/getReoprt],methods=[GET]}" onto public com.alibaba.fastjson.JSON TestController.getReoprt(java.lang.String,int)
 
+2022-12-22 14:03:26,775 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReportSql],methods=[GET]}" onto public R<java.lang.String> TestController.saveReportSql(java.lang.String)
 
+2022-12-22 14:03:26,775 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/updateReport],methods=[PUT]}" onto public com.alibaba.fastjson.JSON TestController.updateReport(com.alibaba.fastjson.JSONObject)
 
+2022-12-22 14:03:26,775 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReport],methods=[POST]}" onto public com.alibaba.fastjson.JSON TestController.saveReport(com.alibaba.fastjson.JSONObject)
 
 2022-12-22 14:03:26,777 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/swagger-resources/configuration/security]}" onto public org.springframework.http.ResponseEntity<springfox.documentation.swagger.web.SecurityConfiguration> springfox.documentation.swagger.web.ApiResourceController.securityConfiguration()
 
 2022-12-22 14:03:26,779 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/swagger-resources]}" onto public org.springframework.http.ResponseEntity<java.util.List<springfox.documentation.swagger.web.SwaggerResource>> springfox.documentation.swagger.web.ApiResourceController.swaggerResources()
 
 2022-12-22 14:03:26,780 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/swagger-resources/configuration/ui]}" onto public org.springframework.http.ResponseEntity<springfox.documentation.swagger.web.UiConfiguration> springfox.documentation.swagger.web.ApiResourceController.uiConfiguration()
 
@@ -1643,7 +1643,7 @@ com.netflix.discovery.shared.transport.TransportException: Cannot execute reques
 
 2022-12-22 14:03:30,257 [main] INFO  org.apache.tomcat.util.net.NioSelectorPool:180 - Using a shared selector for servlet write/read
 
 2022-12-22 14:03:30,280 [main] INFO  o.s.boot.web.embedded.tomcat.TomcatWebServer:206 - Tomcat started on port(s): 9193 (http) with context path ''
 
 2022-12-22 14:03:30,281 [main] INFO  o.s.c.n.e.s.EurekaAutoServiceRegistration:124 - Updating port to 9193
 
-2022-12-22 14:03:30,283 [main] INFO  com.datau.rpm.RpmApplication:59 - Started RpmApplication in 9.422 seconds (JVM running for 10.526)
 
+2022-12-22 14:03:30,283 [main] INFO  RpmApplication:59 - Started RpmApplication in 9.422 seconds (JVM running for 10.526)
 
 2022-12-22 14:03:30,591 [RMI TCP Connection(2)-192.168.0.103] INFO  o.a.c.core.ContainerBase.[Tomcat].[localhost].[/]:180 - Initializing Spring FrameworkServlet 'dispatcherServlet'
 
 2022-12-22 14:03:30,591 [RMI TCP Connection(2)-192.168.0.103] INFO  org.springframework.web.servlet.DispatcherServlet:494 - FrameworkServlet 'dispatcherServlet': initialization started
 
 2022-12-22 14:03:30,605 [RMI TCP Connection(2)-192.168.0.103] INFO  org.springframework.web.servlet.DispatcherServlet:509 - FrameworkServlet 'dispatcherServlet': initialization completed in 14 ms
 
@@ -2128,7 +2128,7 @@ Caused by: com.alibaba.druid.pool.DataSourceDisableException: null
 
 2022-12-22 14:05:03,273 [DiscoveryClient-HeartbeatExecutor-0] INFO  com.netflix.discovery.DiscoveryClient:850 - DiscoveryClient_RPM/192.168.59.1 - Re-registering apps/RPM
 
 2022-12-22 14:05:03,274 [DiscoveryClient-HeartbeatExecutor-0] INFO  com.netflix.discovery.DiscoveryClient:826 - DiscoveryClient_RPM/192.168.59.1: registering service...
 
 2022-12-22 14:05:03,327 [DiscoveryClient-HeartbeatExecutor-0] INFO  com.netflix.discovery.DiscoveryClient:835 - DiscoveryClient_RPM/192.168.59.1 - registration status: 204
 
-2022-12-22 14:24:37,553 [main] INFO  com.datau.rpm.RpmApplication:659 - No active profile set, falling back to default profiles: default
 
+2022-12-22 14:24:37,553 [main] INFO  RpmApplication:659 - No active profile set, falling back to default profiles: default
 
 2022-12-22 14:24:37,570 [main] INFO  o.s.b.w.s.c.AnnotationConfigServletWebServerApplicationContext:590 - Refreshing org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext@1cb37ee4: startup date [Thu Dec 22 14:24:37 CST 2022]; parent: org.springframework.context.annotation.AnnotationConfigApplicationContext@239b0f9d
 
 2022-12-22 14:24:38,322 [main] INFO  o.s.d.r.config.RepositoryConfigurationDelegate:163 - Multiple Spring Data modules found, entering strict repository configuration mode!
 
 2022-12-22 14:24:38,652 [main] INFO  o.springframework.cloud.context.scope.GenericScope:294 - BeanFactory id=a42253b8-2f7b-3509-a4ab-1f119183bdd3
 
@@ -2158,56 +2158,56 @@ Caused by: com.alibaba.druid.pool.DataSourceDisableException: null
 
 2022-12-22 14:24:41,580 [main] INFO  o.s.b.f.a.AutowiredAnnotationBeanPostProcessor:154 - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
 
 2022-12-22 14:24:41,626 [main] INFO  o.s.c.a.AnnotationConfigApplicationContext:590 - Refreshing FeignContext-mdm: startup date [Thu Dec 22 14:24:41 CST 2022]; parent: org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext@1cb37ee4
 
 2022-12-22 14:24:41,637 [main] INFO  o.s.b.f.a.AutowiredAnnotationBeanPostProcessor:154 - JSR-330 'javax.inject.Inject' annotation found and supported for autowiring
 
-2022-12-22 14:24:42,019 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/tree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.chart.ChartClassDTO>> com.datau.rpm.controller.ChartClassController.listChartClassTree(java.lang.String)
 
-2022-12-22 14:24:42,020 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[PUT]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ChartClassController.updateChartClass(com.datau.rpm.dto.chart.ChartClassDTO,java.lang.String,java.lang.String)
 
-2022-12-22 14:24:42,020 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ChartClassController.saveChartClass(com.datau.rpm.dto.chart.ChartClassDTO,java.lang.String)
 
-2022-12-22 14:24:42,021 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[DELETE]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ChartClassController.removeChartClass(java.lang.String)
 
-2022-12-22 14:24:42,021 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.chart.ChartClassDTO> com.datau.rpm.controller.ChartClassController.getChartClass(java.lang.String)
 
-2022-12-22 14:24:42,022 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.MenuDTO> com.datau.rpm.controller.MenuController.getMenu(java.lang.String)
 
-2022-12-22 14:24:42,022 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/leafTree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.MenuDTO>> com.datau.rpm.controller.MenuController.listMenuTreeOnlyLeaf(java.lang.String,java.lang.String)
 
-2022-12-22 14:24:42,022 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.MenuController.saveMenu(com.datau.rpm.dto.MenuDTO,java.lang.String)
 
-2022-12-22 14:24:42,023 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/tree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.MenuDTO>> com.datau.rpm.controller.MenuController.getMenuTree(java.lang.String)
 
-2022-12-22 14:24:42,023 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[DELETE]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.MenuController.removeMenu(java.lang.String)
 
-2022-12-22 14:24:42,023 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[PUT]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.MenuController.updateMenu(com.datau.rpm.dto.MenuDTO,java.lang.String,java.lang.String)
 
-2022-12-22 14:24:42,024 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/downloadReportFile],methods=[POST],produces=[application/octet-stream]}" onto public void com.datau.rpm.controller.ReportAutoViewController.downloadReportFile(com.datau.rpm.dto.view.ReportViewDataParam,java.lang.String,javax.servlet.http.HttpServletResponse)
 
-2022-12-22 14:24:42,025 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByUserAndMenu],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportAutoViewController.listReportByUserAndMenu(java.lang.String,java.lang.String)
 
-2022-12-22 14:24:42,026 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/getReportData],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.data.ReportDataDTO> com.datau.rpm.controller.ReportAutoViewController.getReportData(com.datau.rpm.dto.view.ReportViewDataParam,java.lang.String)
 
-2022-12-22 14:24:42,026 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/view/{id}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.view.ReportViewDTO> com.datau.rpm.controller.ReportAutoViewController.reportView(java.lang.String,java.lang.String)
 
-2022-12-22 14:24:42,029 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/status/{id}],methods=[PUT]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.updateStatus(java.lang.String,com.datau.rpm.dto.ReportDTO)
 
-2022-12-22 14:24:42,030 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiConfigs/{topicId}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.kpim.KpiConfigForListDTO>> com.datau.rpm.controller.ReportController.listKpiConfigsByTopic(java.lang.String)
 
-2022-12-22 14:24:42,030 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[GET]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.getReportInfoById(java.lang.String)
 
-2022-12-22 14:24:42,030 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listTableByDatabaseId],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.mdm.MdmInfoTable>> com.datau.rpm.controller.ReportController.listTableByDatabaseId(java.lang.String)
 
-2022-12-22 14:24:42,031 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listColumnByTableId],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.mdm.MdmInfoColumn>> com.datau.rpm.controller.ReportController.listColumnByTableId(java.lang.String)
 
-2022-12-22 14:24:42,031 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportId/{reportId}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportKPIDTO>> com.datau.rpm.controller.ReportController.listKpiByReportId(java.lang.String)
 
-2022-12-22 14:24:42,031 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportAndUser],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportKPIDTO>> com.datau.rpm.controller.ReportController.listKpiByReportAndUser(java.lang.String,java.lang.String)
 
-2022-12-22 14:24:42,031 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadRichTextFile],methods=[POST],consumes=[multipart/form-data || multipart/*],produces=[application/json;charset=UTF-8]}" onto public com.datau.rpm.dto.chart.RichTextFileR com.datau.rpm.controller.ReportController.uploadRichTextFile(org.springframework.web.multipart.MultipartFile,java.lang.String,java.lang.String,javax.servlet.http.HttpServletResponse)
 
-2022-12-22 14:24:42,032 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/list],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listReport(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.String,java.lang.String)
 
-2022-12-22 14:24:42,032 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFive],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveFive(com.datau.rpm.dto.save.SaveFiveDTO,java.lang.String)
 
-2022-12-22 14:24:42,032 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveTwo],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveTwo(com.datau.rpm.dto.save.SaveTwoDTO,java.lang.String)
 
-2022-12-22 14:24:42,032 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/getDML],methods=[GET]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.getDML(java.lang.String,java.lang.String)
 
-2022-12-22 14:24:42,033 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadChartFile],methods=[POST],consumes=[multipart/form-data || multipart/*]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.loadChartFile(org.springframework.web.multipart.MultipartFile,java.lang.String)
 
-2022-12-22 14:24:42,033 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[DELETE]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.removeReport(java.lang.String)
 
-2022-12-22 14:24:42,033 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportRelUsers],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.reportRelUsers(com.datau.rpm.dto.ReportRelUserDTO)
 
-2022-12-22 14:24:42,033 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportsRelUsers],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.reportsRelUsers(com.datau.rpm.dto.ReportRelUserDTO)
 
-2022-12-22 14:24:42,034 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listDatabase],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.mdm.MdmInfoDatabase>> com.datau.rpm.controller.ReportController.listDatabase(java.lang.String)
 
-2022-12-22 14:24:42,034 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveOne],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveOne(com.datau.rpm.dto.save.SaveOneDTO,java.lang.String)
 
-2022-12-22 14:24:42,034 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/topicForZtree],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.kpim.TopicZtreeDTO>> com.datau.rpm.controller.ReportController.topicForZtree(java.lang.String) throws java.lang.Exception
 
-2022-12-22 14:24:42,034 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listType/{typeId}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.RpmDimTypeAll>> com.datau.rpm.controller.ReportController.listReportType(java.lang.Integer)
 
-2022-12-22 14:24:42,035 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFour],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveFour(com.datau.rpm.dto.save.SaveFourDTO,java.lang.String)
 
-2022-12-22 14:24:42,035 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartType],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.chart.ChartTypeDTO>> com.datau.rpm.controller.ReportController.listChartType()
 
-2022-12-22 14:24:42,035 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByMenu],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listReportByMenu(java.lang.String)
 
-2022-12-22 14:24:42,036 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveSix],methods=[POST]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.ReportController.saveSix(com.datau.rpm.dto.save.SaveReportDTO,java.lang.String)
 
-2022-12-22 14:24:42,036 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listSonReport],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listSonReport()
 
-2022-12-22 14:24:42,036 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listPReport],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportDTO>> com.datau.rpm.controller.ReportController.listParentReport(java.lang.String)
 
-2022-12-22 14:24:42,036 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listRelUser/{id}],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.ReportKpiRelUserDTO>> com.datau.rpm.controller.ReportController.listRelUser(java.lang.String)
 
-2022-12-22 14:24:42,036 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveThree],methods=[POST]}" onto public com.datau.rpm.util.R<com.datau.rpm.dto.save.SaveReportDTO> com.datau.rpm.controller.ReportController.saveThree(com.datau.rpm.dto.save.SaveThreeDTO,java.lang.String)
 
-2022-12-22 14:24:42,037 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listUser],methods=[GET]}" onto public com.datau.rpm.util.R<java.util.List<com.datau.rpm.dto.UserDTO>> com.datau.rpm.controller.ReportController.listUser()
 
-2022-12-22 14:24:42,037 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/system/usedKPI/{kpi}],methods=[GET]}" onto int com.datau.rpm.controller.SystemController.usedKPI(java.lang.String)
 
-2022-12-22 14:24:42,039 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/test],methods=[GET]}" onto public java.lang.String com.datau.rpm.controller.test.TestController.test()
 
-2022-12-22 14:24:42,039 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReportSql],methods=[GET]}" onto public com.datau.rpm.util.R<java.lang.String> com.datau.rpm.controller.test.TestController.saveReportSql(java.lang.String)
 
-2022-12-22 14:24:42,039 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReport],methods=[POST]}" onto public com.alibaba.fastjson.JSON com.datau.rpm.controller.test.TestController.saveReport(com.alibaba.fastjson.JSONObject)
 
-2022-12-22 14:24:42,040 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/updateReport],methods=[PUT]}" onto public com.alibaba.fastjson.JSON com.datau.rpm.controller.test.TestController.updateReport(com.alibaba.fastjson.JSONObject)
 
-2022-12-22 14:24:42,040 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/getReoprt],methods=[GET]}" onto public com.alibaba.fastjson.JSON com.datau.rpm.controller.test.TestController.getReoprt(java.lang.String,int)
 
+2022-12-22 14:24:42,019 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/tree],methods=[GET]}" onto public R<java.util.List<ChartClassDTO>> ChartClassController.listChartClassTree(java.lang.String)
 
+2022-12-22 14:24:42,020 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[PUT]}" onto public R<java.lang.String> ChartClassController.updateChartClass(ChartClassDTO,java.lang.String,java.lang.String)
 
+2022-12-22 14:24:42,020 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass],methods=[POST]}" onto public R<java.lang.String> ChartClassController.saveChartClass(ChartClassDTO,java.lang.String)
 
+2022-12-22 14:24:42,021 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[DELETE]}" onto public R<java.lang.String> ChartClassController.removeChartClass(java.lang.String)
 
+2022-12-22 14:24:42,021 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/chartClass/{classCode}],methods=[GET]}" onto public R<ChartClassDTO> ChartClassController.getChartClass(java.lang.String)
 
+2022-12-22 14:24:42,022 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[GET]}" onto public R<MenuDTO> MenuController.getMenu(java.lang.String)
 
+2022-12-22 14:24:42,022 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/leafTree],methods=[GET]}" onto public R<java.util.List<MenuDTO>> MenuController.listMenuTreeOnlyLeaf(java.lang.String,java.lang.String)
 
+2022-12-22 14:24:42,022 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu],methods=[POST]}" onto public R<java.lang.String> MenuController.saveMenu(MenuDTO,java.lang.String)
 
+2022-12-22 14:24:42,023 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/tree],methods=[GET]}" onto public R<java.util.List<MenuDTO>> MenuController.getMenuTree(java.lang.String)
 
+2022-12-22 14:24:42,023 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[DELETE]}" onto public R<java.lang.String> MenuController.removeMenu(java.lang.String)
 
+2022-12-22 14:24:42,023 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/menu/{menuCode}],methods=[PUT]}" onto public R<java.lang.String> MenuController.updateMenu(MenuDTO,java.lang.String,java.lang.String)
 
+2022-12-22 14:24:42,024 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/downloadReportFile],methods=[POST],produces=[application/octet-stream]}" onto public void ReportAutoViewController.downloadReportFile(ReportViewDataParam,java.lang.String,javax.servlet.http.HttpServletResponse)
 
+2022-12-22 14:24:42,025 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByUserAndMenu],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportAutoViewController.listReportByUserAndMenu(java.lang.String,java.lang.String)
 
+2022-12-22 14:24:42,026 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/getReportData],methods=[POST]}" onto public R<ReportDataDTO> ReportAutoViewController.getReportData(ReportViewDataParam,java.lang.String)
 
+2022-12-22 14:24:42,026 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/view/{id}],methods=[GET]}" onto public R<ReportViewDTO> ReportAutoViewController.reportView(java.lang.String,java.lang.String)
 
+2022-12-22 14:24:42,029 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/status/{id}],methods=[PUT]}" onto public R<java.lang.String> ReportController.updateStatus(java.lang.String,ReportDTO)
 
+2022-12-22 14:24:42,030 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiConfigs/{topicId}],methods=[GET]}" onto public R<java.util.List<KpiConfigForListDTO>> ReportController.listKpiConfigsByTopic(java.lang.String)
 
+2022-12-22 14:24:42,030 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[GET]}" onto public R<SaveReportDTO> ReportController.getReportInfoById(java.lang.String)
 
+2022-12-22 14:24:42,030 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listTableByDatabaseId],methods=[GET]}" onto public R<java.util.List<MdmInfoTable>> ReportController.listTableByDatabaseId(java.lang.String)
 
+2022-12-22 14:24:42,031 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listColumnByTableId],methods=[GET]}" onto public R<java.util.List<MdmInfoColumn>> ReportController.listColumnByTableId(java.lang.String)
 
+2022-12-22 14:24:42,031 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportId/{reportId}],methods=[GET]}" onto public R<java.util.List<ReportKPIDTO>> ReportController.listKpiByReportId(java.lang.String)
 
+2022-12-22 14:24:42,031 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listKpiByReportAndUser],methods=[GET]}" onto public R<java.util.List<ReportKPIDTO>> ReportController.listKpiByReportAndUser(java.lang.String,java.lang.String)
 
+2022-12-22 14:24:42,031 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadRichTextFile],methods=[POST],consumes=[multipart/form-data || multipart/*],produces=[application/json;charset=UTF-8]}" onto public RichTextFileR ReportController.uploadRichTextFile(org.springframework.web.multipart.MultipartFile,java.lang.String,java.lang.String,javax.servlet.http.HttpServletResponse)
 
+2022-12-22 14:24:42,032 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/list],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listReport(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.Integer,java.lang.String,java.lang.String)
 
+2022-12-22 14:24:42,032 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFive],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveFive(SaveFiveDTO,java.lang.String)
 
+2022-12-22 14:24:42,032 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveTwo],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveTwo(SaveTwoDTO,java.lang.String)
 
+2022-12-22 14:24:42,032 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/getDML],methods=[GET]}" onto public R<java.lang.String> ReportController.getDML(java.lang.String,java.lang.String)
 
+2022-12-22 14:24:42,033 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/loadChartFile],methods=[POST],consumes=[multipart/form-data || multipart/*]}" onto public R<java.lang.String> ReportController.loadChartFile(org.springframework.web.multipart.MultipartFile,java.lang.String)
 
+2022-12-22 14:24:42,033 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/{id}],methods=[DELETE]}" onto public R<java.lang.String> ReportController.removeReport(java.lang.String)
 
+2022-12-22 14:24:42,033 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportRelUsers],methods=[POST]}" onto public R<java.lang.String> ReportController.reportRelUsers(ReportRelUserDTO)
 
+2022-12-22 14:24:42,033 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/reportsRelUsers],methods=[POST]}" onto public R<java.lang.String> ReportController.reportsRelUsers(ReportRelUserDTO)
 
+2022-12-22 14:24:42,034 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartInfo/listDatabase],methods=[GET]}" onto public R<java.util.List<MdmInfoDatabase>> ReportController.listDatabase(java.lang.String)
 
+2022-12-22 14:24:42,034 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveOne],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveOne(SaveOneDTO,java.lang.String)
 
+2022-12-22 14:24:42,034 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/topicForZtree],methods=[GET]}" onto public R<java.util.List<TopicZtreeDTO>> ReportController.topicForZtree(java.lang.String) throws java.lang.Exception
 
+2022-12-22 14:24:42,034 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listType/{typeId}],methods=[GET]}" onto public R<java.util.List<RpmDimTypeAll>> ReportController.listReportType(java.lang.Integer)
 
+2022-12-22 14:24:42,035 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveFour],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveFour(SaveFourDTO,java.lang.String)
 
+2022-12-22 14:24:42,035 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/appshow/chartType],methods=[GET]}" onto public R<java.util.List<ChartTypeDTO>> ReportController.listChartType()
 
+2022-12-22 14:24:42,035 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listReportByMenu],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listReportByMenu(java.lang.String)
 
+2022-12-22 14:24:42,036 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveSix],methods=[POST]}" onto public R<java.lang.String> ReportController.saveSix(SaveReportDTO,java.lang.String)
 
+2022-12-22 14:24:42,036 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listSonReport],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listSonReport()
 
+2022-12-22 14:24:42,036 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listPReport],methods=[GET]}" onto public R<java.util.List<ReportDTO>> ReportController.listParentReport(java.lang.String)
 
+2022-12-22 14:24:42,036 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listRelUser/{id}],methods=[GET]}" onto public R<java.util.List<ReportKpiRelUserDTO>> ReportController.listRelUser(java.lang.String)
 
+2022-12-22 14:24:42,036 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/saveThree],methods=[POST]}" onto public R<SaveReportDTO> ReportController.saveThree(SaveThreeDTO,java.lang.String)
 
+2022-12-22 14:24:42,037 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/report/listUser],methods=[GET]}" onto public R<java.util.List<UserDTO>> ReportController.listUser()
 
+2022-12-22 14:24:42,037 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/system/usedKPI/{kpi}],methods=[GET]}" onto int SystemController.usedKPI(java.lang.String)
 
+2022-12-22 14:24:42,039 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/test],methods=[GET]}" onto public java.lang.String TestController.test()
 
+2022-12-22 14:24:42,039 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReportSql],methods=[GET]}" onto public R<java.lang.String> TestController.saveReportSql(java.lang.String)
 
+2022-12-22 14:24:42,039 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/saveReport],methods=[POST]}" onto public com.alibaba.fastjson.JSON TestController.saveReport(com.alibaba.fastjson.JSONObject)
 
+2022-12-22 14:24:42,040 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/updateReport],methods=[PUT]}" onto public com.alibaba.fastjson.JSON TestController.updateReport(com.alibaba.fastjson.JSONObject)
 
+2022-12-22 14:24:42,040 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/rpm/getReoprt],methods=[GET]}" onto public com.alibaba.fastjson.JSON TestController.getReoprt(java.lang.String,int)
 
 2022-12-22 14:24:42,043 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/swagger-resources]}" onto public org.springframework.http.ResponseEntity<java.util.List<springfox.documentation.swagger.web.SwaggerResource>> springfox.documentation.swagger.web.ApiResourceController.swaggerResources()
 
 2022-12-22 14:24:42,044 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/swagger-resources/configuration/ui]}" onto public org.springframework.http.ResponseEntity<springfox.documentation.swagger.web.UiConfiguration> springfox.documentation.swagger.web.ApiResourceController.uiConfiguration()
 
 2022-12-22 14:24:42,044 [main] INFO  o.s.w.s.m.m.a.RequestMappingHandlerMapping:547 - Mapped "{[/swagger-resources/configuration/security]}" onto public org.springframework.http.ResponseEntity<springfox.documentation.swagger.web.SecurityConfiguration> springfox.documentation.swagger.web.ApiResourceController.securityConfiguration()
 
@@ -2266,7 +2266,7 @@ Caused by: com.alibaba.druid.pool.DataSourceDisableException: null
 
 2022-12-22 14:24:45,738 [main] INFO  org.apache.tomcat.util.net.NioSelectorPool:180 - Using a shared selector for servlet write/read
 
 2022-12-22 14:24:46,515 [main] INFO  o.s.boot.web.embedded.tomcat.TomcatWebServer:206 - Tomcat started on port(s): 9193 (http) with context path ''
 
 2022-12-22 14:24:46,517 [main] INFO  o.s.c.n.e.s.EurekaAutoServiceRegistration:124 - Updating port to 9193
 
-2022-12-22 14:24:46,521 [main] INFO  com.datau.rpm.RpmApplication:59 - Started RpmApplication in 10.714 seconds (JVM running for 11.736)
 
+2022-12-22 14:24:46,521 [main] INFO  RpmApplication:59 - Started RpmApplication in 10.714 seconds (JVM running for 11.736)
 
 2022-12-22 14:24:47,270 [DiscoveryClient-InstanceInfoReplicator-0] INFO  com.alibaba.druid.pool.DruidDataSource:928 - {dataSource-1} inited
 
 2022-12-22 14:24:47,530 [RMI TCP Connection(1)-192.168.0.103] INFO  io.lettuce.core.EpollProvider:101 - Starting without optional epoll library
 
 2022-12-22 14:24:47,532 [RMI TCP Connection(1)-192.168.0.103] INFO  io.lettuce.core.KqueueProvider:101 - Starting without optional kqueue library

+ 0 - 16
rpm/src/main/java/com/datau/rpm/dto/data/ReportDataDTO.java
View File 

@@ -1,16 +0,0 @@
 
-package com.datau.rpm.dto.data;
 
-
 
-import com.datau.rpm.dto.data.barOrLine.BarOrLine;
 
-import com.datau.rpm.dto.data.pie.Pie;
 
-import com.datau.rpm.dto.data.table.Table;
 
-
 
-import lombok.Data;
 
-
 
-@Data
 
-public class ReportDataDTO {
 
-   
-    private Table table;
 
-    private BarOrLine barOrLine;
 
-    private Pie pie;
 
-    
-}

+ 2 - 2
rpm/src/main/java/com/datau/rpm/RpmApplication.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm;
 
+package com.ozs.rpm;
 
 
 import org.mybatis.spring.annotation.MapperScan;
 
 import org.springframework.boot.SpringApplication;
 
@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 
 
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 
-@MapperScan("com.datau.rpm.mapper")
 
+@MapperScan("com.ozs.rpm.mapper")
 
 @EnableSwagger2
 
 @EnableEurekaClient
 
 @EnableFeignClients

+ 1 - 1
rpm/src/main/java/com/datau/rpm/config/DruidDataSourceConfiguration.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.config;
 
+package com.ozs.rpm.config;
 
 
 import javax.sql.DataSource;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/config/SwaggerConfig.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.config;
 
+package com.ozs.rpm.config;
 
 
 import java.util.ArrayList;
 
 import java.util.List;

+ 6 - 6
rpm/src/main/java/com/datau/rpm/controller/ChartClassController.java
View File 

@@ -1,7 +1,8 @@
 
-package com.datau.rpm.controller;
 
+package com.ozs.rpm.controller;
 
 
 import java.util.List;
 
 
+import com.ozs.rpm.service.ChartClassService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.DeleteMapping;
 
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -13,11 +14,10 @@ import org.springframework.web.bind.annotation.RequestHeader;
 
 import org.springframework.web.bind.annotation.RequestParam;
 
 import org.springframework.web.bind.annotation.RestController;
 
 
-import com.datau.rpm.dto.chart.ChartClassDTO;
 
-import com.datau.rpm.service.ChartClassService;
 
-import com.datau.rpm.util.AccountApi;
 
-import com.datau.rpm.util.R;
 
-import com.datau.rpm.util.S;
 
+import com.ozs.rpm.dto.chart.ChartClassDTO;
 
+import com.ozs.rpm.util.AccountApi;
 
+import com.ozs.rpm.util.R;
 
+import com.ozs.rpm.util.S;
 
 
 import io.swagger.annotations.Api;
 
 import io.swagger.annotations.ApiImplicitParam;

+ 6 - 6
rpm/src/main/java/com/datau/rpm/controller/MenuController.java
View File 

@@ -1,7 +1,8 @@
 
-package com.datau.rpm.controller;
 
+package com.ozs.rpm.controller;
 
 
 import java.util.List;
 
 
+import com.ozs.rpm.service.MenuService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.DeleteMapping;
 
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -13,11 +14,10 @@ import org.springframework.web.bind.annotation.RequestHeader;
 
 import org.springframework.web.bind.annotation.RequestParam;
 
 import org.springframework.web.bind.annotation.RestController;
 
 
-import com.datau.rpm.dto.MenuDTO;
 
-import com.datau.rpm.service.MenuService;
 
-import com.datau.rpm.util.AccountApi;
 
-import com.datau.rpm.util.R;
 
-import com.datau.rpm.util.S;
 
+import com.ozs.rpm.dto.MenuDTO;
 
+import com.ozs.rpm.util.AccountApi;
 
+import com.ozs.rpm.util.R;
 
+import com.ozs.rpm.util.S;
 
 
 import io.swagger.annotations.Api;
 
 import io.swagger.annotations.ApiImplicitParam;

+ 11 - 13
rpm/src/main/java/com/datau/rpm/controller/ReportAutoViewController.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.controller;
 
+package com.ozs.rpm.controller;
 
 
 import java.io.File;
 
 import java.io.FileInputStream;
 
@@ -10,9 +10,10 @@ import java.util.List;
 
 import javax.servlet.ServletOutputStream;
 
 import javax.servlet.http.HttpServletResponse;
 
 
+import com.ozs.rpm.service.ReportAutoViewService;
 
+import com.ozs.rpm.service.ReportService;
 
 import org.apache.poi.util.IOUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import org.springframework.http.MediaType;
 
 import org.springframework.web.bind.annotation.GetMapping;
 
 import org.springframework.web.bind.annotation.PathVariable;
 
 import org.springframework.web.bind.annotation.PostMapping;
 
@@ -21,22 +22,19 @@ import org.springframework.web.bind.annotation.RequestHeader;
 
 import org.springframework.web.bind.annotation.RequestParam;
 
 import org.springframework.web.bind.annotation.RestController;
 
 
-import com.datau.rpm.dto.ReportDTO;
 
-import com.datau.rpm.dto.data.ReportDataDTO;
 
-import com.datau.rpm.dto.view.ReportViewDTO;
 
-import com.datau.rpm.dto.view.ReportViewDataParam;
 
-import com.datau.rpm.service.ReportAutoViewService;
 
-import com.datau.rpm.service.ReportService;
 
-import com.datau.rpm.util.AccountApi;
 
-import com.datau.rpm.util.R;
 
-import com.datau.rpm.util.S;
 
-import com.datau.rpm.util.StringUtil;
 
+import com.ozs.rpm.dto.ReportDTO;
 
+import com.ozs.rpm.dto.data.ReportDataDTO;
 
+import com.ozs.rpm.dto.view.ReportViewDTO;
 
+import com.ozs.rpm.dto.view.ReportViewDataParam;
 
+import com.ozs.rpm.util.AccountApi;
 
+import com.ozs.rpm.util.R;
 
+import com.ozs.rpm.util.S;
 
+import com.ozs.rpm.util.StringUtil;
 
 
 import io.swagger.annotations.Api;
 
 import io.swagger.annotations.ApiImplicitParam;
 
 import io.swagger.annotations.ApiOperation;
 
 import lombok.extern.slf4j.Slf4j;
 
-import sun.tools.native2ascii.Main;
 
 
 @Slf4j
 
 @Api(tags = { "报表自动化展示" })

+ 25 - 25
rpm/src/main/java/com/datau/rpm/controller/ReportController.java
View File 

@@ -1,9 +1,10 @@
 
-package com.datau.rpm.controller;
 
+package com.ozs.rpm.controller;
 
 
 import java.util.List;
 
 
 import javax.servlet.http.HttpServletResponse;
 
 
+import com.ozs.rpm.service.ReportService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.DeleteMapping;
 
 import org.springframework.web.bind.annotation.GetMapping;
 
@@ -16,30 +17,29 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import org.springframework.web.bind.annotation.RestController;
 
 import org.springframework.web.multipart.MultipartFile;
 
 
-import com.datau.rpm.dto.ReportDTO;
 
-import com.datau.rpm.dto.ReportKPIDTO;
 
-import com.datau.rpm.dto.ReportKpiRelUserDTO;
 
-import com.datau.rpm.dto.ReportRelUserDTO;
 
-import com.datau.rpm.dto.RpmDimTypeAll;
 
-import com.datau.rpm.dto.UserDTO;
 
-import com.datau.rpm.dto.chart.ChartTypeDTO;
 
-import com.datau.rpm.dto.chart.RichTextFileR;
 
-import com.datau.rpm.dto.kpim.KpiConfigForListDTO;
 
-import com.datau.rpm.dto.kpim.TopicZtreeDTO;
 
-import com.datau.rpm.dto.mdm.MdmInfoColumn;
 
-import com.datau.rpm.dto.mdm.MdmInfoDatabase;
 
-import com.datau.rpm.dto.mdm.MdmInfoTable;
 
-import com.datau.rpm.dto.save.SaveFiveDTO;
 
-import com.datau.rpm.dto.save.SaveFourDTO;
 
-import com.datau.rpm.dto.save.SaveOneDTO;
 
-import com.datau.rpm.dto.save.SaveReportDTO;
 
-import com.datau.rpm.dto.save.SaveThreeDTO;
 
-import com.datau.rpm.dto.save.SaveTwoDTO;
 
-import com.datau.rpm.service.ReportService;
 
-import com.datau.rpm.util.AccountApi;
 
-import com.datau.rpm.util.KpimApi;
 
-import com.datau.rpm.util.R;
 
-import com.datau.rpm.util.S;
 
+import com.ozs.rpm.dto.ReportDTO;
 
+import com.ozs.rpm.dto.ReportKPIDTO;
 
+import com.ozs.rpm.dto.ReportKpiRelUserDTO;
 
+import com.ozs.rpm.dto.ReportRelUserDTO;
 
+import com.ozs.rpm.dto.RpmDimTypeAll;
 
+import com.ozs.rpm.dto.UserDTO;
 
+import com.ozs.rpm.dto.chart.ChartTypeDTO;
 
+import com.ozs.rpm.dto.chart.RichTextFileR;
 
+import com.ozs.rpm.dto.kpim.KpiConfigForListDTO;
 
+import com.ozs.rpm.dto.kpim.TopicZtreeDTO;
 
+import com.ozs.rpm.dto.mdm.MdmInfoColumn;
 
+import com.ozs.rpm.dto.mdm.MdmInfoDatabase;
 
+import com.ozs.rpm.dto.mdm.MdmInfoTable;
 
+import com.ozs.rpm.dto.save.SaveFiveDTO;
 
+import com.ozs.rpm.dto.save.SaveFourDTO;
 
+import com.ozs.rpm.dto.save.SaveOneDTO;
 
+import com.ozs.rpm.dto.save.SaveReportDTO;
 
+import com.ozs.rpm.dto.save.SaveThreeDTO;
 
+import com.ozs.rpm.dto.save.SaveTwoDTO;
 
+import com.ozs.rpm.util.AccountApi;
 
+import com.ozs.rpm.util.KpimApi;
 
+import com.ozs.rpm.util.R;
 
+import com.ozs.rpm.util.S;
 
 
 import io.swagger.annotations.Api;
 
 import io.swagger.annotations.ApiImplicitParam;

+ 2 - 3
rpm/src/main/java/com/datau/rpm/controller/SystemController.java
View File 

@@ -1,12 +1,11 @@
 
-package com.datau.rpm.controller;
 
+package com.ozs.rpm.controller;
 
 
+import com.ozs.rpm.service.system.ReportService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.GetMapping;
 
 import org.springframework.web.bind.annotation.PathVariable;
 
 import org.springframework.web.bind.annotation.RestController;
 
 
-import com.datau.rpm.service.system.ReportService;
 
-
 
 @RestController
 
 public class SystemController {

+ 4 - 4
rpm/src/main/java/com/datau/rpm/controller/test/TestController.java
View File 

@@ -1,5 +1,6 @@
 
-package com.datau.rpm.controller.test;
 
+package com.ozs.rpm.controller.test;
 
 
+import com.ozs.rpm.service.ReportDataService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.beans.factory.annotation.Value;
 
 import org.springframework.core.io.Resource;
 
@@ -12,9 +13,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import com.alibaba.fastjson.JSON;
 
 import com.alibaba.fastjson.JSONObject;
 
-import com.datau.rpm.service.ReportDataService;
 
-import com.datau.rpm.util.JsonUtil;
 
-import com.datau.rpm.util.R;
 
+import com.ozs.rpm.util.JsonUtil;
 
+import com.ozs.rpm.util.R;
 
 
 import io.swagger.annotations.Api;
 
 import io.swagger.annotations.ApiOperation;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/KpiListColumnDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/MenuDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import java.util.Date;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/MenuViewDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/ReportDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import java.util.Date;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/ReportDataDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/ReportKPIDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/ReportKpiRelUserDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/ReportRelUserDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/ReportShowTypeDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/ReportSqlDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/RpmDimReportColorGroup.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/RpmDimTypeAll.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/RpmRelReportKpiUserDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/RpmRelReportUserDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/UserDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto;
 
+package com.ozs.rpm.dto;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/chart/ChartClassDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.chart;
 
+package com.ozs.rpm.dto.chart;
 
 
 import java.util.Date;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/chart/ChartInfoDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.chart;
 
+package com.ozs.rpm.dto.chart;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/chart/ChartTypeDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.chart;
 
+package com.ozs.rpm.dto.chart;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/chart/GetChartViewDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.chart;
 
+package com.ozs.rpm.dto.chart;
 
 
 import java.util.List;
 
 import java.util.Map;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/chart/ListSubjectDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.chart;
 
+package com.ozs.rpm.dto.chart;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/chart/RelSubjectChartDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.chart;
 
+package com.ozs.rpm.dto.chart;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/chart/RelSubjectChartParam.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.chart;
 
+package com.ozs.rpm.dto.chart;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/chart/RichTextFileR.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.chart;
 
+package com.ozs.rpm.dto.chart;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/chart/SubjectInfoDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.chart;
 
+package com.ozs.rpm.dto.chart;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/chart/SubjectPageInfoDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.chart;
 
+package com.ozs.rpm.dto.chart;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/chart/UserDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.chart;
 
+package com.ozs.rpm.dto.chart;
 
 
 import com.fasterxml.jackson.annotation.JsonInclude;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/data/KovDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.data;
 
+package com.ozs.rpm.dto.data;
 
 
 import lombok.Data;

+ 16 - 0
rpm/src/main/java/com/ozs/rpm/dto/data/ReportDataDTO.java
View File 

@@ -0,0 +1,16 @@
 
+package com.ozs.rpm.dto.data;
 
+
 
+import com.ozs.rpm.dto.data.barOrLine.BarOrLine;
 
+import com.ozs.rpm.dto.data.pie.Pie;
 
+import com.ozs.rpm.dto.data.table.Table;
 
+
 
+import lombok.Data;
 
+
 
+@Data
 
+public class ReportDataDTO {
 
+   
+    private Table table;
 
+    private BarOrLine barOrLine;
 
+    private Pie pie;
 
+    
+}

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/data/barOrLine/BarOrLine.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.data.barOrLine;
 
+package com.ozs.rpm.dto.data.barOrLine;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/data/barOrLine/Series.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.data.barOrLine;
 
+package com.ozs.rpm.dto.data.barOrLine;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/data/barOrLine/XAxis.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.data.barOrLine;
 
+package com.ozs.rpm.dto.data.barOrLine;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/data/barOrLine/YAxis.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.data.barOrLine;
 
+package com.ozs.rpm.dto.data.barOrLine;
 
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/data/pie/Pie.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.data.pie;
 
+package com.ozs.rpm.dto.data.pie;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/data/pie/SeriesData.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.data.pie;
 
+package com.ozs.rpm.dto.data.pie;
 
 
 import lombok.Data;

+ 2 - 2
rpm/src/main/java/com/datau/rpm/dto/data/table/Table.java
View File 

@@ -1,9 +1,9 @@
 
-package com.datau.rpm.dto.data.table;
 
+package com.ozs.rpm.dto.data.table;
 
 
 import java.util.List;
 
 import java.util.Map;
 
 
-import com.datau.rpm.dto.data.KovDTO;
 
+import com.ozs.rpm.dto.data.KovDTO;
 
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/data/table/TableHeader.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.data.table;
 
+package com.ozs.rpm.dto.data.table;
 
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/kpim/ColumnConfigDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.kpim;
 
+package com.ozs.rpm.dto.kpim;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/kpim/ComputedTypeInfoDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.kpim;
 
+package com.ozs.rpm.dto.kpim;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/kpim/DefinedTypeInfoDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.kpim;
 
+package com.ozs.rpm.dto.kpim;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/kpim/KpiConfigDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.kpim;
 
+package com.ozs.rpm.dto.kpim;
 
 
 import java.util.List;

+ 1 - 3
rpm/src/main/java/com/datau/rpm/dto/kpim/KpiConfigForListDTO.java
View File 

@@ -1,11 +1,9 @@
 
-package com.datau.rpm.dto.kpim;
 
+package com.ozs.rpm.dto.kpim;
 
 
 import io.swagger.annotations.ApiModel;
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;
 
 
-import java.util.List;
 
-
 
 /**
 
  * @ClassName KpiConfigDTO
 
  * @Desc Kpi配置实体类

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/kpim/KpiConfigPO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.kpim;
 
+package com.ozs.rpm.dto.kpim;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/kpim/KpiFunctionDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.kpim;
 
+package com.ozs.rpm.dto.kpim;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/kpim/RelColumnConfigDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.kpim;
 
+package com.ozs.rpm.dto.kpim;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/kpim/RuleConfigDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.kpim;
 
+package com.ozs.rpm.dto.kpim;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/kpim/TopicZtreeDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.kpim;
 
+package com.ozs.rpm.dto.kpim;
 
 
 import io.swagger.annotations.ApiModel;
 
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/mdm/KpiListColumnDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.mdm;
 
+package com.ozs.rpm.dto.mdm;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/mdm/MdmCreateTableDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.mdm;
 
+package com.ozs.rpm.dto.mdm;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/mdm/MdmInfoColumn.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.mdm;
 
+package com.ozs.rpm.dto.mdm;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/mdm/MdmInfoDatabase.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.mdm;
 
+package com.ozs.rpm.dto.mdm;
 
 
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/mdm/MdmInfoTable.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.mdm;
 
+package com.ozs.rpm.dto.mdm;
 
 
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/save/RelReportKpiDrillDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.save;
 
+package com.ozs.rpm.dto.save;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/save/RelReportOutsideParamDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.save;
 
+package com.ozs.rpm.dto.save;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/save/ReportKpiDrillDown.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.save;
 
+package com.ozs.rpm.dto.save;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/save/RpmInfoReportChartDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.save;
 
+package com.ozs.rpm.dto.save;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/save/SaveFiveDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.save;
 
+package com.ozs.rpm.dto.save;
 
 
 import java.util.List;

+ 1 - 2
rpm/src/main/java/com/datau/rpm/dto/save/SaveFourDTO.java
View File 

@@ -1,7 +1,6 @@
 
-package com.datau.rpm.dto.save;
 
+package com.ozs.rpm.dto.save;
 
 
 import java.util.List;
 
-import java.util.Map;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/save/SaveOneDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.save;
 
+package com.ozs.rpm.dto.save;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/save/SaveReportDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.save;
 
+package com.ozs.rpm.dto.save;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/save/SaveRportKpiDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.save;
 
+package com.ozs.rpm.dto.save;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/save/SaveThreeDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.save;
 
+package com.ozs.rpm.dto.save;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/save/SaveTwoDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.save;
 
+package com.ozs.rpm.dto.save;
 
 
 import java.util.List;

+ 3 - 3
rpm/src/main/java/com/datau/rpm/dto/util/ChartParameterDTO.java
View File 

@@ -1,10 +1,10 @@
 
-package com.datau.rpm.dto.util;
 
+package com.ozs.rpm.dto.util;
 
 
 import java.util.List;
 
 import java.util.Map;
 
 
-import com.datau.rpm.dto.kpim.KpiConfigDTO;
 
-import com.datau.rpm.dto.save.RpmInfoReportChartDTO;
 
+import com.ozs.rpm.dto.kpim.KpiConfigDTO;
 
+import com.ozs.rpm.dto.save.RpmInfoReportChartDTO;
 
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/util/SqlDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.util;
 
+package com.ozs.rpm.dto.util;
 
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/view/GroupKpiViewDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.view;
 
+package com.ozs.rpm.dto.view;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/view/ReportGroupKpiDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.view;
 
+package com.ozs.rpm.dto.view;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 4 - 4
rpm/src/main/java/com/datau/rpm/dto/view/ReportViewDTO.java
View File 

@@ -1,10 +1,10 @@
 
-package com.datau.rpm.dto.view;
 
+package com.ozs.rpm.dto.view;
 
 
 import java.util.List;
 
 
-import com.datau.rpm.dto.save.ReportKpiDrillDown;
 
-import com.datau.rpm.dto.save.RpmInfoReportChartDTO;
 
-import com.datau.rpm.dto.save.SaveRportKpiDTO;
 
+import com.ozs.rpm.dto.save.ReportKpiDrillDown;
 
+import com.ozs.rpm.dto.save.RpmInfoReportChartDTO;
 
+import com.ozs.rpm.dto.save.SaveRportKpiDTO;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/view/ReportViewDataParam.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.view;
 
+package com.ozs.rpm.dto.view;
 
 
 import java.util.List;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/view/ReportViewPieDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.view;
 
+package com.ozs.rpm.dto.view;
 
 
 import io.swagger.annotations.ApiModelProperty;
 
 import lombok.Data;

+ 1 - 1
rpm/src/main/java/com/datau/rpm/dto/view/ReportViewQueryDTO.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.dto.view;
 
+package com.ozs.rpm.dto.view;
 
 
 import java.util.List;

+ 2 - 3
rpm/src/main/java/com/datau/rpm/mapper/ChartClassMapper.java
View File 

@@ -1,11 +1,10 @@
 
-package com.datau.rpm.mapper;
 
+package com.ozs.rpm.mapper;
 
 
 import java.util.List;
 
 
+import com.ozs.rpm.dto.chart.ChartClassDTO;
 
 import org.apache.ibatis.annotations.Param;
 
 
-import com.datau.rpm.dto.chart.ChartClassDTO;
 
-
 
 public interface ChartClassMapper {
 
 
 	public List<ChartClassDTO> listChartClassByName(@Param("className") String className) throws Exception;

+ 2 - 2
rpm/src/main/java/com/datau/rpm/mapper/MenuMapper.java
View File 

@@ -1,10 +1,10 @@
 
-package com.datau.rpm.mapper;
 
+package com.ozs.rpm.mapper;
 
 
 import java.util.List;
 
 
 import org.apache.ibatis.annotations.Param;
 
 
-import com.datau.rpm.dto.MenuDTO;
 
+import com.ozs.rpm.dto.MenuDTO;
 
 
 public interface MenuMapper {

+ 7 - 7
rpm/src/main/java/com/datau/rpm/mapper/ReportAutoViewMapper.java
View File 

@@ -1,15 +1,15 @@
 
-package com.datau.rpm.mapper;
 
+package com.ozs.rpm.mapper;
 
 
 import java.util.List;
 
 
+import com.ozs.rpm.dto.view.ReportViewPieDTO;
 
 import org.apache.ibatis.annotations.Param;
 
 
-import com.datau.rpm.dto.ReportDTO;
 
-import com.datau.rpm.dto.save.RpmInfoReportChartDTO;
 
-import com.datau.rpm.dto.save.SaveRportKpiDTO;
 
-import com.datau.rpm.dto.view.ReportViewDTO;
 
-import com.datau.rpm.dto.view.ReportViewPieDTO;
 
-import com.datau.rpm.dto.view.ReportViewQueryDTO;
 
+import com.ozs.rpm.dto.ReportDTO;
 
+import com.ozs.rpm.dto.save.RpmInfoReportChartDTO;
 
+import com.ozs.rpm.dto.save.SaveRportKpiDTO;
 
+import com.ozs.rpm.dto.view.ReportViewDTO;
 
+import com.ozs.rpm.dto.view.ReportViewQueryDTO;
 
 
 public interface ReportAutoViewMapper {

+ 21 - 21
rpm/src/main/java/com/datau/rpm/mapper/ReportMapper.java
View File 

@@ -1,29 +1,29 @@
 
-package com.datau.rpm.mapper;
 
+package com.ozs.rpm.mapper;
 
 
 import java.util.List;
 
 
+import com.ozs.rpm.dto.RpmRelReportUserDTO;
 
+import com.ozs.rpm.dto.chart.ChartTypeDTO;
 
 import org.apache.ibatis.annotations.Param;
 
 
-import com.datau.rpm.dto.ReportDTO;
 
-import com.datau.rpm.dto.ReportKPIDTO;
 
-import com.datau.rpm.dto.ReportSqlDTO;
 
-import com.datau.rpm.dto.RpmDimReportColorGroup;
 
-import com.datau.rpm.dto.RpmDimTypeAll;
 
-import com.datau.rpm.dto.RpmRelReportKpiUserDTO;
 
-import com.datau.rpm.dto.RpmRelReportUserDTO;
 
-import com.datau.rpm.dto.UserDTO;
 
-import com.datau.rpm.dto.chart.ChartTypeDTO;
 
-import com.datau.rpm.dto.save.RelReportKpiDrillDTO;
 
-import com.datau.rpm.dto.save.RelReportOutsideParamDTO;
 
-import com.datau.rpm.dto.save.ReportKpiDrillDown;
 
-import com.datau.rpm.dto.save.RpmInfoReportChartDTO;
 
-import com.datau.rpm.dto.save.SaveFiveDTO;
 
-import com.datau.rpm.dto.save.SaveFourDTO;
 
-import com.datau.rpm.dto.save.SaveOneDTO;
 
-import com.datau.rpm.dto.save.SaveReportDTO;
 
-import com.datau.rpm.dto.save.SaveRportKpiDTO;
 
-import com.datau.rpm.dto.save.SaveThreeDTO;
 
-import com.datau.rpm.dto.save.SaveTwoDTO;
 
+import com.ozs.rpm.dto.ReportDTO;
 
+import com.ozs.rpm.dto.ReportKPIDTO;
 
+import com.ozs.rpm.dto.ReportSqlDTO;
 
+import com.ozs.rpm.dto.RpmDimReportColorGroup;
 
+import com.ozs.rpm.dto.RpmDimTypeAll;
 
+import com.ozs.rpm.dto.RpmRelReportKpiUserDTO;
 
+import com.ozs.rpm.dto.UserDTO;
 
+import com.ozs.rpm.dto.save.RelReportKpiDrillDTO;
 
+import com.ozs.rpm.dto.save.RelReportOutsideParamDTO;
 
+import com.ozs.rpm.dto.save.ReportKpiDrillDown;
 
+import com.ozs.rpm.dto.save.RpmInfoReportChartDTO;
 
+import com.ozs.rpm.dto.save.SaveFiveDTO;
 
+import com.ozs.rpm.dto.save.SaveFourDTO;
 
+import com.ozs.rpm.dto.save.SaveOneDTO;
 
+import com.ozs.rpm.dto.save.SaveReportDTO;
 
+import com.ozs.rpm.dto.save.SaveRportKpiDTO;
 
+import com.ozs.rpm.dto.save.SaveThreeDTO;
 
+import com.ozs.rpm.dto.save.SaveTwoDTO;
 
 
 public interface ReportMapper {

+ 3 - 3
rpm/src/main/java/com/datau/rpm/service/ChartClassService.java
View File 

@@ -1,9 +1,9 @@
 
-package com.datau.rpm.service;
 
+package com.ozs.rpm.service;
 
 
 import java.util.List;
 
 
-import com.datau.rpm.dto.chart.ChartClassDTO;
 
-import com.datau.rpm.util.R;
 
+import com.ozs.rpm.dto.chart.ChartClassDTO;
 
+import com.ozs.rpm.util.R;
 
 
 public interface ChartClassService {

+ 6 - 6
rpm/src/main/java/com/datau/rpm/service/MenuService.java
View File 

@@ -1,12 +1,12 @@
 
-package com.datau.rpm.service;
 
+package com.ozs.rpm.service;
 
 
 import java.util.List;
 
 
-import com.datau.rpm.dto.MenuDTO;
 
-import com.datau.rpm.dto.ReportDTO;
 
-import com.datau.rpm.dto.ReportKPIDTO;
 
-import com.datau.rpm.dto.ReportShowTypeDTO;
 
-import com.datau.rpm.util.R;
 
+import com.ozs.rpm.dto.MenuDTO;
 
+import com.ozs.rpm.dto.ReportDTO;
 
+import com.ozs.rpm.dto.ReportKPIDTO;
 
+import com.ozs.rpm.dto.ReportShowTypeDTO;
 
+import com.ozs.rpm.util.R;
 
 
 public interface MenuService {

+ 4 - 5
rpm/src/main/java/com/datau/rpm/service/ReportAutoViewService.java
View File 

@@ -1,11 +1,10 @@
 
-package com.datau.rpm.service;
 
+package com.ozs.rpm.service;
 
 
 import java.util.List;
 
 
-import com.datau.rpm.dto.ReportDTO;
 
-import com.datau.rpm.dto.data.ReportDataDTO;
 
-import com.datau.rpm.dto.view.ReportViewDTO;
 
-import com.datau.rpm.util.R;
 
+import com.ozs.rpm.dto.ReportDTO;
 
+import com.ozs.rpm.dto.view.ReportViewDTO;
 
+import com.ozs.rpm.util.R;
 
 
 public interface ReportAutoViewService {

+ 3 - 3
rpm/src/main/java/com/datau/rpm/service/ReportDataAllService.java
View File 

@@ -1,7 +1,7 @@
 
-package com.datau.rpm.service;
 
+package com.ozs.rpm.service;
 
 
-import com.datau.rpm.dto.data.ReportDataDTO;
 
-import com.datau.rpm.util.R;
 
+import com.ozs.rpm.dto.data.ReportDataDTO;
 
+import com.ozs.rpm.util.R;
 
 
 public interface ReportDataAllService {

+ 2 - 2
rpm/src/main/java/com/datau/rpm/service/ReportDataService.java
View File 

@@ -1,6 +1,6 @@
 
-package com.datau.rpm.service;
 
+package com.ozs.rpm.service;
 
 
-import com.datau.rpm.util.R;
 
+import com.ozs.rpm.util.R;
 
 
 public interface ReportDataService {

+ 21 - 21
rpm/src/main/java/com/datau/rpm/service/ReportService.java
View File 

@@ -1,29 +1,29 @@
 
-package com.datau.rpm.service;
 
+package com.ozs.rpm.service;
 
 
 import java.util.List;
 
 
 import org.springframework.web.multipart.MultipartFile;
 
 
-import com.datau.rpm.dto.ReportDTO;
 
-import com.datau.rpm.dto.ReportKPIDTO;
 
-import com.datau.rpm.dto.ReportKpiRelUserDTO;
 
-import com.datau.rpm.dto.ReportRelUserDTO;
 
-import com.datau.rpm.dto.RpmDimTypeAll;
 
-import com.datau.rpm.dto.UserDTO;
 
-import com.datau.rpm.dto.chart.ChartTypeDTO;
 
-import com.datau.rpm.dto.chart.RichTextFileR;
 
-import com.datau.rpm.dto.data.ReportDataDTO;
 
-import com.datau.rpm.dto.mdm.MdmInfoColumn;
 
-import com.datau.rpm.dto.mdm.MdmInfoDatabase;
 
-import com.datau.rpm.dto.mdm.MdmInfoTable;
 
-import com.datau.rpm.dto.save.SaveFiveDTO;
 
-import com.datau.rpm.dto.save.SaveFourDTO;
 
-import com.datau.rpm.dto.save.SaveOneDTO;
 
-import com.datau.rpm.dto.save.SaveReportDTO;
 
-import com.datau.rpm.dto.save.SaveThreeDTO;
 
-import com.datau.rpm.dto.save.SaveTwoDTO;
 
-import com.datau.rpm.dto.view.ReportViewDataParam;
 
-import com.datau.rpm.util.R;
 
+import com.ozs.rpm.dto.ReportDTO;
 
+import com.ozs.rpm.dto.ReportKPIDTO;
 
+import com.ozs.rpm.dto.ReportKpiRelUserDTO;
 
+import com.ozs.rpm.dto.ReportRelUserDTO;
 
+import com.ozs.rpm.dto.RpmDimTypeAll;
 
+import com.ozs.rpm.dto.UserDTO;
 
+import com.ozs.rpm.dto.chart.ChartTypeDTO;
 
+import com.ozs.rpm.dto.chart.RichTextFileR;
 
+import com.ozs.rpm.dto.data.ReportDataDTO;
 
+import com.ozs.rpm.dto.mdm.MdmInfoColumn;
 
+import com.ozs.rpm.dto.mdm.MdmInfoDatabase;
 
+import com.ozs.rpm.dto.mdm.MdmInfoTable;
 
+import com.ozs.rpm.dto.save.SaveFiveDTO;
 
+import com.ozs.rpm.dto.save.SaveFourDTO;
 
+import com.ozs.rpm.dto.save.SaveOneDTO;
 
+import com.ozs.rpm.dto.save.SaveReportDTO;
 
+import com.ozs.rpm.dto.save.SaveThreeDTO;
 
+import com.ozs.rpm.dto.save.SaveTwoDTO;
 
+import com.ozs.rpm.dto.view.ReportViewDataParam;
 
+import com.ozs.rpm.util.R;
 
 
 public interface ReportService {

+ 6 - 6
rpm/src/main/java/com/datau/rpm/service/impl/ChartClassServiceImpl.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.service.impl;
 
+package com.ozs.rpm.service.impl;
 
 
 import java.util.List;
 
 
@@ -6,11 +6,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Service;
 
 import org.springframework.transaction.annotation.Transactional;
 
 
-import com.datau.rpm.dto.chart.ChartClassDTO;
 
-import com.datau.rpm.mapper.ChartClassMapper;
 
-import com.datau.rpm.service.ChartClassService;
 
-import com.datau.rpm.util.R;
 
-import com.datau.rpm.util.RandomUtil;
 
+import com.ozs.rpm.dto.chart.ChartClassDTO;
 
+import com.ozs.rpm.mapper.ChartClassMapper;
 
+import com.ozs.rpm.service.ChartClassService;
 
+import com.ozs.rpm.util.R;
 
+import com.ozs.rpm.util.RandomUtil;
 
 
 @Service
 
 public class ChartClassServiceImpl implements ChartClassService {

+ 9 - 9
rpm/src/main/java/com/datau/rpm/service/impl/MenuServiceImpl.java
View File 

@@ -1,20 +1,20 @@
 
-package com.datau.rpm.service.impl;
 
+package com.ozs.rpm.service.impl;
 
 
 import java.util.ArrayList;
 
 import java.util.List;
 
 
+import com.ozs.rpm.service.MenuService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Service;
 
 import org.springframework.transaction.annotation.Transactional;
 
 
-import com.datau.rpm.dto.MenuDTO;
 
-import com.datau.rpm.dto.ReportDTO;
 
-import com.datau.rpm.dto.ReportKPIDTO;
 
-import com.datau.rpm.dto.ReportShowTypeDTO;
 
-import com.datau.rpm.mapper.MenuMapper;
 
-import com.datau.rpm.service.MenuService;
 
-import com.datau.rpm.util.R;
 
-import com.datau.rpm.util.RandomUtil;
 
+import com.ozs.rpm.dto.MenuDTO;
 
+import com.ozs.rpm.dto.ReportDTO;
 
+import com.ozs.rpm.dto.ReportKPIDTO;
 
+import com.ozs.rpm.dto.ReportShowTypeDTO;
 
+import com.ozs.rpm.mapper.MenuMapper;
 
+import com.ozs.rpm.util.R;
 
+import com.ozs.rpm.util.RandomUtil;
 
 
 @Service
 
 public class MenuServiceImpl implements MenuService {

+ 25 - 27
rpm/src/main/java/com/datau/rpm/service/impl/ReportAutoViewServiceImpl.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.service.impl;
 
+package com.ozs.rpm.service.impl;
 
 
 import java.util.ArrayList;
 
 import java.util.Collections;
 
@@ -11,32 +11,30 @@ import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Service;
 
 
-import com.datau.rpm.dto.KpiListColumnDTO;
 
-import com.datau.rpm.dto.ReportDTO;
 
-import com.datau.rpm.dto.ReportSqlDTO;
 
-import com.datau.rpm.dto.kpim.ComputedTypeInfoDTO;
 
-import com.datau.rpm.dto.kpim.DefinedTypeInfoDTO;
 
-import com.datau.rpm.dto.kpim.KpiConfigDTO;
 
-import com.datau.rpm.dto.kpim.RelColumnConfigDTO;
 
-import com.datau.rpm.dto.kpim.RuleConfigDTO;
 
-import com.datau.rpm.dto.save.RelReportKpiDrillDTO;
 
-import com.datau.rpm.dto.save.ReportKpiDrillDown;
 
-import com.datau.rpm.dto.save.RpmInfoReportChartDTO;
 
-import com.datau.rpm.dto.save.SaveRportKpiDTO;
 
-import com.datau.rpm.dto.view.GroupKpiViewDTO;
 
-import com.datau.rpm.dto.view.ReportViewDTO;
 
-import com.datau.rpm.dto.view.ReportViewPieDTO;
 
-import com.datau.rpm.dto.view.ReportViewQueryDTO;
 
-import com.datau.rpm.mapper.ReportAutoViewMapper;
 
-import com.datau.rpm.mapper.ReportMapper;
 
-import com.datau.rpm.service.ReportAutoViewService;
 
-import com.datau.rpm.util.AccountApi;
 
-import com.datau.rpm.util.KpimApi;
 
-import com.datau.rpm.util.MdmApi;
 
-import com.datau.rpm.util.R;
 
-import com.datau.rpm.util.StringUtil;
 
-
 
-import io.swagger.annotations.ApiModelProperty;
 
+import com.ozs.rpm.dto.KpiListColumnDTO;
 
+import com.ozs.rpm.dto.ReportDTO;
 
+import com.ozs.rpm.dto.ReportSqlDTO;
 
+import com.ozs.rpm.dto.kpim.ComputedTypeInfoDTO;
 
+import com.ozs.rpm.dto.kpim.DefinedTypeInfoDTO;
 
+import com.ozs.rpm.dto.kpim.KpiConfigDTO;
 
+import com.ozs.rpm.dto.kpim.RelColumnConfigDTO;
 
+import com.ozs.rpm.dto.kpim.RuleConfigDTO;
 
+import com.ozs.rpm.dto.save.RelReportKpiDrillDTO;
 
+import com.ozs.rpm.dto.save.ReportKpiDrillDown;
 
+import com.ozs.rpm.dto.save.RpmInfoReportChartDTO;
 
+import com.ozs.rpm.dto.save.SaveRportKpiDTO;
 
+import com.ozs.rpm.dto.view.GroupKpiViewDTO;
 
+import com.ozs.rpm.dto.view.ReportViewDTO;
 
+import com.ozs.rpm.dto.view.ReportViewPieDTO;
 
+import com.ozs.rpm.dto.view.ReportViewQueryDTO;
 
+import com.ozs.rpm.mapper.ReportAutoViewMapper;
 
+import com.ozs.rpm.mapper.ReportMapper;
 
+import com.ozs.rpm.service.ReportAutoViewService;
 
+import com.ozs.rpm.util.AccountApi;
 
+import com.ozs.rpm.util.KpimApi;
 
+import com.ozs.rpm.util.MdmApi;
 
+import com.ozs.rpm.util.R;
 
+import com.ozs.rpm.util.StringUtil;
 
 
 @Service
 
 public class ReportAutoViewServiceImpl implements ReportAutoViewService {

+ 4 - 4
rpm/src/main/java/com/datau/rpm/service/impl/ReportDataAllServiceImpl.java
View File 

@@ -1,10 +1,10 @@
 
-package com.datau.rpm.service.impl;
 
+package com.ozs.rpm.service.impl;
 
 
 import org.springframework.stereotype.Service;
 
 
-import com.datau.rpm.dto.data.ReportDataDTO;
 
-import com.datau.rpm.service.ReportDataAllService;
 
-import com.datau.rpm.util.R;
 
+import com.ozs.rpm.dto.data.ReportDataDTO;
 
+import com.ozs.rpm.service.ReportDataAllService;
 
+import com.ozs.rpm.util.R;
 
 
 @Service
 
 public class ReportDataAllServiceImpl implements ReportDataAllService{

+ 19 - 19
rpm/src/main/java/com/datau/rpm/service/impl/ReportDataServiceImpl.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.service.impl;
 
+package com.ozs.rpm.service.impl;
 
 
 import java.util.ArrayList;
 
 import java.util.HashMap;
 
@@ -10,24 +10,24 @@ import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Service;
 
 
-import com.datau.rpm.dto.KpiListColumnDTO;
 
-import com.datau.rpm.dto.ReportDTO;
 
-import com.datau.rpm.dto.ReportKPIDTO;
 
-import com.datau.rpm.dto.ReportSqlDTO;
 
-import com.datau.rpm.dto.kpim.ComputedTypeInfoDTO;
 
-import com.datau.rpm.dto.kpim.DefinedTypeInfoDTO;
 
-import com.datau.rpm.dto.kpim.KpiConfigDTO;
 
-import com.datau.rpm.dto.kpim.RelColumnConfigDTO;
 
-import com.datau.rpm.dto.kpim.RuleConfigDTO;
 
-import com.datau.rpm.dto.save.RpmInfoReportChartDTO;
 
-import com.datau.rpm.dto.util.ChartParameterDTO;
 
-import com.datau.rpm.mapper.ReportMapper;
 
-import com.datau.rpm.service.ReportDataService;
 
-import com.datau.rpm.util.KpimApi;
 
-import com.datau.rpm.util.MdmApi;
 
-import com.datau.rpm.util.R;
 
-import com.datau.rpm.util.S;
 
-import com.datau.rpm.util.StringUtil;
 
+import com.ozs.rpm.dto.KpiListColumnDTO;
 
+import com.ozs.rpm.dto.ReportDTO;
 
+import com.ozs.rpm.dto.ReportKPIDTO;
 
+import com.ozs.rpm.dto.ReportSqlDTO;
 
+import com.ozs.rpm.dto.kpim.ComputedTypeInfoDTO;
 
+import com.ozs.rpm.dto.kpim.DefinedTypeInfoDTO;
 
+import com.ozs.rpm.dto.kpim.KpiConfigDTO;
 
+import com.ozs.rpm.dto.kpim.RelColumnConfigDTO;
 
+import com.ozs.rpm.dto.kpim.RuleConfigDTO;
 
+import com.ozs.rpm.dto.save.RpmInfoReportChartDTO;
 
+import com.ozs.rpm.dto.util.ChartParameterDTO;
 
+import com.ozs.rpm.mapper.ReportMapper;
 
+import com.ozs.rpm.service.ReportDataService;
 
+import com.ozs.rpm.util.KpimApi;
 
+import com.ozs.rpm.util.MdmApi;
 
+import com.ozs.rpm.util.R;
 
+import com.ozs.rpm.util.S;
 
+import com.ozs.rpm.util.StringUtil;
 
 
 import lombok.extern.slf4j.Slf4j;

+ 11 - 11
rpm/src/main/java/com/datau/rpm/service/impl/ReportDataServiceImplUtil.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.service.impl;
 
+package com.ozs.rpm.service.impl;
 
 
 import java.util.ArrayList;
 
 import java.util.HashMap;
 
@@ -7,16 +7,16 @@ import java.util.List;
 
 import java.util.Map;
 
 import java.util.Set;
 
 
-import com.datau.rpm.dto.ReportSqlDTO;
 
-import com.datau.rpm.dto.kpim.ColumnConfigDTO;
 
-import com.datau.rpm.dto.kpim.ComputedTypeInfoDTO;
 
-import com.datau.rpm.dto.kpim.DefinedTypeInfoDTO;
 
-import com.datau.rpm.dto.kpim.KpiConfigDTO;
 
-import com.datau.rpm.dto.kpim.RelColumnConfigDTO;
 
-import com.datau.rpm.dto.kpim.RuleConfigDTO;
 
-import com.datau.rpm.dto.util.ChartParameterDTO;
 
-import com.datau.rpm.dto.util.SqlDTO;
 
-import com.datau.rpm.util.StringUtil;
 
+import com.ozs.rpm.dto.ReportSqlDTO;
 
+import com.ozs.rpm.dto.kpim.ColumnConfigDTO;
 
+import com.ozs.rpm.dto.kpim.ComputedTypeInfoDTO;
 
+import com.ozs.rpm.dto.kpim.DefinedTypeInfoDTO;
 
+import com.ozs.rpm.dto.kpim.KpiConfigDTO;
 
+import com.ozs.rpm.dto.kpim.RelColumnConfigDTO;
 
+import com.ozs.rpm.dto.kpim.RuleConfigDTO;
 
+import com.ozs.rpm.dto.util.ChartParameterDTO;
 
+import com.ozs.rpm.dto.util.SqlDTO;
 
+import com.ozs.rpm.util.StringUtil;
 
 
 public class ReportDataServiceImplUtil {

+ 49 - 50
rpm/src/main/java/com/datau/rpm/service/impl/ReportServiceImpl.java
View File 

@@ -1,4 +1,4 @@
 
-package com.datau.rpm.service.impl;
 
+package com.ozs.rpm.service.impl;
 
 
 import java.io.File;
 
 import java.util.ArrayList;
 
@@ -17,55 +17,54 @@ import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.web.multipart.MultipartFile;
 
 import org.springframework.web.util.HtmlUtils;
 
 
-import com.datau.rpm.dto.KpiListColumnDTO;
 
-import com.datau.rpm.dto.ReportDTO;
 
-import com.datau.rpm.dto.ReportKPIDTO;
 
-import com.datau.rpm.dto.ReportKpiRelUserDTO;
 
-import com.datau.rpm.dto.ReportRelUserDTO;
 
-import com.datau.rpm.dto.ReportSqlDTO;
 
-import com.datau.rpm.dto.RpmDimTypeAll;
 
-import com.datau.rpm.dto.RpmRelReportKpiUserDTO;
 
-import com.datau.rpm.dto.UserDTO;
 
-import com.datau.rpm.dto.chart.ChartTypeDTO;
 
-import com.datau.rpm.dto.chart.RichTextFileR;
 
-import com.datau.rpm.dto.data.KovDTO;
 
-import com.datau.rpm.dto.data.ReportDataDTO;
 
-import com.datau.rpm.dto.data.barOrLine.BarOrLine;
 
-import com.datau.rpm.dto.data.barOrLine.Series;
 
-import com.datau.rpm.dto.data.barOrLine.XAxis;
 
-import com.datau.rpm.dto.data.barOrLine.YAxis;
 
-import com.datau.rpm.dto.data.pie.Pie;
 
-import com.datau.rpm.dto.data.pie.SeriesData;
 
-import com.datau.rpm.dto.data.table.Table;
 
-import com.datau.rpm.dto.data.table.TableHeader;
 
-import com.datau.rpm.dto.kpim.KpiConfigDTO;
 
-import com.datau.rpm.dto.mdm.MdmCreateTableDTO;
 
-import com.datau.rpm.dto.mdm.MdmInfoColumn;
 
-import com.datau.rpm.dto.mdm.MdmInfoDatabase;
 
-import com.datau.rpm.dto.mdm.MdmInfoTable;
 
-import com.datau.rpm.dto.save.RelReportKpiDrillDTO;
 
-import com.datau.rpm.dto.save.RelReportOutsideParamDTO;
 
-import com.datau.rpm.dto.save.ReportKpiDrillDown;
 
-import com.datau.rpm.dto.save.RpmInfoReportChartDTO;
 
-import com.datau.rpm.dto.save.SaveFiveDTO;
 
-import com.datau.rpm.dto.save.SaveFourDTO;
 
-import com.datau.rpm.dto.save.SaveOneDTO;
 
-import com.datau.rpm.dto.save.SaveReportDTO;
 
-import com.datau.rpm.dto.save.SaveRportKpiDTO;
 
-import com.datau.rpm.dto.save.SaveThreeDTO;
 
-import com.datau.rpm.dto.save.SaveTwoDTO;
 
-import com.datau.rpm.dto.view.ReportGroupKpiDTO;
 
-import com.datau.rpm.dto.view.ReportViewDataParam;
 
-import com.datau.rpm.dto.view.ReportViewQueryDTO;
 
-import com.datau.rpm.service.ReportService;
 
-import com.datau.rpm.util.CSVUtils;
 
-import com.datau.rpm.util.DateUtils;
 
-import com.datau.rpm.util.FileTool;
 
-import com.datau.rpm.util.PageUtil;
 
-import com.datau.rpm.util.R;
 
-import com.datau.rpm.util.StringUtil;
 
-
 
-import io.swagger.annotations.ApiModelProperty;
 
+import com.ozs.rpm.dto.KpiListColumnDTO;
 
+import com.ozs.rpm.dto.ReportDTO;
 
+import com.ozs.rpm.dto.ReportKPIDTO;
 
+import com.ozs.rpm.dto.ReportKpiRelUserDTO;
 
+import com.ozs.rpm.dto.ReportRelUserDTO;
 
+import com.ozs.rpm.dto.ReportSqlDTO;
 
+import com.ozs.rpm.dto.RpmDimTypeAll;
 
+import com.ozs.rpm.dto.RpmRelReportKpiUserDTO;
 
+import com.ozs.rpm.dto.UserDTO;
 
+import com.ozs.rpm.dto.chart.ChartTypeDTO;
 
+import com.ozs.rpm.dto.chart.RichTextFileR;
 
+import com.ozs.rpm.dto.data.KovDTO;
 
+import com.ozs.rpm.dto.data.ReportDataDTO;
 
+import com.ozs.rpm.dto.data.barOrLine.BarOrLine;
 
+import com.ozs.rpm.dto.data.barOrLine.Series;
 
+import com.ozs.rpm.dto.data.barOrLine.XAxis;
 
+import com.ozs.rpm.dto.data.barOrLine.YAxis;
 
+import com.ozs.rpm.dto.data.pie.Pie;
 
+import com.ozs.rpm.dto.data.pie.SeriesData;
 
+import com.ozs.rpm.dto.data.table.Table;
 
+import com.ozs.rpm.dto.data.table.TableHeader;
 
+import com.ozs.rpm.dto.kpim.KpiConfigDTO;
 
+import com.ozs.rpm.dto.mdm.MdmCreateTableDTO;
 
+import com.ozs.rpm.dto.mdm.MdmInfoColumn;
 
+import com.ozs.rpm.dto.mdm.MdmInfoDatabase;
 
+import com.ozs.rpm.dto.mdm.MdmInfoTable;
 
+import com.ozs.rpm.dto.save.RelReportKpiDrillDTO;
 
+import com.ozs.rpm.dto.save.RelReportOutsideParamDTO;
 
+import com.ozs.rpm.dto.save.ReportKpiDrillDown;
 
+import com.ozs.rpm.dto.save.RpmInfoReportChartDTO;
 
+import com.ozs.rpm.dto.save.SaveFiveDTO;
 
+import com.ozs.rpm.dto.save.SaveFourDTO;
 
+import com.ozs.rpm.dto.save.SaveOneDTO;
 
+import com.ozs.rpm.dto.save.SaveReportDTO;
 
+import com.ozs.rpm.dto.save.SaveRportKpiDTO;
 
+import com.ozs.rpm.dto.save.SaveThreeDTO;
 
+import com.ozs.rpm.dto.save.SaveTwoDTO;
 
+import com.ozs.rpm.dto.view.ReportGroupKpiDTO;
 
+import com.ozs.rpm.dto.view.ReportViewDataParam;
 
+import com.ozs.rpm.dto.view.ReportViewQueryDTO;
 
+import com.ozs.rpm.service.ReportService;
 
+import com.ozs.rpm.util.CSVUtils;
 
+import com.ozs.rpm.util.DateUtils;
 
+import com.ozs.rpm.util.FileTool;
 
+import com.ozs.rpm.util.PageUtil;
 
+import com.ozs.rpm.util.R;
 
+import com.ozs.rpm.util.StringUtil;
 
+
 
 import lombok.extern.slf4j.Slf4j;
 
 
 @Slf4j

+ 0 - 0
rpm/src/main/java/com/datau/rpm/service/impl/ReportServiceImplUtil.java
View File


Some files were not shown because too many files changed in this diff