Parcourir la source

refactor:dao层rdb实现修改

Longjun.Tu il y a 2 ans
Parent
commit
5c348d7427
100 fichiers modifiés avec 85 ajouts et 8 suppressions
  1. 3 3
      README.md
  2. 2 2
      iot-common/iot-common-dao/iot-common-model/pom.xml
  3. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/BaseEntity.java
  4. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/Id.java
  5. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/InvokeResult.java
  6. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/OauthClient.java
  7. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/Owned.java
  8. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/Paging.java
  9. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/TenantEntity.java
  10. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/UserInfo.java
  11. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/alert/AlertConfig.java
  12. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/alert/AlertRecord.java
  13. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/DeviceConfig.java
  14. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/DeviceGroup.java
  15. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/DeviceInfo.java
  16. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/VirtualDevice.java
  17. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/VirtualDeviceLog.java
  18. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/message/DeviceProperty.java
  19. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/message/ThingModelMessage.java
  20. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/notify/Channel.java
  21. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/notify/ChannelConfig.java
  22. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/notify/ChannelTemplate.java
  23. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/product/AppDesign.java
  24. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/product/Category.java
  25. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/product/Product.java
  26. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/product/ProductModel.java
  27. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/product/ThingModel.java
  28. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/protocol/ProtocolComponent.java
  29. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/protocol/ProtocolConverter.java
  30. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/rule/RuleAction.java
  31. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/rule/RuleInfo.java
  32. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/rule/RuleLog.java
  33. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/rule/TaskInfo.java
  34. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/rule/TaskLog.java
  35. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/space/Home.java
  36. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/space/Space.java
  37. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/space/SpaceDevice.java
  38. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/stats/DataItem.java
  39. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/stats/TimeData.java
  40. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysConfig.java
  41. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDept.java
  42. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictData.java
  43. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictType.java
  44. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysLogininfor.java
  45. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysMenu.java
  46. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysNotice.java
  47. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOperLog.java
  48. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOss.java
  49. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOssConfig.java
  50. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysPost.java
  51. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysRole.java
  52. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenant.java
  53. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenantPackage.java
  54. 0 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUser.java
  55. 30 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserPost.java
  56. 31 0
      iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserRole.java
  57. 3 3
      iot-common/iot-common-dao/iot-data-service/pom.xml
  58. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertConfigData.java
  59. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertRecordData.java
  60. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/ICategoryData.java
  61. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelConfigData.java
  62. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelData.java
  63. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelTemplateData.java
  64. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/ICommonData.java
  65. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceConfigData.java
  66. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceGroupData.java
  67. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceInfoData.java
  68. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IHomeData.java
  69. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IOauthClientData.java
  70. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IOwnedData.java
  71. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductData.java
  72. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductModelData.java
  73. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolComponentData.java
  74. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolConverterData.java
  75. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IRuleInfoData.java
  76. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceData.java
  77. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceDeviceData.java
  78. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/ITaskInfoData.java
  79. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IThingModelData.java
  80. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IUserInfoData.java
  81. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IVirtualDeviceData.java
  82. 16 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysConfigData.java
  83. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDeptData.java
  84. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDictData.java
  85. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDictTypeData.java
  86. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysLogininforData.java
  87. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysMenuData.java
  88. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysNoticeData.java
  89. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOperLogData.java
  90. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOssConfigData.java
  91. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOssData.java
  92. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysPostData.java
  93. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleData.java
  94. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleDeptData.java
  95. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleMenuData.java
  96. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysTenantData.java
  97. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysTenantPackageData.java
  98. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserData.java
  99. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserPostData.java
  100. 0 0
      iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserRoleData.java

+ 3 - 3
README.md

@@ -79,19 +79,19 @@ Vertx event-bus(内置)、RocketMQ,通过扩展模块可接入其它任意
 
 ##### 关系数据库切换为mysql方法(其它数据库同理)
 
-1、将iot-rdb-data-service/pom.xml中的mysql驱动注释放开
+1、将iot-data-serviceImpl-rdb/pom.xml中的mysql驱动注释放开
 
 2、启动时指定active: --spring.profiles.active=mysql
 
 ##### 时序数据库切换为TDengein方法
 
-1、注释掉iot-standalone/pom.xml中的 iot-es-temporal-service,并打开iot-td-temporal-service的注释
+1、注释掉iot-standalone/pom.xml中的 iot-temporal-serviceImpl-es,并打开iot-td-temporal-service的注释
 
 2、application.xml中注释掉elasticsearch配置,并打开td-datasource配置
 
 ##### 消息总线切换为RocketMq方法
 
-1、注释掉iot-standalone/pom.xml中的 iot-vertx-event-bus,并打开iot-message-rocketmq的注释
+1、注释掉iot-standalone/pom.xml中的 iot-message-event-bus,并打开iot-message-rocketmq的注释
 
 2、application.xml中打开rocketmq配置
 

+ 2 - 2
iot-data/iot-model/pom.xml → iot-common/iot-common-dao/iot-common-model/pom.xml

@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>iot-data</artifactId>
+        <artifactId>iot-common-dao</artifactId>
         <groupId>cc.iotkit</groupId>
         <version>${revision}</version>
     </parent>
     <version>${revision}</version>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>iot-model</artifactId>
+    <artifactId>iot-common-model</artifactId>
 
     <dependencies>
 

+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/BaseEntity.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/BaseEntity.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/Id.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/Id.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/InvokeResult.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/InvokeResult.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/OauthClient.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/OauthClient.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/Owned.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/Owned.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/Paging.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/Paging.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/TenantEntity.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/TenantEntity.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/UserInfo.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/UserInfo.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/alert/AlertConfig.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/alert/AlertConfig.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/alert/AlertRecord.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/alert/AlertRecord.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/device/DeviceConfig.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/DeviceConfig.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/device/DeviceGroup.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/DeviceGroup.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/device/DeviceInfo.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/DeviceInfo.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/device/VirtualDevice.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/VirtualDevice.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/device/VirtualDeviceLog.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/VirtualDeviceLog.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/device/message/DeviceProperty.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/message/DeviceProperty.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/device/message/ThingModelMessage.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/device/message/ThingModelMessage.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/notify/Channel.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/notify/Channel.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/notify/ChannelConfig.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/notify/ChannelConfig.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/notify/ChannelTemplate.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/notify/ChannelTemplate.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/product/AppDesign.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/product/AppDesign.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/product/Category.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/product/Category.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/product/Product.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/product/Product.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/product/ProductModel.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/product/ProductModel.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/product/ThingModel.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/product/ThingModel.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/protocol/ProtocolComponent.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/protocol/ProtocolComponent.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/protocol/ProtocolConverter.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/protocol/ProtocolConverter.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/rule/RuleAction.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/rule/RuleAction.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/rule/RuleInfo.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/rule/RuleInfo.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/rule/RuleLog.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/rule/RuleLog.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/rule/TaskInfo.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/rule/TaskInfo.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/rule/TaskLog.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/rule/TaskLog.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/space/Home.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/space/Home.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/space/Space.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/space/Space.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/space/SpaceDevice.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/space/SpaceDevice.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/stats/DataItem.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/stats/DataItem.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/stats/TimeData.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/stats/TimeData.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysConfig.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysConfig.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysDept.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDept.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysDictData.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictData.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysDictType.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysDictType.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysLogininfor.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysLogininfor.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysMenu.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysMenu.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysNotice.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysNotice.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysOperLog.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOperLog.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysOss.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOss.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysOssConfig.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysOssConfig.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysPost.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysPost.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysRole.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysRole.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysTenant.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenant.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysTenantPackage.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysTenantPackage.java


+ 0 - 0
iot-data/iot-model/src/main/java/cc/iotkit/model/system/SysUser.java → iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUser.java


+ 30 - 0
iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserPost.java

@@ -0,0 +1,30 @@
+package cc.iotkit.model.system;
+
+import cc.iotkit.model.BaseEntity;
+import cc.iotkit.model.Id;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 用户和岗位关联 sys_user_post
+ *
+ * @author Michelle.Chung
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class SysUserPost extends BaseEntity implements Id<Long>, Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 岗位ID
+     */
+    private Long postId;
+}

+ 31 - 0
iot-common/iot-common-dao/iot-common-model/src/main/java/cc/iotkit/model/system/SysUserRole.java

@@ -0,0 +1,31 @@
+package cc.iotkit.model.system;
+
+import cc.iotkit.model.BaseEntity;
+import cc.iotkit.model.Id;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 用户和角色关联 sys_user_role
+ *
+ * @author Michelle.Chung
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class SysUserRole extends BaseEntity implements Id<Long>, Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+}

+ 3 - 3
iot-data/iot-data-service/pom.xml → iot-common/iot-common-dao/iot-data-service/pom.xml

@@ -3,19 +3,19 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>iot-data</artifactId>
+        <artifactId>iot-common-dao</artifactId>
         <groupId>cc.iotkit</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
+    <version>${revision}</version>
     <artifactId>iot-data-service</artifactId>
 
     <dependencies>
 
         <dependency>
             <groupId>cc.iotkit</groupId>
-            <artifactId>iot-model</artifactId>
+            <artifactId>iot-common-model</artifactId>
         </dependency>
 
     </dependencies>

+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertConfigData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertConfigData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertRecordData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IAlertRecordData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ICategoryData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/ICategoryData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelConfigData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelConfigData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelTemplateData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IChannelTemplateData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ICommonData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/ICommonData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceConfigData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceConfigData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceGroupData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceGroupData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceInfoData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IDeviceInfoData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IHomeData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IHomeData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IOauthClientData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IOauthClientData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IOwnedData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IOwnedData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductModelData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IProductModelData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolComponentData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolComponentData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolConverterData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IProtocolConverterData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IRuleInfoData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IRuleInfoData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceDeviceData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/ISpaceDeviceData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/ITaskInfoData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/ITaskInfoData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IThingModelData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IThingModelData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IUserInfoData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IUserInfoData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/manager/IVirtualDeviceData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/manager/IVirtualDeviceData.java


+ 16 - 0
iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysConfigData.java

@@ -0,0 +1,16 @@
+package cc.iotkit.data.system;
+
+import cc.iotkit.data.manager.ICommonData;
+import cc.iotkit.model.Paging;
+import cc.iotkit.model.system.SysConfig;
+
+/**
+ * 系统配置数据接口
+ *
+ * @author sjg
+ */
+public interface ISysConfigData extends ICommonData<SysConfig, Long> {
+
+
+
+}

+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDeptData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDeptData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDictData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDictData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDictTypeData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysDictTypeData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysLogininforData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysLogininforData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysMenuData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysMenuData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysNoticeData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysNoticeData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOperLogData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOperLogData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOssConfigData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOssConfigData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOssData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysOssData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysPostData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysPostData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleDeptData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleDeptData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleMenuData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysRoleMenuData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysTenantData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysTenantData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysTenantPackageData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysTenantPackageData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserPostData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserPostData.java


+ 0 - 0
iot-data/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserRoleData.java → iot-common/iot-common-dao/iot-data-service/src/main/java/cc/iotkit/data/system/ISysUserRoleData.java


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff