Selaa lähdekoodia

删除目录jeecg-boot-module-system/target

宋英豪 6 vuotta sitten
vanhempi
commit
e434584556
100 muutettua tiedostoa jossa 0 lisäystä ja 53239 poistoa
  1. BIN
      jeecg-boot-module-system/target/classes/META-INF/jeecg-boot-module-system.kotlin_module
  2. 0 136
      jeecg-boot-module-system/target/classes/application-dev.yml
  3. 0 139
      jeecg-boot-module-system/target/classes/application-prod.yml
  4. 0 139
      jeecg-boot-module-system/target/classes/application-test.yml
  5. 0 9
      jeecg-boot-module-system/target/classes/application.yml
  6. 0 14
      jeecg-boot-module-system/target/classes/banner.txt
  7. 0 8
      jeecg-boot-module-system/target/classes/db/data-mysql.sql
  8. 0 11
      jeecg-boot-module-system/target/classes/db/schema-mysql.sql
  9. 0 244
      jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
  10. 0 53
      jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  11. 0 17
      jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
  12. 0 5
      jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
  13. 0 14
      jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
  14. 0 19
      jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
  15. 0 171
      jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
  16. 0 155
      jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
  17. 0 162
      jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
  18. 0 232
      jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai
  19. 0 45
      jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai
  20. 0 17
      jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai
  21. 0 5
      jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xml
  22. 0 14
      jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai
  23. 0 19
      jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai
  24. 0 171
      jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei
  25. 0 155
      jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei
  26. 0 162
      jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei
  27. 0 274
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
  28. 0 39
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  29. 0 50
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
  30. 0 17
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
  31. 0 21
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
  32. 0 5
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
  33. 0 38
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
  34. 0 42
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
  35. 0 19
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
  36. 0 101
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
  37. 0 30
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
  38. 0 50
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
  39. 0 162
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
  40. 0 184
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
  41. 0 374
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai
  42. 0 39
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  43. 0 49
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
  44. 0 17
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai
  45. 0 21
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai
  46. 0 5
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
  47. 0 38
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml
  48. 0 42
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai
  49. 0 19
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai
  50. 0 101
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai
  51. 0 30
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai
  52. 0 49
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai
  53. 0 225
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
  54. 0 140
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei
  55. 0 167
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
  56. 0 183
      jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei
  57. 0 23
      jeecg-boot-module-system/target/classes/jeecg/jeecg_config.properties
  58. 0 24
      jeecg-boot-module-system/target/classes/jeecg/jeecg_database.properties
  59. 0 96
      jeecg-boot-module-system/target/classes/logback-spring.xml
  60. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/AdvertiserMapper.xml
  61. 0 4
      jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CTopOauthTokenMapper.xml
  62. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoAdvertisePlanMapper.xml
  63. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoAdvertiserMapper.xml
  64. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoCampaignMapper.xml
  65. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CtopToutiaoAdvertiserBudgetMapper.xml
  66. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CtopToutiaoBudgetTemplateMapper.xml
  67. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/ToutiaoCreativeMapper.xml
  68. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/ToutiaoCreativeMaterialMapper.xml
  69. 0 9
      jeecg-boot-module-system/target/classes/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml
  70. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml
  71. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml
  72. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml
  73. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xml
  74. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/industry/mapper/xml/IndustryMapper.xml
  75. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/media/mapper/xml/MediaMapper.xml
  76. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xml
  77. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xml
  78. 0 7
      jeecg-boot-module-system/target/classes/org/jeecg/modules/ngalain/mapper/xml/NgAlainMapper.xml
  79. 0 9
      jeecg-boot-module-system/target/classes/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml
  80. 0 37
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml
  81. 0 48
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml
  82. 0 16
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysCategoryMapper.xml
  83. 0 10
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xml
  84. 0 10
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
  85. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xml
  86. 0 76
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
  87. 0 37
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml
  88. 0 16
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml
  89. 0 57
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
  90. 0 5
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysUserAgentMapper.xml
  91. 0 9
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
  92. 0 42
      jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
  93. 0 1
      jeecg-boot-module-system/target/classes/static/demo1.html
  94. 0 177
      jeecg-boot-module-system/target/classes/static/generic/LICENSE
  95. 0 8084
      jeecg-boot-module-system/target/classes/static/generic/build/pdf.js
  96. 0 39710
      jeecg-boot-module-system/target/classes/static/generic/build/pdf.worker.js
  97. BIN
      jeecg-boot-module-system/target/classes/static/generic/web/cmaps/78-EUC-H.bcmap
  98. BIN
      jeecg-boot-module-system/target/classes/static/generic/web/cmaps/78-EUC-V.bcmap
  99. BIN
      jeecg-boot-module-system/target/classes/static/generic/web/cmaps/78-H.bcmap
  100. 0 0
      jeecg-boot-module-system/target/classes/static/generic/web/cmaps/78-RKSJ-H.bcmap

BIN
jeecg-boot-module-system/target/classes/META-INF/jeecg-boot-module-system.kotlin_module


+ 0 - 136
jeecg-boot-module-system/target/classes/application-dev.yml

@@ -1,136 +0,0 @@
-server:
-  port: 8080
-  servlet:
-    context-path: /jeecg-boot
-    compression:
-      enabled: true
-      mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: metrics,httptrace
-
-spring:
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
-  ## quartz定时任务,采用数据库方式
-  quartz:
-    job-store-type: jdbc
-  #json 时间戳统一转换
-  jackson:
-    date-format:   yyyy-MM-dd HH:mm:ss
-    time-zone:   GMT+8
-  aop:
-    proxy-target-class: true
-  #配置freemarker
-  freemarker:
-    # 设置模板后缀名
-    suffix: .ftl
-    # 设置文档类型
-    content-type: text/html
-    # 设置页面编码格式
-    charset: UTF-8
-    # 设置页面缓存
-    cache: false
-    prefer-file-system-access: false
-    # 设置ftl文件路径
-    template-loader-path:
-      - classpath:/templates
-  # 设置静态文件路径,js,css等
-  mvc:
-    static-path-pattern: /**
-  resource:
-    static-locations: classpath:/static/,classpath:/public/
-  autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  datasource:
-    druid:
-      stat-view-servlet:
-        enabled: true
-        loginUsername: admin
-        loginPassword: 123456
-      web-stat-filter:
-        enabled: true
-    dynamic:
-      druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
-        # 连接池的配置信息
-        # 初始化大小,最小,最大
-        connection-init-sql: set names utf8mb4
-
-        initial-size: 5
-        min-idle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间,单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache,并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-        filters: stat,wall,slf4j
-        # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-      datasource:
-        master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: root
-          password: root
-          driver-class-name: com.mysql.jdbc.Driver
-          # 多数据源配置
-          #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.jdbc.Driver
-  #redis 配置
-  redis:
-    database: 0
-    host: 127.0.0.1
-    lettuce:
-      pool:
-        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
-        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-      shutdown-timeout: 100ms
-    password: ''
-    port: 6379
-#mybatis plus 设置
-mybatis-plus:
-  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/kuaishou/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/crawler/modules/**/xml/*Mapper.xml
-  global-config:
-    # 关闭MP3.0自带的banner
-    banner: false
-    db-config:
-      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
-      id-type: 4
-      # 默认数据库表下划线命名
-      table-underline: true
-    #configuration:
-    # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-#jeecg专用配置
-jeecg:
-  path:
-    #文件上传根目录 设置
-    upload: D://upFiles
-    #webapp文件路径
-    webapp: D://webapp

+ 0 - 139
jeecg-boot-module-system/target/classes/application-prod.yml

@@ -1,139 +0,0 @@
-server:
-  port: 8080
-  servlet:
-    context-path: /jeecg-boot
-    compression:
-      enabled: true
-      mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: metrics,httptrace
-
-spring:
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
-  ## quartz定时任务,采用数据库方式
-  quartz:
-    job-store-type: jdbc
-  #json 时间戳统一转换
-  jackson:
-    date-format:   yyyy-MM-dd HH:mm:ss
-    time-zone:   GMT+8
-  aop:
-    proxy-target-class: true
-  #配置freemarker
-  freemarker:
-    # 设置模板后缀名
-    suffix: .ftl
-    # 设置文档类型
-    content-type: text/html
-    # 设置页面编码格式
-    charset: UTF-8
-    # 设置页面缓存
-    cache: false
-    prefer-file-system-access: false
-    # 设置ftl文件路径
-    template-loader-path:
-      - classpath:/templates
-  # 设置静态文件路径,js,css等
-  mvc:
-    static-path-pattern: /**
-  resource:
-    static-locations: classpath:/static/,classpath:/public/
-  autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  datasource:
-    druid:
-      stat-view-servlet:
-
-        loginUsername: admin
-        loginPassword: hcst2016
-
-        enabled: true
-      web-stat-filter:
-        enabled: true
-    dynamic:
-      druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
-        # 连接池的配置信息
-        # 初始化大小,最小,最大
-        connection-init-sql: set names utf8mb4
-
-        initial-size: 5
-        min-idle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间,单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache,并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-        filters: stat,wall,slf4j
-        # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-      datasource:
-        master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: hcst
-          password: test@20190531
-          driver-class-name: com.mysql.jdbc.Driver
-          # 多数据源配置
-          #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.jdbc.Driver
-  #redis 配置
-  redis:
-    database: 0
-    host: 127.0.0.1
-
-    lettuce:
-      pool:
-        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
-        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-      shutdown-timeout: 100ms
-    password: ''
-    port: 6379
-#mybatis plus 设置
-mybatis-plus:
-  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/kuaishou/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/crawler/modules/**/xml/*Mapper.xml
-
-
-  global-config:
-    # 关闭MP3.0自带的banner
-    banner: false
-    db-config:
-      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
-      id-type: 4
-      # 默认数据库表下划线命名
-      table-underline: true
-#jeecg专用配置
-jeecg:
-  path:
-    #文件上传根目录 设置
-    upload: /mnt/upload
-    #webapp文件路径
-    webapp: /mnt/webapp
-

+ 0 - 139
jeecg-boot-module-system/target/classes/application-test.yml

@@ -1,139 +0,0 @@
-server:
-  port: 8080
-  servlet:
-    context-path: /jeecg-boot
-    compression:
-      enabled: true
-      mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: metrics,httptrace
-
-spring:
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
-  ## quartz定时任务,采用数据库方式
-  quartz:
-    job-store-type: jdbc
-  #json 时间戳统一转换
-  jackson:
-    date-format:   yyyy-MM-dd HH:mm:ss
-    time-zone:   GMT+8
-  aop:
-    proxy-target-class: true
-  #配置freemarker
-  freemarker:
-    # 设置模板后缀名
-    suffix: .ftl
-    # 设置文档类型
-    content-type: text/html
-    # 设置页面编码格式
-    charset: UTF-8
-    # 设置页面缓存
-    cache: false
-    prefer-file-system-access: false
-    # 设置ftl文件路径
-    template-loader-path:
-      - classpath:/templates
-  # 设置静态文件路径,js,css等
-  mvc:
-    static-path-pattern: /**
-  resource:
-    static-locations: classpath:/static/,classpath:/public/
-  autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  datasource:
-    druid:
-      stat-view-servlet:
-
-        enabled: true
-        loginUsername: admin
-        loginPassword: 123456
-      web-stat-filter:
-        enabled: true
-    dynamic:
-      druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
-        # 连接池的配置信息
-        # 初始化大小,最小,最大
-        initial-size: 5
-        min-idle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间,单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache,并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-        filters: stat,wall,slf4j
-        # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-      datasource:
-        master:
-          url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: root
-          password: root
-          driver-class-name: com.mysql.jdbc.Driver
-          # 多数据源配置   
-          #multi-datasource1: 
-          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.jdbc.Driver
-  #redis 配置
-  redis:
-    database: 0
-    host: 192.168.1.199
-    lettuce:
-      pool:
-        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
-        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-      shutdown-timeout: 100ms
-    password: ''
-    port: 6379
-#mybatis plus 设置
-mybatis-plus:
-  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
-
-  global-config:
-    # 关闭MP3.0自带的banner
-    banner: false
-    db-config:
-      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
-      id-type: 4
-      # 默认数据库表下划线命名
-      table-underline: true
-    #configuration:
-    # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-#jeecg专用配置
-jeecg:
-  path:
-    #文件上传根目录 设置
-    upload: D://upFiles
-    #webapp文件路径
-    webapp: D://webapp
-logging:
-  level:
-    org.jeecg.modules.system.mapper: debug

+ 0 - 9
jeecg-boot-module-system/target/classes/application.yml

@@ -1,9 +0,0 @@
-spring:
-  profiles:
-    active: dev
-swagger:
-  production: false
-  basic:
-    enable: true
-    username: jeecg
-    password: jeecg1314

+ 0 - 14
jeecg-boot-module-system/target/classes/banner.txt

@@ -1,14 +0,0 @@
-
-${AnsiColor.BRIGHT_BLUE}
-   (_)                          | |               | |
-    _  ___  ___  ___ __ _ ______| |__   ___   ___ | |_ 
-   | |/ _ \/ _ \/ __/ _` |______| '_ \ / _ \ / _ \| __|
-   | |  __/  __/ (_| (_| |      | |_) | (_) | (_) | |_ 
-   | |\___|\___|\___\__, |      |_.__/ \___/ \___/ \__|
-  _/ |               __/ |                             
- |__/               |___/
-
-${AnsiColor.BRIGHT_GREEN}
-Jeecg  Boot Version: 2.0.2
-Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
-${AnsiColor.BLACK}

+ 0 - 8
jeecg-boot-module-system/target/classes/db/data-mysql.sql

@@ -1,8 +0,0 @@
-DELETE FROM demo;
-
-INSERT INTO demo (id, name, age, email,sex,birthday,content) VALUES
-(1, 'Jone', 18, 'test1@baomidou.com','1','2017-12-28','很好'),
-(2, 'Jack', 20, 'test2@baomidou.com','2','2018-02-28','努力型'),
-(3, 'Tom', 28, 'test3@baomidou.com','1','2018-11-28','吃苦'),
-(4, 'Sandy', 21, 'test4@baomidou.com','1','2018-07-28','聪明'),
-(5, 'Billie', 24, 'test5@baomidou.com','2','2018-12-11','出色');

+ 0 - 11
jeecg-boot-module-system/target/classes/db/schema-mysql.sql

@@ -1,11 +0,0 @@
-DROP TABLE IF EXISTS demo;
-CREATE TABLE demo (
-  id BIGINT(20) NOT NULL auto_increment COMMENT '主键ID',
-  name varchar(30) default NULL COMMENT '姓名',
-  sex varchar(2) default NULL,
-  age int(11) default NULL COMMENT '年龄',
-  birthday date default NULL COMMENT '生日',
-  email varchar(50) default NULL COMMENT '邮箱',
-  content varchar(1000) default NULL COMMENT '个人简介',
-  PRIMARY KEY  (id)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;

+ 0 - 244
jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai

@@ -1,244 +0,0 @@
-package ${bussiPackage}.${entityPackage}.controller;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.util.oConvertUtils;
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
-import java.util.Date;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
- /**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Slf4j
-@Api(tags="${tableVo.ftlDescription}")
-@RestController
-@RequestMapping("/${entityPackage}/${entityName?uncap_first}")
-public class ${entityName}Controller {
-	@Autowired
-	private I${entityName}Service ${entityName?uncap_first}Service;
-	
-	/**
-	  * 分页列表查询
-	 * @param ${entityName?uncap_first}
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@AutoLog(value = "${tableVo.ftlDescription}-分页列表查询")
-	@ApiOperation(value="${tableVo.ftlDescription}-分页列表查询", notes="${tableVo.ftlDescription}-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<${entityName}>> result = new Result<IPage<${entityName}>>();
-		QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
-		Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize);
-		IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param ${entityName?uncap_first}
-	 * @return
-	 */
-	@AutoLog(value = "${tableVo.ftlDescription}-添加")
-	@ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加")
-	@PostMapping(value = "/add")
-	public Result<${entityName}> add(@RequestBody ${entityName} ${entityName?uncap_first}) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		try {
-			${entityName?uncap_first}Service.save(${entityName?uncap_first});
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param ${entityName?uncap_first}
-	 * @return
-	 */
-	@AutoLog(value = "${tableVo.ftlDescription}-编辑")
-	@ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑")
-	@PutMapping(value = "/edit")
-	public Result<${entityName}> edit(@RequestBody ${entityName} ${entityName?uncap_first}) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		${entityName} ${entityName?uncap_first}Entity = ${entityName?uncap_first}Service.getById(${entityName?uncap_first}.getId());
-		if(${entityName?uncap_first}Entity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = ${entityName?uncap_first}Service.updateById(${entityName?uncap_first});
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "${tableVo.ftlDescription}-通过id删除")
-	@ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除")
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			${entityName?uncap_first}Service.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "${tableVo.ftlDescription}-批量删除")
-	@ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<${entityName}> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "${tableVo.ftlDescription}-通过id查询")
-	@ApiOperation(value="${tableVo.ftlDescription}-通过id查询", notes="${tableVo.ftlDescription}-通过id查询")
-	@GetMapping(value = "/queryById")
-	public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id);
-		if(${entityName?uncap_first}==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(${entityName?uncap_first});
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<${entityName}> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              ${entityName} ${entityName?uncap_first} = JSON.parseObject(deString, ${entityName}.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<${entityName}> pageList = ${entityName?uncap_first}Service.list(queryWrapper);
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "${tableVo.ftlDescription}列表");
-      mv.addObject(NormalExcelConstants.CLASS, ${entityName}.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("${tableVo.ftlDescription}列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<${entityName}> list${entityName}s = ExcelImportUtil.importExcel(file.getInputStream(), ${entityName}.class, params);
-              ${entityName?uncap_first}Service.saveBatch(list${entityName}s);
-              return Result.ok("文件导入成功!数据行数:" + list${entityName}s.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
-}

+ 0 - 53
jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai

@@ -1,53 +0,0 @@
-package ${bussiPackage}.${entityPackage}.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Data
-@TableName("${tableName}")
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
-public class ${entityName} {
-    
-    <#list originalColumns as po>
-	/**${po.filedComment}*/
-	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.UUID)
-	<#else>
-  <#if po.fieldType =='java.util.Date'>
-	<#if po.fieldDbType =='date'>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-	<#elseif po.fieldDbType =='datetime'>
-	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	</#if>
-	<#else>
-	@Excel(name = "${po.filedComment}", width = 15)
-  </#if>
-  </#if>
-    @ApiModelProperty(value = "${po.filedComment}")
-	private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
-	</#list>
-}

+ 0 - 17
jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai

@@ -1,17 +0,0 @@
-package ${bussiPackage}.${entityPackage}.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
-
-}

+ 0 - 5
jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper">
-
-</mapper>

+ 0 - 14
jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai

@@ -1,14 +0,0 @@
-package ${bussiPackage}.${entityPackage}.service;
-
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface I${entityName}Service extends IService<${entityName}> {
-
-}

+ 0 - 19
jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai

@@ -1,19 +0,0 @@
-package ${bussiPackage}.${entityPackage}.service.impl;
-
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
-import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Service
-public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
-
-}

+ 0 - 171
jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -1,171 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-
-<#list columns as po>
-<#if po.fieldName !='id' && po_index<= tableVo.searchFieldNum>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="${po.filedComment}">
-              <a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
-            </a-form-item>
-          </a-col>
-<#elseif po_index == 2>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="${po.filedComment}">
-              <a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
-            </a-form-item>
-          </a-col>
-<#elseif po.fieldName !='id' && po_index< 5>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="${po.filedComment}">
-              <a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
-            </a-form-item>
-          </a-col>
-<#else>
-</#if>
-</#list>
-        <#if (columns?size>1) >
-          </template>
-        </#if>
-          <a-col :md="6" :sm="8" >
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <${entityName?uncap_first}-modal ref="modalForm" @ok="modalFormOk"></${entityName?uncap_first}-modal>
-  </a-card>
-</template>
-
-<script>
-  import ${entityName}Modal from './modules/${entityName}Modal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-
-  export default {
-    name: "${entityName}List",
-    mixins:[JeecgListMixin],
-    components: {
-      ${entityName}Modal
-    },
-    data () {
-      return {
-        description: '${tableVo.ftlDescription}管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-           },
-          <#list columns as po>
-           <#if po.fieldName !='id'>
-		   {
-            title: '${po.filedComment}',
-            align:"center",
-            dataIndex: '${po.fieldName}'
-           },
-		   </#if>
-		  </#list>
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/${entityPackage}/${entityName?uncap_first}/list",
-          delete: "/${entityPackage}/${entityName?uncap_first}/delete",
-          deleteBatch: "/${entityPackage}/${entityName?uncap_first}/deleteBatch",
-          exportXlsUrl: "${entityPackage}/${entityName?uncap_first}/exportXls",
-          importExcelUrl: "${entityPackage}/${entityName?uncap_first}/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      <#noparse>return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;</#noparse>
-    }
-  },
-    methods: {
-     
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>

+ 0 - 155
jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -1,155 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-      
-<#list columns as po><#rt/>
-<#if po.fieldName !='id'><#rt/>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="${po.filedComment}">
-          <#if po.fieldType =='date'>
-          <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif po.fieldType =='datetime'>
-          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif "int,decimal,double,"?contains(po.fieldType)>
-          <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#else>
-          <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          </#if>
-        </a-form-item>
-</#if>
-</#list>
-		
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-  import moment from "moment"
-
-  export default {
-    name: "${entityName}Modal",
-    data () {
-      return {
-        title:"操作",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules:{
-        <#list columns as po>
-        <#if po.fieldName !='id'>
-        <#if po.nullable =='N'>
-        ${po.fieldName}:{rules: [{ required: true, message: '请输入${po.filedComment}!' }]},
-        </#if>
-        </#if>
-	    </#list>
-        },
-        url: {
-          add: "/${entityPackage}/${entityName?uncap_first}/add",
-          edit: "/${entityPackage}/${entityName?uncap_first}/edit",
-        },
-      }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        this.edit({});
-      },
-      edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id' && po.fieldType?index_of("date")==-1>,'${po.fieldName}'</#if></#list>))
-		  //时间格式化
-          <#list columns as po>
-          <#if po.fieldName !='id' && po.fieldType?index_of("date")!=-1>
-          this.form.setFieldsValue({${po.fieldName}:this.model.${po.fieldName}?moment(this.model.${po.fieldName}):null})
-          </#if>
-          </#list>
-        });
-
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-            <#list columns as po>
-            <#if po.fieldName !='id' && po.fieldType =='date'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
-            <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
-            </#if>
-            </#list>
-            
-            console.log(formData)
-            httpAction(httpurl,formData,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-
-
-
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-
-
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-
-</style>

+ 0 - 162
jeecg-boot-module-system/target/classes/jeecg/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei

@@ -1,162 +0,0 @@
-<template>
-  <a-drawer
-      :title="title"
-      :width="800"
-      placement="right"
-      :closable="false"
-      @close="close"
-      :visible="visible"
-  >
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-      
-<#list columns as po><#rt/>
-<#if po.fieldName !='id'><#rt/>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="${po.filedComment}">
-          <#if po.fieldType =='date'>
-          <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif po.fieldType =='datetime'>
-          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif "int,decimal,double,"?contains(po.fieldType)>
-          <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#else>
-          <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          </#if>
-        </a-form-item>
-</#if>
-</#list>
-		
-      </a-form>
-    </a-spin>
-    <a-button type="primary" @click="handleOk">确定</a-button>
-    <a-button type="primary" @click="handleCancel">取消</a-button>
-  </a-drawer>
-</template>
-
-<script>
-  import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-  import moment from "moment"
-
-  export default {
-    name: "${entityName}Modal",
-    data () {
-      return {
-        title:"操作",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules:{
-        <#list columns as po>
-        <#if po.fieldName !='id'>
-        <#if po.nullable =='N'>
-        ${po.fieldName}:{rules: [{ required: true, message: '请输入${po.filedComment}!' }]},
-        </#if>
-        </#if>
-	    </#list>
-        },
-        url: {
-          add: "/${entityPackage}/${entityName?uncap_first}/add",
-          edit: "/${entityPackage}/${entityName?uncap_first}/edit",
-        },
-      }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        this.edit({});
-      },
-      edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id' && po.fieldType?index_of("date")==-1>,'${po.fieldName}'</#if></#list>))
-		  //时间格式化
-          <#list columns as po>
-          <#if po.fieldName !='id' && po.fieldType?index_of("date")!=-1>
-          this.form.setFieldsValue({${po.fieldName}:this.model.${po.fieldName}?moment(this.model.${po.fieldName}):null})
-          </#if>
-          </#list>
-        });
-
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-            <#list columns as po>
-            <#if po.fieldName !='id' && po.fieldType =='date'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
-            <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
-            </#if>
-            </#list>
-            
-            console.log(formData)
-            httpAction(httpurl,formData,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-
-
-
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-
-
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-</style>

+ 0 - 232
jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/controller/${entityPackage}/${entityName}Controller.javai

@@ -1,232 +0,0 @@
-package ${bussiPackage}.controller.${entityPackage};
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-import ${bussiPackage}.entity.${entityPackage}.${entityName};
-import ${bussiPackage}.service.${entityPackage}.I${entityName}Service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.extern.slf4j.Slf4j;
-
-import com.alibaba.fastjson.JSON;
-
- /**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/${entityPackage}/${entityName?uncap_first}")
-@Slf4j
-public class ${entityName}Controller {
-	@Autowired
-	private I${entityName}Service ${entityName?uncap_first}Service;
-	
-	/**
-	  * 分页列表查询
-	 * @param ${entityName?uncap_first}
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@GetMapping(value = "/list")
-	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<${entityName}>> result = new Result<IPage<${entityName}>>();
-		QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
-		Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize);
-		IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param ${entityName?uncap_first}
-	 * @return
-	 */
-	@PostMapping(value = "/add")
-	public Result<${entityName}> add(@RequestBody ${entityName} ${entityName?uncap_first}) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		try {
-			${entityName?uncap_first}Service.save(${entityName?uncap_first});
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param ${entityName?uncap_first}
-	 * @return
-	 */
-	@PutMapping(value = "/edit")
-	public Result<${entityName}> edit(@RequestBody ${entityName} ${entityName?uncap_first}) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		${entityName} ${entityName?uncap_first}Entity = ${entityName?uncap_first}Service.getById(${entityName?uncap_first}.getId());
-		if(${entityName?uncap_first}Entity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = ${entityName?uncap_first}Service.updateById(${entityName?uncap_first});
-			//TODO 返回false说明什么?
-			if(ok) {
-				result.success("修改成功!");
-			}
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			${entityName?uncap_first}Service.removeById(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<${entityName}> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@GetMapping(value = "/queryById")
-	public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id);
-		if(${entityName?uncap_first}==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(${entityName?uncap_first});
-			result.setSuccess(true);
-		}
-		return result;
-	}
-
-	/**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<${entityName}> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ${entityName} ${entityName?uncap_first} = JSON.parseObject(deString, ${entityName}.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<${entityName}> pageList = ${entityName?uncap_first}Service.list(queryWrapper);
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "${tableVo.ftlDescription}列表");
-        mv.addObject(NormalExcelConstants.CLASS, ${entityName}.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("${tableVo.ftlDescription}列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-          * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();// 获取上传文件对象
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<${entityName}> list${entityName}s = ExcelImportUtil.importExcel(file.getInputStream(), ${entityName}.class, params);
-                ${entityName?uncap_first}Service.saveBatch(list${entityName}s);
-                return Result.ok("文件导入成功!数据行数:" + list${entityName}s.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(),e);
-                return Result.error("文件导入失败:"+e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-
-}

+ 0 - 45
jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/entity/${entityPackage}/${entityName}.javai

@@ -1,45 +0,0 @@
-package ${bussiPackage}.entity.${entityPackage};
-
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Data
-@TableName("${tableName}")
-public class ${entityName} implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-    <#list originalColumns as po>
-	/**${po.filedComment}*/
-	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.UUID)
-	<#else>
-    <#if po.fieldType =='java.util.Date'>
-      <#if po.fieldDbType =='date'>
-    @Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-      <#elseif po.fieldDbType =='datetime'>
-    @Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-      </#if>
-    <#else>
-    @Excel(name = "${po.filedComment}", width = 15)
-    </#if>
-  </#if>
-	private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
-	</#list>
-}

+ 0 - 17
jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/${entityName}Mapper.javai

@@ -1,17 +0,0 @@
-package ${bussiPackage}.mapper.${entityPackage};
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import ${bussiPackage}.entity.${entityPackage}.${entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
-
-}

+ 0 - 5
jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/mapper/${entityPackage}/xml/${entityName}Mapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${bussiPackage}.mapper.${entityPackage}.${entityName}Mapper">
-
-</mapper>

+ 0 - 14
jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/I${entityName}Service.javai

@@ -1,14 +0,0 @@
-package ${bussiPackage}.service.${entityPackage};
-
-import ${bussiPackage}.entity.${entityPackage}.${entityName};
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface I${entityName}Service extends IService<${entityName}> {
-
-}

+ 0 - 19
jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/service/${entityPackage}/impl/${entityName}ServiceImpl.javai

@@ -1,19 +0,0 @@
-package ${bussiPackage}.service.${entityPackage}.impl;
-
-import ${bussiPackage}.entity.${entityPackage}.${entityName};
-import ${bussiPackage}.mapper.${entityPackage}.${entityName}Mapper;
-import ${bussiPackage}.service.${entityPackage}.I${entityName}Service;
-import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Service
-public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
-
-}

+ 0 - 171
jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/${entityName}List.vuei

@@ -1,171 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-
-<#list columns as po>
-<#if po.fieldName !='id' && po_index<= tableVo.searchFieldNum>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="${po.filedComment}">
-              <a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
-            </a-form-item>
-          </a-col>
-<#elseif po_index == 2>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="${po.filedComment}">
-              <a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
-            </a-form-item>
-          </a-col>
-<#elseif po.fieldName !='id' && po_index< 5>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="${po.filedComment}">
-              <a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
-            </a-form-item>
-          </a-col>
-<#else>
-</#if>
-</#list>
-        <#if (columns?size>1) >
-          </template>
-        </#if>
-          <a-col :md="6" :sm="8" >
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <${entityName?uncap_first}-modal ref="modalForm" @ok="modalFormOk"></${entityName?uncap_first}-modal>
-  </a-card>
-</template>
-
-<script>
-  import ${entityName}Modal from './modules/${entityName}Modal'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-
-  export default {
-    name: "${entityName}List",
-    mixins:[JeecgListMixin],
-    components: {
-      ${entityName}Modal
-    },
-    data () {
-      return {
-        description: '${tableVo.ftlDescription}管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-           },
-          <#list columns as po>
-           <#if po.fieldName !='id'>
-		   {
-            title: '${po.filedComment}',
-            align:"center",
-            dataIndex: '${po.fieldName}'
-           },
-		   </#if>
-		  </#list>
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-		url: {
-          list: "/${entityPackage}/${entityName?uncap_first}/list",
-          delete: "/${entityPackage}/${entityName?uncap_first}/delete",
-          deleteBatch: "/${entityPackage}/${entityName?uncap_first}/deleteBatch",
-          exportXlsUrl: "${entityPackage}/${entityName?uncap_first}/exportXls",
-          importExcelUrl: "${entityPackage}/${entityName?uncap_first}/importExcel",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      <#noparse>return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;</#noparse>
-    }
-  },
-    methods: {
-
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>

+ 0 - 155
jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal.vuei

@@ -1,155 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-
-<#list columns as po><#rt/>
-<#if po.fieldName !='id'><#rt/>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="${po.filedComment}">
-          <#if po.fieldType =='date'>
-          <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif po.fieldType =='datetime'>
-          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif "int,decimal,double,"?contains(po.fieldType)>
-          <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#else>
-          <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          </#if>
-        </a-form-item>
-</#if>
-</#list>
-
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-  import moment from "moment"
-
-  export default {
-    name: "${entityName}Modal",
-    data () {
-      return {
-        title:"操作",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules:{
-        <#list columns as po>
-        <#if po.fieldName !='id'>
-        <#if po.nullable =='N'>
-        ${po.fieldName}:{rules: [{ required: true, message: '请输入${po.filedComment}!' }]},
-        </#if>
-        </#if>
-	    </#list>
-        },
-        url: {
-          add: "/${entityPackage}/${entityName?uncap_first}/add",
-          edit: "/${entityPackage}/${entityName?uncap_first}/edit",
-        },
-      }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        this.edit({});
-      },
-      edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id' && po.fieldType?index_of("date")==-1>,'${po.fieldName}'</#if></#list>))
-		  //时间格式化
-          <#list columns as po>
-          <#if po.fieldName !='id' && po.fieldType?index_of("date")!=-1>
-          this.form.setFieldsValue({${po.fieldName}:this.model.${po.fieldName}?moment(this.model.${po.fieldName}):null})
-          </#if>
-          </#list>
-        });
-
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-            <#list columns as po>
-            <#if po.fieldName !='id' && po.fieldType =='date'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
-            <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
-            </#if>
-            </#list>
-
-            console.log(formData)
-            httpAction(httpurl,formData,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-
-
-
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-
-
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-
-</style>

+ 0 - 162
jeecg-boot-module-system/target/classes/jeecg/code-template/one2/java/${bussiPackage}/vue/${entityPackage}/modules/${entityName}Modal__Style#Drawer.vuei

@@ -1,162 +0,0 @@
-<template>
-  <a-drawer
-      :title="title"
-      :width="800"
-      placement="right"
-      :closable="false"
-      @close="close"
-      :visible="visible"
-  >
-
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-      
-<#list columns as po><#rt/>
-<#if po.fieldName !='id'><#rt/>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="${po.filedComment}">
-          <#if po.fieldType =='date'>
-          <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif po.fieldType =='datetime'>
-          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif "int,decimal,double,"?contains(po.fieldType)>
-          <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#else>
-          <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          </#if>
-        </a-form-item>
-</#if>
-</#list>
-		
-      </a-form>
-    </a-spin>
-    <a-button type="primary" @click="handleOk">确定</a-button>
-    <a-button type="primary" @click="handleCancel">取消</a-button>
-  </a-drawer>
-</template>
-
-<script>
-  import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-  import moment from "moment"
-
-  export default {
-    name: "${entityName}Modal",
-    data () {
-      return {
-        title:"操作",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules:{
-        <#list columns as po>
-        <#if po.fieldName !='id'>
-        <#if po.nullable =='N'>
-        ${po.fieldName}:{rules: [{ required: true, message: '请输入${po.filedComment}!' }]},
-        </#if>
-        </#if>
-	    </#list>
-        },
-        url: {
-          add: "/${entityPackage}/${entityName?uncap_first}/add",
-          edit: "/${entityPackage}/${entityName?uncap_first}/edit",
-        },
-      }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        this.edit({});
-      },
-      edit (record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id' && po.fieldType?index_of("date")==-1>,'${po.fieldName}'</#if></#list>))
-		  //时间格式化
-          <#list columns as po>
-          <#if po.fieldName !='id' && po.fieldType?index_of("date")!=-1>
-          this.form.setFieldsValue({${po.fieldName}:this.model.${po.fieldName}?moment(this.model.${po.fieldName}):null})
-          </#if>
-          </#list>
-        });
-
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-            <#list columns as po>
-            <#if po.fieldName !='id' && po.fieldType =='date'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
-            <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
-            </#if>
-            </#list>
-            
-            console.log(formData)
-            httpAction(httpurl,formData,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-
-
-
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-
-
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-/** Button按钮间距 */
-  .ant-btn {
-    margin-left: 30px;
-    margin-bottom: 30px;
-    float: right;
-  }
-</style>

+ 0 - 274
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai

@@ -1,274 +0,0 @@
-package ${bussiPackage}.${entityPackage}.controller;
-
-import java.io.UnsupportedEncodingException;
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import ${bussiPackage}.${entityPackage}.vo.${entityName}Page;
-import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.service.I${sub.entityName}Service;
-</#list>
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import com.alibaba.fastjson.JSON;
-
- /**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/${entityPackage}/${entityName?uncap_first}")
-@Slf4j
-public class ${entityName}Controller {
-	@Autowired
-	private I${entityName}Service ${entityName?uncap_first}Service;
-	<#list subTables as sub>
-	@Autowired
-	private I${sub.entityName}Service ${sub.entityName?uncap_first}Service;
-	</#list>
-	
-	/**
-	  * 分页列表查询
-	 * @param ${entityName?uncap_first}
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@GetMapping(value = "/list")
-	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<${entityName}>> result = new Result<IPage<${entityName}>>();
-		QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
-		Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize);
-		IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param ${entityName?uncap_first}Page
-	 * @return
-	 */
-	@PostMapping(value = "/add")
-	public Result<${entityName}> add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		try {
-			${entityName} ${entityName?uncap_first} = new ${entityName}();
-			BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first});
-			
-			${entityName?uncap_first}Service.saveMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,</#if></#list>);
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param ${entityName?uncap_first}Page
-	 * @return
-	 */
-	@PutMapping(value = "/edit")
-	public Result<${entityName}> edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		${entityName} ${entityName?uncap_first} = new ${entityName}();
-		BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first});
-		${entityName} ${entityName?uncap_first}Entity = ${entityName?uncap_first}Service.getById(${entityName?uncap_first}.getId());
-		if(${entityName?uncap_first}Entity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			boolean ok = ${entityName?uncap_first}Service.updateById(${entityName?uncap_first});
-			${entityName?uncap_first}Service.updateMain(${entityName?uncap_first}, <#list subTables as sub>${entityName?uncap_first}Page.get${sub.entityName}List()<#if sub_has_next>,</#if></#list>);
-			result.success("修改成功!");
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			${entityName?uncap_first}Service.delMain(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<${entityName}> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@GetMapping(value = "/queryById")
-	public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id);
-		if(${entityName?uncap_first}==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(${entityName?uncap_first});
-			result.setSuccess(true);
-		}
-		return result;
-	}
-	
-	<#list subTables as sub>
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@GetMapping(value = "/query${sub.entityName}ByMainId")
-	public Result<List<${sub.entityName}>> query${sub.entityName}ListByMainId(@RequestParam(name="id",required=true) String id) {
-		Result<List<${sub.entityName}>> result = new Result<List<${sub.entityName}>>();
-		List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(id);
-		result.setResult(${sub.entityName?uncap_first}List);
-		result.setSuccess(true);
-		return result;
-	}
-	</#list>
-
-  /**
-      * 导出excel
-   *
-   * @param request
-   * @param response
-   */
-  @RequestMapping(value = "/exportXls")
-  public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-      // Step.1 组装查询条件
-      QueryWrapper<${entityName}> queryWrapper = null;
-      try {
-          String paramsStr = request.getParameter("paramsStr");
-          if (oConvertUtils.isNotEmpty(paramsStr)) {
-              String deString = URLDecoder.decode(paramsStr, "UTF-8");
-              ${entityName} ${entityName?uncap_first} = JSON.parseObject(deString, ${entityName}.class);
-              queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, request.getParameterMap());
-          }
-      } catch (UnsupportedEncodingException e) {
-          e.printStackTrace();
-      }
-
-      //Step.2 AutoPoi 导出Excel
-      ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-      List<${entityName}Page> pageList = new ArrayList<${entityName}Page>();
-      List<${entityName}> ${entityName?uncap_first}List = ${entityName?uncap_first}Service.list(queryWrapper);
-      for (${entityName} ${entityName?uncap_first} : ${entityName?uncap_first}List) {
-          ${entityName}Page vo = new ${entityName}Page();
-          BeanUtils.copyProperties(${entityName?uncap_first}, vo);
-          <#list subTables as sub>
-          List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(${entityName?uncap_first}.getId());
-          vo.set${sub.entityName}List(${sub.entityName?uncap_first}List);
-          </#list>
-          pageList.add(vo);
-      }
-      //导出文件名称
-      mv.addObject(NormalExcelConstants.FILE_NAME, "${tableVo.ftlDescription}列表");
-      mv.addObject(NormalExcelConstants.CLASS, ${entityName}Page.class);
-      mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("${tableVo.ftlDescription}列表数据", "导出人:Jeecg", "导出信息"));
-      mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-      return mv;
-  }
-
-  /**
-      * 通过excel导入数据
-   *
-   * @param request
-   * @param response
-   * @return
-   */
-  @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-  public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-      MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-      Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-      for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-          MultipartFile file = entity.getValue();// 获取上传文件对象
-          ImportParams params = new ImportParams();
-          params.setTitleRows(2);
-          params.setHeadRows(1);
-          params.setNeedSave(true);
-          try {
-              List<${entityName}Page> list = ExcelImportUtil.importExcel(file.getInputStream(), ${entityName}Page.class, params);
-              for (${entityName}Page page : list) {
-                  ${entityName} po = new ${entityName}();
-                  BeanUtils.copyProperties(page, po);
-                  ${entityName?uncap_first}Service.saveMain(po, <#list subTables as sub>page.get${sub.entityName}List()<#if sub_has_next>,</#if></#list>);
-              }
-              return Result.ok("文件导入成功!数据行数:" + list.size());
-          } catch (Exception e) {
-              log.error(e.getMessage(),e);
-              return Result.error("文件导入失败:"+e.getMessage());
-          } finally {
-              try {
-                  file.getInputStream().close();
-              } catch (IOException e) {
-                  e.printStackTrace();
-              }
-          }
-      }
-      return Result.ok("文件导入失败!");
-  }
-
-}

+ 0 - 39
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai

@@ -1,39 +0,0 @@
-package ${bussiPackage}.${entityPackage}.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Data
-@TableName("${tableName}")
-public class ${entityName} implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-    <#list originalColumns as po>
-	/**${po.filedComment}*/
-	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.UUID)
-	</#if>
-  <#if po.fieldType =='java.util.Date'>
-	<#if po.fieldDbType =='date'>
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-	<#elseif po.fieldDbType =='datetime'>
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	</#if>
-  </#if>
-	private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
-	</#list>
-}

+ 0 - 50
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai

@@ -1,50 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}.java
-package ${bussiPackage}.${entityPackage}.entity;
-
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import java.util.Date;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Data
-@TableName("${subTab.tableName}")
-public class ${subTab.entityName} implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-    <#list subTab.originalColumns as po>
-	/**${po.filedComment}*/
-	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.UUID)
-	<#else>
-  <#if po.fieldType =='java.util.Date'>
-	<#if po.fieldDbType =='date'>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-	<#elseif po.fieldDbType =='datetime'>
-	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	</#if>
-	<#else>
-	<#if !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)>
-    @Excel(name = "${po.filedComment}", width = 15)
-    </#if>
-  </#if>
-  </#if>
-	private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
-	</#list>
-}
-</#list>

+ 0 - 17
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai

@@ -1,17 +0,0 @@
-package ${bussiPackage}.${entityPackage}.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
-
-}

+ 0 - 21
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai

@@ -1,21 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}Mapper.java
-package ${bussiPackage}.${entityPackage}.mapper;
-
-import java.util.List;
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface ${subTab.entityName}Mapper extends BaseMapper<${subTab.entityName}> {
-
-	public boolean deleteByMainId(String mainId);
-    
-	public List<${subTab.entityName}> selectByMainId(String mainId);
-}
-</#list>

+ 0 - 5
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper">
-
-</mapper>

+ 0 - 38
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml

@@ -1,38 +0,0 @@
-<#list subTables as subTab>
-<#assign originalForeignKeys = subTab.originalForeignKeys>
-        #segment#${subTab.entityName}Mapper.xml
-        <?xml version="1.0" encoding="UTF-8"?>
-        <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper">
-
-<delete id="deleteByMainId" parameterType="java.lang.String">
-    DELETE
-    FROM ${subTab.tableName}
-    WHERE
-    <#list originalForeignKeys as key>
-    <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
-    ${key} = ${r'#'}{${primaryKeyField}}<#rt/>
-    <#else>
-    ${key} = ${r'#'}{${key}}<#rt/>
-</#if>
-<#if key_has_next>AND
-</#if>
-        </#list>
-        </delete>
-
-<select id="selectByMainId" parameterType="java.lang.String"
-        resultType="${bussiPackage}.${entityPackage}.entity.${subTab.entityName}">
-SELECT *
-FROM ${subTab.tableName}
-WHERE
-<#list originalForeignKeys as key>
-<#if key?lower_case?index_of("${primaryKeyField}")!=-1>
-${key} = ${r'#'}{${primaryKeyField}}<#rt/>
-<#else>
-${key} = ${r'#'}{${key}}<#rt/>
-</#if>
-<#if key_has_next>AND</#if>
-        </#list>
-        </select>
-        </mapper>
-        </#list>

+ 0 - 42
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai

@@ -1,42 +0,0 @@
-package ${bussiPackage}.${entityPackage}.service;
-
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface I${entityName}Service extends IService<${entityName}> {
-
-	/**
-	 * 添加一对多
-	 * 
-	 */
-	public void saveMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) ;
-	
-	/**
-	 * 修改一对多
-	 * 
-	 */
-	public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>);
-	
-	/**
-	 * 删除一对多
-	 */
-	public void delMain (String id);
-	
-	/**
-	 * 批量删除一对多
-	 */
-	public void delBatchMain (Collection<? extends Serializable> idList);
-	
-}

+ 0 - 19
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai

@@ -1,19 +0,0 @@
-<#list subTables as subTab>
-#segment#I${subTab.entityName}Service.java
-package ${bussiPackage}.${entityPackage}.service;
-
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface I${subTab.entityName}Service extends IService<${subTab.entityName}> {
-
-	public List<${subTab.entityName}> selectByMainId(String mainId);
-}
-</#list>

+ 0 - 101
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai

@@ -1,101 +0,0 @@
-package ${bussiPackage}.${entityPackage}.service.impl;
-
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.mapper.${sub.entityName}Mapper;
-</#list>
-import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
-import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Collection;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Service
-public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
-
-	@Autowired
-	private ${entityName}Mapper ${entityName?uncap_first}Mapper;
-	<#list subTables as sub>
-	@Autowired
-	private ${sub.entityName}Mapper ${sub.entityName?uncap_first}Mapper;
-	</#list>
-	
-	@Override
-	@Transactional
-	public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
-		${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
-		<#list subTables as sub>
-		for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
-			<#list sub.foreignKeys as key>
-			//外键设置
-			<#if key?lower_case?index_of("${primaryKeyField}")!=-1>
-			entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
-			<#else>
-			entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
-			</#if>
-			</#list>
-			${sub.entityName?uncap_first}Mapper.insert(entity);
-		}
-		</#list>
-	}
-
-	@Override
-	@Transactional
-	public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
-		${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
-		
-		//1.先删除子表数据
-		<#list subTables as sub>
-		${sub.entityName?uncap_first}Mapper.deleteByMainId(${entityName?uncap_first}.getId());
-		</#list>
-		
-		//2.子表数据重新插入
-		<#list subTables as sub>
-		for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
-			<#list sub.foreignKeys as key>
-			//外键设置
-			<#if key?lower_case?index_of("${primaryKeyField}")!=-1>
-			entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
-			<#else>
-			entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
-			</#if>
-			</#list>
-			${sub.entityName?uncap_first}Mapper.insert(entity);
-		}
-		</#list>
-	}
-
-	@Override
-	@Transactional
-	public void delMain(String id) {
-		<#list subTables as sub>
-		${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
-		</#list>
-		${entityName?uncap_first}Mapper.deleteById(id);
-	}
-
-	@Override
-	@Transactional
-	public void delBatchMain(Collection<? extends Serializable> idList) {
-		for(Serializable id:idList) {
-			<#list subTables as sub>
-			${sub.entityName?uncap_first}Mapper.deleteByMainId(id.toString());
-			</#list>
-			${entityName?uncap_first}Mapper.deleteById(id);
-		}
-	}
-	
-}

+ 0 - 30
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai

@@ -1,30 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}ServiceImpl.java
-package ${bussiPackage}.${entityPackage}.service.impl;
-
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import ${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper;
-import ${bussiPackage}.${entityPackage}.service.I${subTab.entityName}Service;
-import org.springframework.stereotype.Service;
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Service
-public class ${subTab.entityName}ServiceImpl extends ServiceImpl<${subTab.entityName}Mapper, ${subTab.entityName}> implements I${subTab.entityName}Service {
-	
-	@Autowired
-	private ${subTab.entityName}Mapper ${subTab.entityName?uncap_first}Mapper;
-	
-	@Override
-	public List<${subTab.entityName}> selectByMainId(String mainId) {
-		return ${subTab.entityName?uncap_first}Mapper.selectByMainId(mainId);
-	}
-}
-</#list>

+ 0 - 50
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai

@@ -1,50 +0,0 @@
-package ${bussiPackage}.${entityPackage}.vo;
-
-import java.util.List;
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelCollection;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Data
-public class ${entityName}Page {
-	
-    <#list originalColumns as po>
-	/**${po.filedComment}*/
-	<#if po.fieldName == primaryKeyField>
-	<#else>
-    <#if po.fieldType =='java.util.Date'>
-  	<#if po.fieldDbType =='date'>
-  	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
-  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-  	<#elseif po.fieldDbType =='datetime'>
-  	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-  	</#if>
-  	<#else>
-  	@Excel(name = "${po.filedComment}", width = 15)
-    </#if>
-  </#if>
-	private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
-	</#list>
-	
-	<#list subTables as sub>
-	@ExcelCollection(name="${sub.ftlDescription}")
-	private List<${sub.entityName}> ${sub.entityName?uncap_first}List;
-	</#list>
-	
-}

+ 0 - 162
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -1,162 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-<#list columns as po><#rt/>
-<#if po.fieldName !='id' && po_index<= tableVo.searchFieldNum>
-          <a-col :span="6">
-            <a-form-item label="${po.filedComment}">
-              <a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
-            </a-form-item>
-          </a-col>
-</#if>
-</#list>
-          <a-col :span="8" >
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>
-        <span>已选择</span>
-        <a style="font-weight: 600">
-          {{ selectedRowKeys.length }}
-        </a>
-        <span>项</span>
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <${entityName?uncap_first}-modal ref="modalForm" @ok="modalFormOk"/>
-
-  </a-card>
-</template>
-
-<script>
-
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ${entityName}Modal from './modules/${entityName}Modal'
-
-  export default {
-    name: "${entityName}List",
-    mixins: [JeecgListMixin],
-    components: {
-      ${entityName}Modal
-    },
-    data () {
-      return {
-        description: '${tableVo.ftlDescription}管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: "center",
-            customRender:function (t, r, index) {
-              return parseInt(index)+1;
-            }
-          },
-<#list columns as po><#rt/>
-  <#if po.fieldName !='id'>
-          {
-            title: '${po.filedComment}',
-            align:"center",
-            dataIndex: '${po.fieldName}'
-          },
-  </#if>
-</#list>
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-        // 请求参数
-    	url: {
-              list: "/${entityPackage}/${entityName?uncap_first}/list",
-              delete: "/${entityPackage}/${entityName?uncap_first}/delete",
-              deleteBatch: "/${entityPackage}/${entityName?uncap_first}/deleteBatch",
-              exportXlsUrl: "${entityPackage}/${entityName?uncap_first}/exportXls",
-              importExcelUrl: "${entityPackage}/${entityName?uncap_first}/importExcel",
-           },
-        }
-      },
-      computed: {
-        importExcelUrl: function(){
-          <#noparse>return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;</#noparse>
-        }
-      },
-
-
-    methods: {
-
-      initDictConfig() {
-      }
-
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>

+ 0 - 184
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -1,184 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="1200"
-    :visible="visible"
-    :maskClosable="false"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel">
-    <a-spin :spinning="confirmLoading">
-      <!-- 主表单区域 -->
-      <a-form :form="form">
-<#list columns as po><#rt/>
-  <#if po_index % 2 == 0 ><#rt/>
-        <a-row>
-    <#if po.fieldName !='id'>
-      <#list [po_index, po_index+1] as idx><#rt/>
-        <#if idx lt columns?size>
-          <a-col :span="12" :gutter="8">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="${columns[idx].filedComment}">
-            <#if columns[idx].fieldType =='date'>
-              <a-date-picker
-                placeholder="请输入${columns[idx].filedComment}"
-                style="width:100%"
-                v-decorator="[ '${columns[idx].fieldName}', <#if columns[idx].nullable =='N'>validatorRules.${columns[idx].fieldName} <#else>{}</#if>]"/>
-            <#elseif columns[idx].fieldType =='datetime'>
-              <a-date-picker
-                placeholder="请输入${columns[idx].filedComment}"
-                style="width:100%"
-                :showTime="true"
-                format="YYYY-MM-DD HH:mm:ss"
-                v-decorator="[ '${columns[idx].fieldName}', <#if columns[idx].nullable =='N'>validatorRules.${columns[idx].fieldName} <#else>{}</#if>]"/>
-            <#elseif "int,decimal,double,"?contains(columns[idx].fieldType)>
-              <a-input-number placeholder="请输入${columns[idx].filedComment}" style="width:100%" v-decorator="[ '${columns[idx].fieldName}', <#if columns[idx].nullable =='N'>validatorRules.${columns[idx].fieldName} <#else>{}</#if>]"/>
-            <#else>
-              <a-input placeholder="请输入${columns[idx].filedComment}" v-decorator="['${columns[idx].fieldName}', <#if columns[idx].nullable =='N'>validatorRules.${columns[idx].fieldName} <#else>{}</#if>]"/>
-            </#if>
-            </a-form-item>
-          </a-col>
-        </#if>
-      </#list><#rt/>
-    </#if><#rt/>
-        </a-row>
-  </#if><#rt/>
-</#list>
-      </a-form>
-
-      <!-- 子表单区域 -->
-      <a-tabs v-model="activeKey" @change="handleChangeTabs">
-<#list subTables as sub><#rt/>
-        <a-tab-pane tab="${sub.ftlDescription}" :key="refKeys[${sub_index}]" :forceRender="true">
-          <j-editable-table
-            :ref="refKeys[${sub_index}]"
-            :loading="${sub.entityName?uncap_first}Table.loading"
-            :columns="${sub.entityName?uncap_first}Table.columns"
-            :dataSource="${sub.entityName?uncap_first}Table.dataSource"
-            :maxHeight="300"
-            :rowNumber="true"
-            :rowSelection="true"
-            :actionButton="true"/>
-        </a-tab-pane>
-</#list>
-      </a-tabs>
-
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-
-  import moment from 'moment'
-  import pick from 'lodash.pick'
-  import { FormTypes } from '@/utils/JEditableTableUtil'
-  import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
-
-  export default {
-    name: '${entityName}Modal',
-    mixins: [JEditableTableMixin],
-    data() {
-      return {
-        // 新增时子表默认添加几行空数据
-        addDefaultRowNum: 1,
-        validatorRules: {
-<#list columns as po>
-  <#if po.fieldName !='id'>
-    <#if po.nullable =='N'>
-          ${po.fieldName}: { rules: [{ required: true, message: '请输入${po.filedComment}!' }] },
-    </#if>
-  </#if>
-</#list>
-        },
-        refKeys: [<#list subTables as sub>'${sub.entityName?uncap_first}', </#list>],
-        activeKey: '${subTables[0].entityName?uncap_first}',
-<#list subTables as sub><#rt/>
-        // ${sub.ftlDescription}
-        ${sub.entityName?uncap_first}Table: {
-          loading: false,
-          dataSource: [],
-          columns: [
-<#list sub.colums as col><#rt/>
-    <#if col.filedComment !='外键'>
-            {
-              title: '${col.filedComment}',
-              key: '${col.fieldName}',
-      <#if col.fieldType =='date'>
-              type: FormTypes.date,
-      <#elseif col.fieldType =='datetime'>
-              type: FormTypes.datetime,
-      <#elseif "int,decimal,double,"?contains(col.fieldType)>
-              type: FormTypes.inputNumber,
-      <#else>
-              type: FormTypes.input,
-      </#if>
-              defaultValue: '',
-              placeholder: '请输入${'$'}{title}',
-      <#if col.nullable =='N'>
-              validateRules: [{ required: true, message: '${'$'}{title}不能为空' }],
-      </#if>
-            },
-    </#if>
-</#list>
-          ]
-        },
-</#list>
-        url: {
-          add: "/${entityPackage}/${entityName?uncap_first}/add",
-          edit: "/${entityPackage}/${entityName?uncap_first}/edit",
-<#list subTables as sub><#rt/>
-          ${sub.entityName?uncap_first}: {
-            list: '/${entityPackage}/${entityName?uncap_first}/query${sub.entityName}ByMainId'
-          },
-</#list>
-        }
-      }
-    },
-    methods: {
- 
-      /** 调用完edit()方法之后会自动调用此方法 */
-      editAfter() {
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, <#list columns as col>'${col.fieldName}', </#list>))
-          // 时间格式化
-<#list columns as col><#rt/>
-	<#if col.fieldName !='id' && (col.fieldType =='date' || col.fieldType =='datetime')>
-          this.form.setFieldsValue({ ${col.fieldName}: this.model.${col.fieldName} ? moment(this.model.${col.fieldName}) : null })
-	</#if>
-</#list>  
-        })
-        // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
-<#list subTables as sub><#rt/>
-          this.requestSubTableData(this.url.${sub.entityName?uncap_first}.list, params, this.${sub.entityName?uncap_first}Table)
-</#list>
-        }
-      },
- 
-      /** 整理成formData */
-      classifyIntoFormData(allValues) {
-        let main = Object.assign(this.model, allValues.formValue)
-        //时间格式化
-<#list columns as col><#rt/>
-	<#if col.fieldName !='id' && col.fieldType =='date'>
-        main.${col.fieldName} = main.${col.fieldName} ? main.${col.fieldName}.format() : null;
-	<#elseif col.fieldName !='id' && col.fieldType =='datetime'>
-        main.${col.fieldName} = main.${col.fieldName} ? main.${col.fieldName}.format('YYYY-MM-DD HH:mm:ss') : null;
-	</#if>
-</#list>
-        return {
-          ...main, // 展开
-<#list subTables as sub><#rt/>
-          ${sub.entityName?uncap_first}List: allValues.tablesValue[${sub_index}].values,
-</#list>
-        }
-      }
-    }
-  }
-</script>
-
-<style scoped>
-</style>

+ 0 - 374
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai

@@ -1,374 +0,0 @@
-package ${bussiPackage}.${entityPackage}.controller;
-
-import java.io.UnsupportedEncodingException;
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import ${bussiPackage}.${entityPackage}.vo.${entityName}Page;
-import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.service.I${sub.entityName}Service;
-</#list>
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-import com.alibaba.fastjson.JSON;
-
- /**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@RestController
-@RequestMapping("/${entityPackage}/${entityName?uncap_first}")
-@Slf4j
-public class ${entityName}Controller {
-	@Autowired
-	private I${entityName}Service ${entityName?uncap_first}Service;
-	<#list subTables as sub>
-	@Autowired
-	private I${sub.entityName}Service ${sub.entityName?uncap_first}Service;
-	</#list>
-	
-	/**
-	  * 分页列表查询
-	 * @param ${entityName?uncap_first}
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	@GetMapping(value = "/list")
-	public Result<IPage<${entityName}>> queryPageList(${entityName} ${entityName?uncap_first},
-									  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-									  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-									  HttpServletRequest req) {
-		Result<IPage<${entityName}>> result = new Result<IPage<${entityName}>>();
-		QueryWrapper<${entityName}> queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, req.getParameterMap());
-		Page<${entityName}> page = new Page<${entityName}>(pageNo, pageSize);
-		IPage<${entityName}> pageList = ${entityName?uncap_first}Service.page(page, queryWrapper);
-		result.setSuccess(true);
-		result.setResult(pageList);
-		return result;
-	}
-	
-	/**
-	  *   添加
-	 * @param ${entityName?uncap_first}Page
-	 * @return
-	 */
-	@PostMapping(value = "/add")
-	public Result<${entityName}> add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		try {
-			${entityName} ${entityName?uncap_first} = new ${entityName}();
-			BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first});
-			
-			${entityName?uncap_first}Service.save(${entityName?uncap_first});
-			result.success("添加成功!");
-		} catch (Exception e) {
-			log.error(e.getMessage(),e);
-			result.error500("操作失败");
-		}
-		return result;
-	}
-	
-	/**
-	  *  编辑
-	 * @param ${entityName?uncap_first}Page
-	 * @return
-	 */
-	@PutMapping(value = "/edit")
-	public Result<${entityName}> edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		${entityName} ${entityName?uncap_first} = new ${entityName}();
-		BeanUtils.copyProperties(${entityName?uncap_first}Page, ${entityName?uncap_first});
-		${entityName} ${entityName?uncap_first}Entity = ${entityName?uncap_first}Service.getById(${entityName?uncap_first}.getId());
-		if(${entityName?uncap_first}Entity==null) {
-			result.error500("未找到对应实体");
-		}else {
-			${entityName?uncap_first}Service.updateById(${entityName?uncap_first});
-			result.success("修改成功!");
-		}
-		
-		return result;
-	}
-	
-	/**
-	  *   通过id删除
-	 * @param id
-	 * @return
-	 */
-	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		try {
-			${entityName?uncap_first}Service.delMain(id);
-		} catch (Exception e) {
-			log.error("删除失败",e.getMessage());
-			return Result.error("删除失败!");
-		}
-		return Result.ok("删除成功!");
-	}
-	
-	/**
-	  *  批量删除
-	 * @param ids
-	 * @return
-	 */
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<${entityName}> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		if(ids==null || "".equals(ids.trim())) {
-			result.error500("参数不识别!");
-		}else {
-			this.${entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(",")));
-			result.success("删除成功!");
-		}
-		return result;
-	}
-	
-	/**
-	  * 通过id查询
-	 * @param id
-	 * @return
-	 */
-	@GetMapping(value = "/queryById")
-	public Result<${entityName}> queryById(@RequestParam(name="id",required=true) String id) {
-		Result<${entityName}> result = new Result<${entityName}>();
-		${entityName} ${entityName?uncap_first} = ${entityName?uncap_first}Service.getById(id);
-		if(${entityName?uncap_first}==null) {
-			result.error500("未找到对应实体");
-		}else {
-			result.setResult(${entityName?uncap_first});
-			result.setSuccess(true);
-		}
-		return result;
-	}
-	
-	//===========================以下是子表信息操作相关API====================================
-	
-	<#list subTables as sub>
-	/**
-	  * 通过主表id查询${sub.ftlDescription}
-	 * @param mainId
-	 * @return
-	 */
-	@GetMapping(value = "/list${sub.entityName}ByMainId")
-	public Result<List<${sub.entityName}>> query${sub.entityName}ListByMainId(@RequestParam(name="mainId",required=false) String mainId) {
-		Result<List<${sub.entityName}>> result = new Result<List<${sub.entityName}>>();
-		List<${sub.entityName}> ${sub.entityName?uncap_first}List = null;
-		if (mainId != null) {
-			${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(mainId);
-            result.setResult(${sub.entityName?uncap_first}List);
-            result.setSuccess(true);
-            return result;
-		}else return null;	
-	}
-	
-	/**
-     * 添加${sub.ftlDescription}
-     *
-     * @param ${sub.entityName?uncap_first}
-     * @return
-     */
-    @PostMapping(value = "/add${sub.entityName}")
-    public Result<${sub.entityName}> add${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) {
-        Result<${sub.entityName}> result = new Result<>();
-        try {
-            boolean ok = ${sub.entityName?uncap_first}Service.save(${sub.entityName?uncap_first});
-            if (ok) {
-                result.setSuccess(true);
-                result.setMessage("添加${sub.ftlDescription}成功.");
-            } else {
-                result.setSuccess(false);
-                result.setMessage("添加${sub.ftlDescription}失败!");
-            }
-            return result;
-        } catch (Exception e) {
-            e.fillInStackTrace();
-            result.setSuccess(false);
-            result.setMessage("添加${sub.ftlDescription}过程中出现了异常: " + e.getMessage());
-            return result;
-        }
-    }
-    
-    /**
-     * 编辑${sub.ftlDescription}
-     *
-     * @param ${sub.entityName?uncap_first}
-     * @return
-     */
-    @PutMapping("/edit${sub.entityName}")
-    public Result<${sub.entityName}> edit${sub.entityName}(@RequestBody ${sub.entityName} ${sub.entityName?uncap_first}) {
-        Result<${sub.entityName}> result = new Result<>();
-        try {
-            boolean ok = ${sub.entityName?uncap_first}Service.updateById(${sub.entityName?uncap_first});
-            if (ok) {
-                result.setSuccess(true);
-                result.setMessage("更新${sub.ftlDescription}成功.");
-            } else {
-                result.setSuccess(false);
-                result.setMessage("更新${sub.ftlDescription}失败!");
-            }
-            return result;
-        } catch (Exception e) {
-            result.setSuccess(false);
-            result.setMessage("更新数据过程中出现异常啦: " + e.getMessage());
-            return result;
-        }
-    }
-    
-    /**
-     * 通过id删除${sub.ftlDescription}
-     *
-     * @param id
-     * @return
-     */
-    @DeleteMapping(value = "/delete${sub.entityName}")
-    public Result<${sub.entityName}> delete${sub.entityName}(@RequestParam(name = "id", required = true) String id) {
-        Result<${sub.entityName}> result = new Result<>();
-        try {
-            boolean ok = ${sub.entityName?uncap_first}Service.removeById(id);
-            if (ok) {
-                result.setSuccess(true);
-                result.setMessage("删除${sub.ftlDescription}成功.");
-            } else {
-                result.setSuccess(false);
-                result.setMessage("删除${sub.ftlDescription}失败!");
-            }
-            return result;
-        } catch (Exception e) {
-            result.setSuccess(false);
-            result.setMessage("删除${sub.ftlDescription}过程中出现异常啦: " + e.getMessage());
-            return result;
-        }
-    }
-	
-	/**
-     * 批量删除${sub.ftlDescription}
-     *
-     * @param ids
-     * @return
-     */
-    @DeleteMapping(value = "/deleteBatch${sub.entityName}")
-    public Result<${sub.entityName}> deleteBatch${sub.entityName}(@RequestParam(name = "ids", required = true) String ids) {
-        Result<${sub.entityName}> result = new Result<${sub.entityName}>();
-        if (ids == null || "".equals(ids.trim())) {
-            result.error500("参数不识别!");
-        } else {
-            this.${sub.entityName?uncap_first}Service.removeByIds(Arrays.asList(ids.split(",")));
-            result.success("删除成功!");
-        }
-        return result;
-    }
-    
-	</#list>
-
-    /**
-     * 导出excel
-     *
-     * @param request
-     * @param response
-     */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
-        // Step.1 组装查询条件
-        QueryWrapper<${entityName}> queryWrapper = null;
-        try {
-            String paramsStr = request.getParameter("paramsStr");
-            if (oConvertUtils.isNotEmpty(paramsStr)) {
-                String deString = URLDecoder.decode(paramsStr, "UTF-8");
-                ${entityName} ${entityName?uncap_first} = JSON.parseObject(deString, ${entityName}.class);
-                queryWrapper = QueryGenerator.initQueryWrapper(${entityName?uncap_first}, request.getParameterMap());
-            }
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        //Step.2 AutoPoi 导出Excel
-        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
-        List<${entityName}Page> pageList = new ArrayList<${entityName}Page>();
-        List<${entityName}> ${entityName?uncap_first}List = ${entityName?uncap_first}Service.list(queryWrapper);
-        for (${entityName} ${entityName?uncap_first} : ${entityName?uncap_first}List) {
-            ${entityName}Page vo = new ${entityName}Page();
-            BeanUtils.copyProperties(${entityName?uncap_first}, vo);
-            <#list subTables as sub>
-            List<${sub.entityName}> ${sub.entityName?uncap_first}List = ${sub.entityName?uncap_first}Service.selectByMainId(${entityName?uncap_first}.getId());
-            vo.set${sub.entityName}List(${sub.entityName?uncap_first}List);
-            </#list>
-            pageList.add(vo);
-        }
-        //导出文件名称
-        mv.addObject(NormalExcelConstants.FILE_NAME, "${tableVo.ftlDescription}列表");
-        mv.addObject(NormalExcelConstants.CLASS, ${entityName}Page.class);
-        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("${tableVo.ftlDescription}列表数据", "导出人:Jeecg", "导出信息"));
-        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
-        return mv;
-    }
-
-    /**
-     * 通过excel导入数据
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-            MultipartFile file = entity.getValue();// 获取上传文件对象
-            ImportParams params = new ImportParams();
-            params.setTitleRows(2);
-            params.setHeadRows(1);
-            params.setNeedSave(true);
-            try {
-                List<${entityName}Page> list = ExcelImportUtil.importExcel(file.getInputStream(), ${entityName}Page.class, params);
-                for (${entityName}Page page : list) {
-                    ${entityName} po = new ${entityName}();
-                    BeanUtils.copyProperties(page, po);
-                    ${entityName?uncap_first}Service.saveMain(po, <#list subTables as sub>page.get${sub.entityName}List()<#if sub_has_next>,</#if></#list>);
-                }
-                return Result.ok("文件导入成功!数据行数:" + list.size());
-            } catch (Exception e) {
-                log.error(e.getMessage(),e);
-                return Result.error("文件导入失败:"+e.getMessage());
-            } finally {
-                try {
-                    file.getInputStream().close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return Result.ok("文件导入失败!");
-    }
-}

+ 0 - 39
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai

@@ -1,39 +0,0 @@
-package ${bussiPackage}.${entityPackage}.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Data
-@TableName("${tableName}")
-public class ${entityName} implements Serializable {
-    private static final long serialVersionUID = 1L;
-    
-    <#list originalColumns as po>
-	/**${po.filedComment}*/
-	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.UUID)
-	</#if>
-  <#if po.fieldType =='java.util.Date'>
-	<#if po.fieldDbType =='date'>
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-	<#elseif po.fieldDbType =='datetime'>
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	</#if>
-  </#if>
-	private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
-	</#list>
-}

+ 0 - 49
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai

@@ -1,49 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}.java
-package ${bussiPackage}.${entityPackage}.entity;
-
-import java.io.Serializable;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Data
-@TableName("${subTab.tableName}")
-public class ${subTab.entityName} implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    <#list subTab.originalColumns as po>
-	/**${po.filedComment}*/
-	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.UUID)
-	<#else>
-  <#if po.fieldType =='java.util.Date'>
-	<#if po.fieldDbType =='date'>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-	<#elseif po.fieldDbType =='datetime'>
-	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	</#if>
-	<#else>
-	<#if !subTab.foreignKeys?seq_contains(po.fieldName?cap_first)>
-    @Excel(name = "${po.filedComment}", width = 15)
-    </#if>
-  </#if>
-  </#if>
-	private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
-	</#list>
-}
-</#list>

+ 0 - 17
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai

@@ -1,17 +0,0 @@
-package ${bussiPackage}.${entityPackage}.mapper;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface ${entityName}Mapper extends BaseMapper<${entityName}> {
-
-}

+ 0 - 21
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai

@@ -1,21 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}Mapper.java
-package ${bussiPackage}.${entityPackage}.mapper;
-
-import java.util.List;
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface ${subTab.entityName}Mapper extends BaseMapper<${subTab.entityName}> {
-
-	public boolean deleteByMainId(String mainId);
-    
-	public List<${subTab.entityName}> selectByMainId(String mainId);
-}
-</#list>

+ 0 - 5
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper">
-
-</mapper>

+ 0 - 38
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml

@@ -1,38 +0,0 @@
-<#list subTables as subTab>
-<#assign originalForeignKeys = subTab.originalForeignKeys>
-        #segment#${subTab.entityName}Mapper.xml
-        <?xml version="1.0" encoding="UTF-8"?>
-        <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper">
-
-<delete id="deleteByMainId" parameterType="java.lang.String">
-    DELETE
-    FROM ${subTab.tableName}
-    WHERE
-    <#list originalForeignKeys as key>
-    <#if key?lower_case?index_of("${primaryKeyField}")!=-1>
-    ${key} = ${r'#'}{${primaryKeyField}}<#rt/>
-    <#else>
-    ${key} = ${r'#'}{${key}}<#rt/>
-</#if>
-<#if key_has_next>AND
-</#if>
-        </#list>
-        </delete>
-
-<select id="selectByMainId" parameterType="java.lang.String"
-        resultType="${bussiPackage}.${entityPackage}.entity.${subTab.entityName}">
-SELECT *
-FROM ${subTab.tableName}
-WHERE
-<#list originalForeignKeys as key>
-<#if key?lower_case?index_of("${primaryKeyField}")!=-1>
-${key} = ${r'#'}{${primaryKeyField}}<#rt/>
-<#else>
-${key} = ${r'#'}{${key}}<#rt/>
-</#if>
-<#if key_has_next>AND</#if>
-        </#list>
-        </select>
-        </mapper>
-        </#list>

+ 0 - 42
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai

@@ -1,42 +0,0 @@
-package ${bussiPackage}.${entityPackage}.service;
-
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface I${entityName}Service extends IService<${entityName}> {
-
-	/**
-	 * 添加一对多
-	 * 
-	 */
-	public void saveMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) ;
-	
-	/**
-	 * 修改一对多
-	 * 
-	 */
-	public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>);
-	
-	/**
-	 * 删除一对多
-	 */
-	public void delMain (String id);
-	
-	/**
-	 * 批量删除一对多
-	 */
-	public void delBatchMain (Collection<? extends Serializable> idList);
-	
-}

+ 0 - 19
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai

@@ -1,19 +0,0 @@
-<#list subTables as subTab>
-#segment#I${subTab.entityName}Service.java
-package ${bussiPackage}.${entityPackage}.service;
-
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import com.baomidou.mybatisplus.extension.service.IService;
-import java.util.List;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-public interface I${subTab.entityName}Service extends IService<${subTab.entityName}> {
-
-	public List<${subTab.entityName}> selectByMainId(String mainId);
-}
-</#list>

+ 0 - 101
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai

@@ -1,101 +0,0 @@
-package ${bussiPackage}.${entityPackage}.service.impl;
-
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.mapper.${sub.entityName}Mapper;
-</#list>
-import ${bussiPackage}.${entityPackage}.mapper.${entityName}Mapper;
-import ${bussiPackage}.${entityPackage}.service.I${entityName}Service;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Collection;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Service
-public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, ${entityName}> implements I${entityName}Service {
-
-	@Autowired
-	private ${entityName}Mapper ${entityName?uncap_first}Mapper;
-	<#list subTables as sub>
-	@Autowired
-	private ${sub.entityName}Mapper ${sub.entityName?uncap_first}Mapper;
-	</#list>
-	
-	@Override
-	@Transactional
-	public void saveMain(${entityName} ${entityName?uncap_first}, <#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
-		${entityName?uncap_first}Mapper.insert(${entityName?uncap_first});
-		<#list subTables as sub>
-		for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
-			<#list sub.foreignKeys as key>
-			//外键设置
-			<#if key?lower_case?index_of("${primaryKeyField}")!=-1>
-			entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
-			<#else>
-			entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
-			</#if>
-			</#list>
-			${sub.entityName?uncap_first}Mapper.insert(entity);
-		}
-		</#list>
-	}
-
-	@Override
-	@Transactional
-	public void updateMain(${entityName} ${entityName?uncap_first},<#list subTables as sub>List<${sub.entityName}> ${sub.entityName?uncap_first}List<#if sub_has_next>,</#if></#list>) {
-		${entityName?uncap_first}Mapper.updateById(${entityName?uncap_first});
-		
-		//1.先删除子表数据
-		<#list subTables as sub>
-		${sub.entityName?uncap_first}Mapper.deleteByMainId(${entityName?uncap_first}.getId());
-		</#list>
-		
-		//2.子表数据重新插入
-		<#list subTables as sub>
-		for(${sub.entityName} entity:${sub.entityName?uncap_first}List) {
-			<#list sub.foreignKeys as key>
-			//外键设置
-			<#if key?lower_case?index_of("${primaryKeyField}")!=-1>
-			entity.set${key?cap_first}(${entityName?uncap_first}.get${primaryKeyField?cap_first}());
-			<#else>
-			entity.set${key?cap_first}(${entityName?uncap_first}.get${key}());
-			</#if>
-			</#list>
-			${sub.entityName?uncap_first}Mapper.insert(entity);
-		}
-		</#list>
-	}
-
-	@Override
-	@Transactional
-	public void delMain(String id) {
-		<#list subTables as sub>
-		${sub.entityName?uncap_first}Mapper.deleteByMainId(id);
-		</#list>
-		${entityName?uncap_first}Mapper.deleteById(id);
-	}
-
-	@Override
-	@Transactional
-	public void delBatchMain(Collection<? extends Serializable> idList) {
-		for(Serializable id:idList) {
-			<#list subTables as sub>
-			${sub.entityName?uncap_first}Mapper.deleteByMainId(id.toString());
-			</#list>
-			${entityName?uncap_first}Mapper.deleteById(id);
-		}
-	}
-	
-}

+ 0 - 30
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai

@@ -1,30 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}ServiceImpl.java
-package ${bussiPackage}.${entityPackage}.service.impl;
-
-import ${bussiPackage}.${entityPackage}.entity.${subTab.entityName};
-import ${bussiPackage}.${entityPackage}.mapper.${subTab.entityName}Mapper;
-import ${bussiPackage}.${entityPackage}.service.I${subTab.entityName}Service;
-import org.springframework.stereotype.Service;
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @Description: ${subTab.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Service
-public class ${subTab.entityName}ServiceImpl extends ServiceImpl<${subTab.entityName}Mapper, ${subTab.entityName}> implements I${subTab.entityName}Service {
-	
-	@Autowired
-	private ${subTab.entityName}Mapper ${subTab.entityName?uncap_first}Mapper;
-	
-	@Override
-	public List<${subTab.entityName}> selectByMainId(String mainId) {
-		return ${subTab.entityName?uncap_first}Mapper.selectByMainId(mainId);
-	}
-}
-</#list>

+ 0 - 49
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai

@@ -1,49 +0,0 @@
-package ${bussiPackage}.${entityPackage}.vo;
-
-import java.util.List;
-import ${bussiPackage}.${entityPackage}.entity.${entityName};
-<#list subTables as sub>
-import ${bussiPackage}.${entityPackage}.entity.${sub.entityName};
-</#list>
-import lombok.Data;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecgframework.poi.excel.annotation.ExcelCollection;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * @Description: ${tableVo.ftlDescription}
- * @Author: jeecg-boot
- * @Date:   ${.now?string["yyyy-MM-dd"]}
- * @Version: V1.0
- */
-@Data
-public class ${entityName}Page {
-
-    <#list originalColumns as po>
-	/**${po.filedComment}*/
-	<#if po.fieldName == primaryKeyField>
-	<#else>
-    <#if po.fieldType =='java.util.Date'>
-  	<#if po.fieldDbType =='date'>
-  	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
-  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-  	<#elseif po.fieldDbType =='datetime'>
-  	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-  	</#if>
-  	<#else>
-  	@Excel(name = "${po.filedComment}", width = 15)
-    </#if>
-  </#if>
-	private <#if po.fieldType=='java.sql.Blob'>byte[]<#else>${po.fieldType}</#if> ${po.fieldName};
-	</#list>
-
-	<#list subTables as sub>
-	@ExcelCollection(name="${sub.ftlDescription}")
-	private List<${sub.entityName}> ${sub.entityName?uncap_first}List;
-	</#list>
-	
-}

+ 0 - 225
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -1,225 +0,0 @@
-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-<#list columns as po><#rt/>
-<#if po.fieldName !='id' && po_index<= tableVo.searchFieldNum>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="${po.filedComment}">
-              <a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
-            </a-form-item>
-          </a-col>
-</#if>
-</#list>
-          <a-col :md="6" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-          <a-icon type="delete"/>删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 
-          <a-icon type="down" />
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i>
-        <span>已选择</span>
-        <a style="font-weight: 600">
-          {{ selectedRowKeys.length }}
-        </a>
-        <span>项</span>
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:type}"
-        @change="handleTableChange"
-        :customRow="clickThenCheck">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-
-          <a-divider type="vertical" />
-          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-            <a>删除</a>
-          </a-popconfirm>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-    
-    <a-tabs defaultActiveKey="1">
-    <#list subTables as sub><#rt/>
-      <a-tab-pane tab="${sub.ftlDescription}" :key="refKeys[${sub_index}]" :forceRender="true">
-        <${sub.entityName?uncap_first}-List ref="${sub.entityName}List"></${sub.entityName?uncap_first}-List>
-      </a-tab-pane>
-	</#list>
-    </a-tabs>
-
-    <!-- 表单区域 -->
-    <${entityName?uncap_first}-modal ref="modalForm" @ok="modalFormOk"/>
-
-  </a-card>
-</template>
-
-<script>
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import ${entityName}Modal from './modules/${entityName}Modal'
-  import {deleteAction} from '@/api/manage'
-  <#list subTables as sub><#rt/>
-  import ${sub.entityName}List from './${sub.entityName}List'
-  import ${sub.entityName}Modal from './modules/${sub.entityName}Modal'
-  </#list>
-
-  export default {
-    name: "${entityName}List",
-    mixins: [JeecgListMixin],
-    components: {
-      ${entityName}Modal,
-    <#list subTables as sub><#rt/>
-      ${sub.entityName}Modal,
-      ${sub.entityName}List,
-	</#list>
-    },
-    data () {
-      return {
-        refKeys: [<#list subTables as sub>'${sub.entityName?uncap_first}', </#list>],
-        description: '${tableVo.ftlDescription}管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key: 'rowIndex',
-            width: 60,
-            align: "center",
-            customRender:function (t, r, index) {
-              return parseInt(index)+1;
-            }
-          },
-<#list columns as po><#rt/>
-  <#if po.fieldName !='id'>
-          {
-            title: '${po.filedComment}',
-            align:"center",
-            dataIndex: '${po.fieldName}'
-          },
-  </#if>
-</#list>
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
- 
-        //操作url
-        type: "radio",
-        url: {
-          list: "/${entityPackage}/${entityName?uncap_first}/list",
-          delete: "/${entityPackage}/${entityName?uncap_first}/delete",
-          deleteBatch: "/${entityPackage}/${entityName?uncap_first}/deleteBatch",
-          exportXlsUrl: "${entityPackage}/${entityName?uncap_first}/exportXls",
-          importExcelUrl: "${entityPackage}/${entityName?uncap_first}/importExcel",
-         },
-      }
-    },
-    computed: {
-      importExcelUrl: function(){
-        <#noparse>return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;</#noparse>
-      }
-    },
-    methods: {
-		clickThenCheck(record) {
-        return {
-          on: {
-            click: () => {
-              this.onSelectChange(record.id.split(","), [record]);
-            }
-          }
-        };
-      },
-      onSelectChange(selectedRowKeys, selectionRows) {
-        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectionRows;
-        <#list subTables as sub><#rt/>
-        this.$refs.${sub.entityName}List.getMain(this.selectedRowKeys[0]);
-        </#list>
-      },
-      onClearSelected() {
-        this.selectedRowKeys = [];
-        this.selectionRows = [];
-        <#list subTables as sub><#rt/>
-        this.$refs.${sub.entityName}List.queryParam.mainId = null;
-        this.$refs.${sub.entityName}List.loadData();
-        this.$refs.${sub.entityName}List.selectedRowKeys = [];
-        this.$refs.${sub.entityName}List.selectionRows = [];
-        </#list>
-      },
-
-      handleDelete: function (id) {
-        var that = this;
-        deleteAction(that.url.delete, {id: id}).then((res) => {
-          if (res.success) {
-            that.$message.success(res.message);
-            that.loadData();
-            <#list subTables as sub><#rt/>
-            this.$refs.${sub.entityName}List.loadData();
-            </#list>
-          } else {
-            that.$message.warning(res.message);
-          }
-        });
-      },
-      searchQuery:function(){
-        this.selectedRowKeys = [];
-        this.selectionRows = [];
-        <#list subTables as sub><#rt/>
-        this.$refs.${sub.entityName}List.queryParam.mainId = null;
-        this.$refs.${sub.entityName}List.loadData();
-        this.$refs.${sub.entityName}List.selectedRowKeys = [];
-        this.$refs.${sub.entityName}List.selectionRows = [];
-        </#list>
-        this.loadData();
-      }
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>

+ 0 - 140
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei

@@ -1,140 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}List.vue
-<template>
-  <a-card :bordered="false">
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator" :md="24" :sm="24" style="margin: 0px 0px 20px 0px">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel">
-            <a-icon type="delete"/>删除
-          </a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作
-          <a-icon type="down"/>
-        </a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-        <span slot="action" slot-scope="text, record">
-          <a @click="handleEdit(record)">编辑</a>
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              更多 <a-icon type="down"/>
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a href="javascript:;" @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <${subTab.entityName}-modal ref="modalForm" @ok="modalFormOk"/>
-  </a-card>
-</template>
-
-<script>
-  import ${subTab.entityName}Modal from './modules/${subTab.entityName}Modal'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import {getAction} from '@/api/manage'
-
-  export default {
-    name: "${subTab.entityName}List",
-    mixins: [JeecgListMixin],
-    components: {
-      ${subTab.entityName}Modal,
-    },
-    data() {
-      return {
-        description: '信息',
-        // 表头
-        columns: [
-        <#list subTab.colums as po><#rt/>
-  <#if po.fieldName !='id' && subTab.foreignKeys[0]?uncap_first != po.fieldName>
-          {
-            title: '${po.filedComment}',
-            align:"center",
-            dataIndex: '${po.fieldName}'
-          },
-  </#if>
-</#list>
-         {
-          title: '操作',
-          key: 'operation',
-          align: "center",
-          width: 130,
-          scopedSlots: {customRender: 'action'},
-        }],
-        url: {
-          list: "/${entityPackage}/${entityName?uncap_first}/list${subTab.entityName}ByMainId",
-          delete: "/${entityPackage}/${entityName?uncap_first}/delete${subTab.entityName}",
-          deleteBatch: "/${entityPackage}/${entityName?uncap_first}/deleteBatch${subTab.entityName}",
-        }
-      }
-    },
-    methods: {
-      loadData(arg) {
-        if (arg === 1) {
-          this.ipagination.current = 1;
-        }
-        var params = this.getQueryParams();
-        getAction(this.url.list, {mainId: params.mainId}).then((res) => {
-          if (res.success) {
-            this.dataSource = res.result;
-          } else {
-            this.dataSource = null;
-          }
-        })
-      },
-      getMain(mainId) {
-        this.queryParam.mainId = mainId;
-        this.loadData(1);
-      },
-      handleAdd: function () {
-        this.$refs.modalForm.add(this.queryParam.mainId);
-        this.$refs.modalForm.title = "添加${subTab.ftlDescription}";
-      },
-    }
-  }
-</script>
-<style scoped>
-  .ant-card {
-    margin-left: -30px;
-    margin-right: -30px;
-  }
-</style>
-</#list>

+ 0 - 167
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -1,167 +0,0 @@
-<template>
-  <a-modal
-    :title="title"
-    :width="1000"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel">
-    <a-spin :spinning="confirmLoading">
-      <!-- 主表单区域 -->
-      <a-form :form="form">
-		<#list columns as po><#rt/>
-        <#if po.fieldName !='id'><#rt/>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="${po.filedComment}">
-          <#if po.fieldType =='date'>
-          <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif po.fieldType =='datetime'>
-          <a-date-picker showTime format="YYYY-MM-DD HH:mm:ss" v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif "int,decimal,double,"?contains(po.fieldType)>
-          <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#else>
-          <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          </#if>
-        </a-form-item>
-        </#if>
-        </#list>
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import {httpAction} from '@/api/manage'
-  import JDate from '@/components/jeecg/JDate'
-  import pick from 'lodash.pick'
-  import moment from "moment"
-
-  export default {
-    name: '${entityName}Modal',
-    components: {
-      JDate
-    },
-    data() {
-      return {
-        title: "操作",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: {span: 24},
-          sm: {span: 5},
-        },
-        wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16},
-        },
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules: {
-<#list columns as po>
-  <#if po.fieldName !='id'>
-    <#if po.nullable =='N'>
-          ${po.fieldName}: { rules: [{ required: true, message: '请输入${po.filedComment}!' }] },
-    </#if>
-  </#if>
-</#list>
-        },
-        url: {
-          add: "/${entityPackage}/${entityName?uncap_first}/add",
-          edit: "/${entityPackage}/${entityName?uncap_first}/edit",
-<#list subTables as sub><#rt/>
-          ${sub.entityName?uncap_first}List: '/${entityPackage}/${entityName?uncap_first}/query${sub.entityName}ByMainId',
-</#list>
-        }
-      }
-    },
-    methods: {
-      add() {
-        this.edit({});
-      },
-      edit(record) {
-        this.form.resetFields();
-        this.model = Object.assign({}, record);
-        //初始化明细表数据
-        console.log(this.model.id)
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, <#list columns as col>'${col.fieldName}', </#list>))
-          // 时间格式化
-<#list columns as col><#rt/>
-	<#if col.fieldName !='id' && (col.fieldType =='date' || col.fieldType =='datetime')>
-          this.form.setFieldsValue({ ${col.fieldName}: this.model.${col.fieldName} ? moment(this.model.${col.fieldName}) : null })
-	</#if>
-</#list>  
-        });
-      },
-      close() {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk() {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if (!this.model.id) {
-              httpurl += this.url.add;
-              method = 'post';
-            } else {
-              httpurl += this.url.edit;
-              method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-            <#list columns as po>
-            <#if po.fieldName !='id' && po.fieldType =='date'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
-            <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
-            </#if>
-            </#list>
-            httpAction(httpurl, formData, method).then((res) => {
-              if (res.success) {
-                 that.$message.success(res.message);
-                 that.$emit('ok');
-               } else {
-                 that.$message.warning(res.message);
-               }
-             }).finally(() => {
-               that.confirmLoading = false;
-               that.close();
-             })
-           }
-        })
-      },
-      handleCancel() {
-        this.close()
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .ant-btn {
-    padding: 0 10px;
-    margin-left: 3px;
-  }
-
-  .ant-form-item-control {
-    line-height: 0px;
-  }
-
-  /** 主表单行间距 */
-  .ant-form .ant-form-item {
-    margin-bottom: 10px;
-  }
-
-  /** Tab页面行间距 */
-  .ant-tabs-content .ant-form-item {
-    margin-bottom: 0px;
-  }
-</style>

+ 0 - 183
jeecg-boot-module-system/target/classes/jeecg/code-template/onetomany2/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei

@@ -1,183 +0,0 @@
-<#list subTables as subTab>
-#segment#${subTab.entityName}Modal.vue
-<template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :visible="visible"
-    :okButtonProps="{ props: {disabled: disableSubmit} }"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
-    <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
-<#list subTab.colums as po><#rt/>
-
-<#if po.fieldName !='id'><#rt/>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="${po.filedComment}"
-          <#if subTab.foreignKeys[0]?uncap_first == po.fieldName>
-          :hidden="hiding"
-          </#if>
-          hasFeedback>
-          <#if po.fieldType =='date'>
-          <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif po.fieldType =='datetime'>
-          <a-date-picker showTime format="YYYY-MM-DD HH:mm:ss" v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#elseif "int,decimal,double,"?contains(po.fieldType)>
-          <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          <#else>
-          <#if subTab.foreignKeys[0]?uncap_first == po.fieldName>
-          <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', {'initialValue':this.mainId}]" />
-          <#else>
-          <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
-          </#if>
-          </#if>
-        </a-form-item>
-</#if>
-</#list>
-      </a-form>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import {httpAction} from '@/api/manage'
-  import pick from 'lodash.pick'
-  import moment from 'moment'
-  import JDate from '@/components/jeecg/JDate'
-
-  export default {
-    components: {
-      JDate
-    },
-    name: '${subTab.entityName}Modal',
-    data() {
-      return {
-        title: '操作',
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: {span: 24},
-          sm: {span: 5}
-        },
-        wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16}
-        },
-        moment,
-        format: 'YYYY-MM-DD HH:mm:ss',
-        disableSubmit: false,
-        mainId: '',
-        hiding: false,
-        confirmLoading: false,
-        form: this.$form.createForm(this),
-        validatorRules: {
-  <#list subTab.colums as po>
-  <#if po.fieldName !='id' && subTab.foreignKeys[0]?uncap_first != po.fieldName>
-    <#if po.nullable =='N'>
-          ${po.fieldName}: { rules: [{ required: true, message: '请输入${po.filedComment}!' }] },
-    </#if>
-  </#if>
-</#list>
-        },
-        url: {
-          add: '/${entityPackage}/${entityName?uncap_first}/add${subTab.entityName}',
-          edit: '/${entityPackage}/${entityName?uncap_first}/edit${subTab.entityName}'
-        }
-      }
-    },
-    created() {
-    },
-    methods: {
-      add(mainId) {
-        if (mainId) {
-          this.edit({mainId}, '')
-        } else {
-          this.$message.warning('请选择一条数据')
-        }
-      },
-      detail(record) {
-        this.edit(record, 'd')
-      },
-      edit(record, v) {
-        if (v == 'e') {
-          this.hiding = false;
-          this.disableSubmit = false;
-        } else if (v == 'd') {
-          this.hiding = false;
-          this.disableSubmit = true;
-        } else {
-          this.hiding = true;
-          this.disableSubmit = false;
-        }
-        this.form.resetFields();
-        this.mainId = record.mainId;
-        this.model = Object.assign({}, record);
-        this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model, <#list subTab.colums as col>'${col.fieldName}', </#list>))
-          // 时间格式化
-<#list subTab.colums as col><#rt/>
-	<#if col.fieldName !='id' && (col.fieldType =='date' || col.fieldType =='datetime')>
-          this.form.setFieldsValue({ ${col.fieldName}: this.model.${col.fieldName} ? moment(this.model.${col.fieldName}) : null })
-	</#if>
-</#list>  
-        })
-      },
-      close() {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk() {
-        const that = this;
-        // 触发表单验证
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if (!this.model.id) {
-              httpurl += this.url.add;
-              method = 'post';
-            } else {
-              httpurl += this.url.edit;
-              method = 'put';
-            }
-            let formData = Object.assign(this.model, values);
-            //时间格式化
-            <#list subTab.colums as po>
-            <#if po.fieldName !='id' && po.fieldType =='date'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
-            <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
-            </#if>
-            </#list>
-            httpAction(httpurl, formData, method).then((res) => {
-              if (res.success) {
-                that.$message.success(res.message);
-                that.$emit('ok');
-              } else {
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-          }
-        })
-      },
-      handleCancel() {
-        this.close();
-      }
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
-</#list>

+ 0 - 23
jeecg-boot-module-system/target/classes/jeecg/jeecg_config.properties

@@ -1,23 +0,0 @@
-#code_generate_project_path
-project_path=D:\\module
-#bussi_package[User defined]
-bussi_package=org.jeecg.modules
-#default code path
-#source_root_package=src
-#webroot_package=WebRoot
-#maven code path
-source_root_package=src.main.java
-webroot_package=src.main.webapp
-#ftl resource url
-templatepath=/jeecg/code-template
-system_encoding=utf-8
-#db Table id [User defined]
-db_table_id=id
-#db convert flag[true/false]
-db_filed_convert=true
-#page Search Field num [User defined]
-page_search_filed_num=1
-#page_filter_fields
-page_filter_fields=create_time,create_by,update_time,update_by
-
-

+ 0 - 24
jeecg-boot-module-system/target/classes/jeecg/jeecg_database.properties

@@ -1,24 +0,0 @@
-#mysql 
-diver_name=com.mysql.jdbc.Driver
-url=jdbc:mysql://localhost:3306/jeecg-boot?useUnicode=true&characterEncoding=UTF-8
-username=root
-password=root
-database_name=jeecg-boot
-#oracle
-#diver_name=oracle.jdbc.driver.OracleDriver
-#url=jdbc:oracle:thin:@192.168.1.200:1521:ORCL
-#username=scott
-#password=tiger
-#database_name=ORCL
-#postgre
-#diver_name=org.postgresql.Driver
-#url=jdbc:postgresql://localhost:5432/jeecg
-#username=postgres
-#password=postgres
-#database_name=jeecg
-#SQLServer2005\u4ee5\u4e0a
-#diver_name=org.hibernate.dialect.SQLServerDialect
-#url=jdbc:sqlserver://192.168.1.200:1433;DatabaseName=jeecg
-#username=sa
-#password=SA
-#database_name=jeecg

+ 0 - 96
jeecg-boot-module-system/target/classes/logback-spring.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false">
-    <!--定义日志文件的存储地址 -->
-    <property name="LOG_HOME" value="../logs"/>
-
-    <property name="COLOR_PATTERN"
-              value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)"/>
-    <!-- 控制台输出 -->
-    <appender name="STDOUT"
-              class="ch.qos.logback.core.ConsoleAppender">
-        <encoder
-                class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符 -->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 按照每天生成日志文件 -->
-    <appender name="FILE"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy
-                class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--日志文件输出的文件名 -->
-            <FileNamePattern>${LOG_HOME}/jeecgboot.%d{yyyy-MM-dd}.log
-            </FileNamePattern>
-            <!--日志文件保留天数 -->
-            <MaxHistory>30</MaxHistory>
-        </rollingPolicy>
-        <encoder
-                class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出:%d表示日期,%thread表示线程名,%-5level:级别从左显示5个字符宽度%msg:日志消息,%n是换行符 -->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
-        </encoder>
-        <!--日志文件最大的大小 -->
-        <triggeringPolicy
-                class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>10MB</MaxFileSize>
-        </triggeringPolicy>
-    </appender>
-
-    <!-- 生成html格式日志开始 -->
-    <appender name="HTML" class="ch.qos.logback.core.FileAppender">
-        <!-- 过滤器,只记录WARN级别的日志 -->
-        <!-- <filter class="ch.qos.logback.classic.filter.LevelFilter"> <level>info</level>
-            <onMatch>ACCEPT</onMatch> <onMismatch>DENY</onMismatch> </filter> -->
-
-        <encoder
-                class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="ch.qos.logback.classic.html.HTMLLayout">
-                <pattern>%p%d%msg%M%F{32}%L</pattern>
-            </layout>
-        </encoder>
-        <file>${LOG_HOME}/error-log.html</file>
-    </appender>
-    <!-- 生成html格式日志结束 -->
-
-    <!-- 每天生成一个html格式的日志开始 -->
-    <appender name="FILE_HTML"
-              class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy
-                class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--日志文件输出的文件名 -->
-            <FileNamePattern>${LOG_HOME}/jeecgboot.%d{yyyy-MM-dd}.html
-            </FileNamePattern>
-            <!--日志文件保留天数 -->
-            <MaxHistory>30</MaxHistory>
-        </rollingPolicy>
-        <encoder
-                class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="ch.qos.logback.classic.html.HTMLLayout">
-                <pattern>%p%d%msg%M%F{32}%L</pattern>
-            </layout>
-        </encoder>
-        <!--日志文件最大的大小 -->
-        <triggeringPolicy
-                class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <MaxFileSize>10MB</MaxFileSize>
-        </triggeringPolicy>
-    </appender>
-    <!-- 每天生成一个html格式的日志结束 -->
-
-    <!--myibatis log configure -->
-    <logger name="com.apache.ibatis" level="TRACE"/>
-    <logger name="java.sql.Connection" level="DEBUG"/>
-    <logger name="java.sql.Statement" level="DEBUG"/>
-    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
-
-    <!-- 日志输出级别 -->
-    <root level="INFO">
-        <appender-ref ref="STDOUT"/>
-        <appender-ref ref="FILE"/>
-        <appender-ref ref="HTML"/>
-        <appender-ref ref="FILE_HTML"/>
-    </root>
-
-</configuration>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/AdvertiserMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.AdvertiserMapper">
-
-</mapper>

+ 0 - 4
jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CTopOauthTokenMapper.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CTopOauthTokenMapper">
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoAdvertisePlanMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CTopToutiaoAdvertisePlanMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoAdvertiserMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CTopToutiaoAdvertiserMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CTopToutiaoCampaignMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CTopToutiaoCampaignMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CtopToutiaoAdvertiserBudgetMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CtopToutiaoAdvertiserBudgetMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/CtopToutiaoBudgetTemplateMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.CtopToutiaoBudgetTemplateMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/ToutiaoCreativeMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.ToutiaoCreativeMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/ctop/mapper/xml/ToutiaoCreativeMaterialMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ctop.mapper.ToutiaoCreativeMaterialMapper">
-
-</mapper>

+ 0 - 9
jeecg-boot-module-system/target/classes/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.test.mapper.JeecgDemoMapper">
-
-    <!-- 根据用户名查询 -->
-    <select id="getDemoByName" resultType="org.jeecg.modules.demo.test.entity.JeecgDemo">
-		select * from  demo  where name = #{name}
-	</select>
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderCustomerMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.test.mapper.JeecgOrderCustomerMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderMainMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.test.mapper.JeecgOrderMainMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/demo/test/mapper/xml/JeecgOrderTicketMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.test.mapper.JeecgOrderTicketMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/demo/test/mapper/xml/JoaDemoMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.demo.test.mapper.JoaDemoMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/industry/mapper/xml/IndustryMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.industry.mapper.IndustryMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/media/mapper/xml/MediaMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.media.mapper.MediaMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/message/mapper/xml/SysMessageMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.message.mapper.SysMessageMapper">
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/message/mapper/xml/SysMessageTemplateMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.message.mapper.SysMessageTemplateMapper">
-
-</mapper>

+ 0 - 7
jeecg-boot-module-system/target/classes/org/jeecg/modules/ngalain/mapper/xml/NgAlainMapper.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.ngalain.mapper.NgAlainMapper">
-    <select id="getDictByTable" parameterType="String" resultType="java.util.HashMap">
-		   select ${key} as 'label',${value} as 'value' from ${table}
-	</select>
-</mapper>

+ 0 - 9
jeecg-boot-module-system/target/classes/org/jeecg/modules/quartz/mapper/xml/QuartzJobMapper.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.quartz.mapper.QuartzJobMapper">
-
-    <!-- 根据jobClassName查询 -->
-    <select id="findByJobClassName" resultType="org.jeecg.modules.quartz.entity.QuartzJob">
-		select * from  sys_quartz_job  where job_class_name = #{jobClassName}
-	</select>
-</mapper>

+ 0 - 37
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysAnnouncementMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementMapper">
-
-    <resultMap id="SysAnnouncement" type="org.jeecg.modules.system.entity.SysAnnouncement">
-        <result column="id" property="id" jdbcType="VARCHAR"/>
-        <result column="titile" property="titile" jdbcType="VARCHAR"/>
-        <result column="msg_content" property="msgContent" jdbcType="VARCHAR"/>
-        <result column="start_time" property="startTime" jdbcType="TIMESTAMP"/>
-        <result column="end_time" property="endTime" jdbcType="TIMESTAMP"/>
-        <result column="sender" property="sender" jdbcType="VARCHAR"/>
-        <result column="priority" property="priority" jdbcType="VARCHAR"/>
-        <result column="msg_category" property="msgCategory" jdbcType="VARCHAR"/>
-        <result column="msg_type" property="msgType" jdbcType="VARCHAR"/>
-        <result column="send_status" property="sendStatus" jdbcType="VARCHAR"/>
-        <result column="send_time" property="sendTime" jdbcType="VARCHAR"/>
-        <result column="cancel_time" property="cancelTime" jdbcType="VARCHAR"/>
-        <result column="del_flag" property="delFlag" jdbcType="VARCHAR"/>
-        <result column="create_by" property="createBy" jdbcType="VARCHAR"/>
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP"/>
-        <result column="update_by" property="updateBy" jdbcType="VARCHAR"/>
-        <result column="update_time" property="updateTime" jdbcType="TIMESTAMP"/>
-        <result column="user_ids" property="userIds" jdbcType="VARCHAR"/>
-    </resultMap>
-
-
-    <select id="querySysCementListByUserId" parameterType="String" resultMap="SysAnnouncement">
-	   select sa.* from sys_announcement sa,sys_announcement_send sas 
-	   where sa.id = sas.annt_id 
-	   and sa.send_status = '1'
-	   and sa.del_flag = '0'
-	   and sas.user_id = #{userId}
-	   and sa.msg_category = #{msgCategory}
-	   and sas.read_flag = '0'
-	</select>
-
-</mapper>

+ 0 - 48
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysAnnouncementSendMapper">
-
-    <resultMap id="AnnouncementSendModel" type="org.jeecg.modules.system.model.AnnouncementSendModel">
-        <result column="id" property="id" jdbcType="VARCHAR"/>
-        <result column="annt_id" property="anntId" jdbcType="VARCHAR"/>
-        <result column="user_id" property="userId" jdbcType="VARCHAR"/>
-        <result column="titile" property="titile" jdbcType="VARCHAR"/>
-        <result column="msg_content" property="msgContent" jdbcType="VARCHAR"/>
-        <result column="sender" property="sender" jdbcType="VARCHAR"/>
-        <result column="priority" property="priority" jdbcType="VARCHAR"/>
-        <result column="msg_category" property="msgCategory" jdbcType="VARCHAR"/>
-        <result column="send_time" property="sendTime" jdbcType="TIMESTAMP"/>
-    </resultMap>
-
-    <select id="queryByUserId" parameterType="String" resultType="String">
-	   select sas.annt_id from sys_announcement_send sas 
-	   where sas.user_id = #{userId}
-	</select>
-
-    <select id="getMyAnnouncementSendList" parameterType="Object" resultMap="AnnouncementSendModel">
-        select
-        sas.id,
-        sas.annt_id,
-        sas.user_id,
-        sas.read_flag,
-        sa.titile as titile,
-        sa.msg_content as msg_content,
-        sa.sender as sender,
-        sa.priority as priority,
-        sa.msg_category,
-        sa.send_time as send_time
-        from sys_announcement_send sas
-        left join sys_announcement sa ON sas.annt_id = sa.id
-        where sa.send_status = '1'
-        and sa.del_flag = '0'
-        and sas.user_id = #{announcementSendModel.userId}
-        <if test="announcementSendModel.titile !=null and announcementSendModel.titile != ''">
-            and sa.titile = #{announcementSendModel.titile}
-        </if>
-        <if test="announcementSendModel.sender !=null and announcementSendModel.sender != ''">
-            and sa.sender = #{announcementSendModel.sender}
-        </if>
-        order by sa.send_time desc
-    </select>
-
-</mapper>

+ 0 - 16
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysCategoryMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysCategoryMapper">
-
-    <select id="queryListByPid" parameterType="String" resultType="org.jeecg.modules.system.model.TreeSelectModel">
-		select code,
-			   name as 'title',
-			   id as 'key',
-			   (case has_child when '1' then 0 else 1 end) as isLeaf,
-			   pid as parentId
-			   from sys_category
-			where pid = #{pid}
-	</select>
-
-
-</mapper>

+ 0 - 10
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysDataLogMapper.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysDataLogMapper">
-    <!-- 通过表名及数据Id获取最大版本 -->
-    <select id="queryMaxDataVer" parameterType="String" resultType="String">
-		select max(data_version) as mvn from sys_data_log 
-		where data_table = #{tableName} and data_id =#{dataId}
-	</select>
-
-</mapper>

+ 0 - 10
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysDepartMapper">
-
-    <select id="queryUserDeparts" parameterType="String" resultType="org.jeecg.modules.system.entity.SysDepart">
-		select a.* from sys_depart a
-			join sys_user_depart b on a.id = b.dep_id
-			where b.user_id = #{userId}
-	</select>
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysDictItemMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysDictItemMapper">
-
-</mapper>

+ 0 - 76
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysDictMapper">
-
-    <!-- 通过字典code获取字典数据 -->
-    <select id="queryDictItemsByCode" parameterType="String" resultType="org.jeecg.common.system.vo.DictModel">
-
-		   select s.item_value as value,s.item_text as text from sys_dict_item s
-		   where dict_id = (select id from sys_dict where dict_code = #{code})
-		   order by s.sort_order asc
-	</select>
-
-    <!-- 通过字典code获取字典数据 -->
-    <select id="queryDictTextByKey" parameterType="String" resultType="String">
-		   select s.item_text from sys_dict_item s 
-		   where s.dict_id = (select id from sys_dict where dict_code = #{code})
-		   and s.item_value = #{key}
-	</select>
-
-
-    <!--通过查询指定table的 text code 获取字典-->
-    <select id="queryTableDictItemsByCode" parameterType="String" resultType="org.jeecg.common.system.vo.DictModel">
-		   select ${text} as 'text',${code} as 'value' from ${table}
-	</select>
-
-
-    <!--通过查询指定table的 text code 获取字典(指定查询条件)-->
-    <select id="queryTableDictItemsByCodeAndFilter" parameterType="String"
-            resultType="org.jeecg.common.system.vo.DictModel">
-		   select ${text} as 'text',${code} as 'value' from ${table} where ${filterSql}
-	</select>
-
-    <!--通过查询指定table的 text code key 获取字典值-->
-    <select id="queryTableDictTextByKey" parameterType="String" resultType="String">
-		   select ${text} as 'text' from ${table} where ${code}= #{key}
-	</select>
-
-    <!-- 重复校验 sql语句 -->
-    <select id="duplicateCheckCountSql" resultType="Long"
-            parameterType="org.jeecg.modules.system.model.DuplicateCheckVo">
-
-		SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal} and id &lt;&gt; #{dataId}
-	</select>
-
-    <!-- 重复校验 sql语句 -->
-    <select id="duplicateCheckCountSqlNoDataId" resultType="Long"
-            parameterType="org.jeecg.modules.system.model.DuplicateCheckVo">
-		SELECT COUNT(*) FROM ${tableName} WHERE ${fieldName} = #{fieldVal}
-	</select>
-
-    <!-- 查询部门信息 作为字典数据 -->
-    <select id="queryAllDepartBackDictModel" resultType="org.jeecg.common.system.vo.DictModel">
-		select id as value,depart_name as text from sys_depart where del_flag = '0'
-	</select>
-
-    <!-- 查询部门信息 作为字典数据 -->
-    <select id="queryAllUserBackDictModel" resultType="org.jeecg.common.system.vo.DictModel">
-		select username as value,realname as text from sys_depart where del_flag = '0'
-	</select>
-
-    <!--通过查询指定table的 text code 获取字典数据,且支持关键字查询 -->
-    <select id="queryTableDictItems" parameterType="String" resultType="org.jeecg.common.system.vo.DictModel">
-		select ${text} as 'text',${code} as 'value' from ${table} where ${text} like #{keyword}
-	</select>
-
-    <!-- 根据表名、显示字段名、存储字段名、父ID查询树 -->
-    <select id="queryTreeList" parameterType="String" resultType="org.jeecg.modules.system.model.TreeSelectModel">
-        select ${text} as 'title',
-        ${code} as 'key',
-        <if test="hasChildField != null and hasChildField != ''">
-            (case ${hasChildField} when '1' then 0 else 1 end) as 'isLeaf',
-        </if>
-        ${pidField} as parentId
-        from ${table} where ${pidField} = #{pid}
-    </select>
-</mapper>

+ 0 - 37
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysLogMapper.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysLogMapper">
-
-    <!-- 清空所有日志记录 -->
-    <delete id="removeAll">
-		DELETE FROM sys_log
-	</delete>
-
-    <!-- 获取访问总数 -->
-    <select id="findTotalVisitCount" resultType="long">
-        select count(1) from sys_log where log_type = 1
-    </select>
-
-    <!-- 获取今日访问总数 -->
-    <select id="findTodayVisitCount" resultType="long">
-        select count(1) from sys_log where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
-    </select>
-
-    <!-- 获取今日访问总IP数 -->
-    <select id="findTodayIp" resultType="long">
-        select count(distinct(ip)) from sys_log where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
-    </select>
-
-    <!-- 首页访问统计 -->
-    <select id="findVisitCount" resultType="java.util.HashMap">
-        select count(*) as visit,
-        	   count(distinct(ip)) as ip,
-        	   DATE_FORMAT(create_time, '%Y-%m-%d') as tian,
-        	   DATE_FORMAT(create_time, '%m-%d') as type
-         from sys_log 
-         where log_type = 1 and create_time &gt;= #{dayStart} and create_time &lt; #{dayEnd}
-         group by tian
-         order by tian asc
-    </select>
-
-</mapper>

+ 0 - 16
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysPermissionDataRuleMapper.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysPermissionDataRuleMapper">
-
-    <!--  查询权限 TODO 这里是不是可以不关联查找 sys_role 表 -->
-    <select id="queryDataRuleIds" resultType="java.lang.String">
-		select data_rule_ids 
-			from sys_role_permission a 
-			join sys_permission b on a.permission_id = b.id
-			join sys_role c on a.role_id = c.id
-			join sys_user_role d on d.role_id = c.id
-			join sys_user e on d.user_id = e.id
-			where e.username = #{username} and b.id =  #{permissionId}
-	</select>
-
-</mapper>

+ 0 - 57
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysPermissionMapper">
-
-
-    <resultMap id="TreeModel" type="org.jeecg.modules.system.model.TreeModel">
-        <result column="id" property="key" jdbcType="VARCHAR"/>
-        <result column="name" property="title" jdbcType="VARCHAR"/>
-        <result column="icon" property="icon" jdbcType="VARCHAR"/>
-        <result column="parent_id" property="parentId" jdbcType="VARCHAR"/>
-        <result column="leaf_flag" property="isLeaf" jdbcType="INTEGER"/>
-    </resultMap>
-
-    <!-- 通过<resultMap>映射实体类属性名和表的字段名对应关系 -->
-    <resultMap id="SysPermission" type="org.jeecg.modules.system.entity.SysPermission">
-        <!-- result属性映射非匹配字段 -->
-        <result column="is_route" property="route"/>
-        <result column="keep_alive" property="keepAlive"/>
-        <result column="is_leaf" property="leaf"/>
-    </resultMap>
-
-
-    <select id="queryListByParentId" parameterType="Object" resultMap="TreeModel">
-        SELECT
-        id
-        ,parent_id
-        ,name
-        ,icon
-        ,leaf_flag
-        FROM sys_permission
-        WHERE 1=1
-        <choose>
-            <when test="parentId != null and parentId != ''">
-                AND parent_id = #{parentId,jdbcType=VARCHAR}
-            </when>
-            <otherwise>
-                AND parent_id is null
-            </otherwise>
-        </choose>
-    </select>
-
-    <!-- 获取登录用户拥有的权限 -->
-    <select id="queryByUser" parameterType="Object" resultMap="SysPermission">
-		   SELECT p.*
-		   FROM  sys_permission p
-		   WHERE exists(
-		   		select a.id from sys_role_permission a
-		   		join sys_role b on a.role_id = b.id
-		   		join sys_user_role c on c.role_id = b.id
-		   		join sys_user d on d.id = c.user_id 
-		   		where p.id = a.permission_id AND d.username = #{username,jdbcType=VARCHAR}
-		   )
-		   and p.del_flag = 0
-		   order by p.sort_no ASC
-	</select>
-
-</mapper>

+ 0 - 5
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysUserAgentMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysUserAgentMapper">
-
-</mapper>

+ 0 - 9
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysUserDepartMapper">
-    <select id="getUserDepartByUid" parameterType="String" resultType="org.jeecg.modules.system.entity.SysUserDepart">
-		SELECT *
-		FROM sys_user_depart
-		WHERE user_id = #{userId, jdbcType=VARCHAR}
-    </select>
-</mapper>

+ 0 - 42
jeecg-boot-module-system/target/classes/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.system.mapper.SysUserMapper">
-
-    <!-- 根据用户名查询 -->
-    <select id="getUserByName" resultType="org.jeecg.modules.system.entity.SysUser">
-		select * from  sys_user  where username = #{username} and del_flag = '0'
-	</select>
-
-    <!-- 根据部门Id查询 -->
-    <select id="getUserByDepId" resultType="org.jeecg.modules.system.entity.SysUser">
-
-        select * from sys_user where del_flag = '0' and id in (select user_id from sys_user_depart where
-        dep_id=#{departId})
-        <if test="username!=null and username!=''">
-            and username = #{username}
-        </if>
-    </select>
-
-    <!-- 根据角色Id查询 -->
-    <select id="getUserByRoleId" resultType="org.jeecg.modules.system.entity.SysUser">
-        select * from sys_user where del_flag = '0' and id in (select user_id from sys_user_role where
-        role_id=#{roleId})
-        <if test="username!=null and username!=''">
-            and username = #{username}
-        </if>
-    </select>
-
-    <!--  修改用户部门code -->
-    <update id="updateUserDepart">
-		UPDATE sys_user SET org_code = #{orgCode} where username = #{username}
-	</update>
-    <!-- 根据手机号查询 -->
-    <select id="getUserByPhone" resultType="org.jeecg.modules.system.entity.SysUser">
-		select * from  sys_user  where phone = #{phone} and del_flag = '0'
-	</select>
-
-    <!-- 根据邮箱查询用户信息 -->
-    <select id="getUserByEmail" resultType="org.jeecg.modules.system.entity.SysUser">
-	select * from  sys_user  where email = #{email} and del_flag = '0'
-	</select>
-</mapper>

+ 0 - 1
jeecg-boot-module-system/target/classes/static/demo1.html

@@ -1 +0,0 @@
-demo1

+ 0 - 177
jeecg-boot-module-system/target/classes/static/generic/LICENSE

@@ -1,177 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 8084
jeecg-boot-module-system/target/classes/static/generic/build/pdf.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 39710
jeecg-boot-module-system/target/classes/static/generic/build/pdf.worker.js


BIN
jeecg-boot-module-system/target/classes/static/generic/web/cmaps/78-EUC-H.bcmap


BIN
jeecg-boot-module-system/target/classes/static/generic/web/cmaps/78-EUC-V.bcmap


BIN
jeecg-boot-module-system/target/classes/static/generic/web/cmaps/78-H.bcmap


+ 0 - 0
jeecg-boot-module-system/target/classes/static/generic/web/cmaps/78-RKSJ-H.bcmap


Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä