dcs 1 gadu atpakaļ
vecāks
revīzija
d078ac0d7e
100 mainītis faili ar 995 papildinājumiem un 4997 dzēšanām
  1. 700 0
      log/virgo.api.log
  2. 259 0
      log/virgo.manager.log
  3. 1 1
      virgo.api/src/main/java/com/bosshand/virgo/api/Application.java
  4. 0 45
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/CollaborativeController.java
  5. 0 44
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/ConfigurationUrlController.java
  6. 0 41
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/ConstructionLogController.java
  7. 0 71
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/DesignChangeController.java
  8. 0 42
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/DrawingsMarkedController.java
  9. 0 93
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/ElementController.java
  10. 0 72
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/ElementStepController.java
  11. 0 414
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/FlowManagerController.java
  12. 0 177
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/FlowSynergyDataController.java
  13. 0 113
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/InspectController.java
  14. 0 76
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/MaterialBatchController.java
  15. 0 44
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/MaterialCheckController.java
  16. 0 51
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/NoticeController.java
  17. 0 111
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/PartItemMetaDataController.java
  18. 0 80
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/PointToPointController.java
  19. 0 73
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/ProjectController.java
  20. 0 69
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/ProjectFlowMetaDataController.java
  21. 5 95
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/ProjectItemController.java
  22. 0 69
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/RectificationController.java
  23. 0 213
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/SetUpController.java
  24. 0 41
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/SignOnBehalfControler.java
  25. 0 51
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/TypeCascadeController.java
  26. 0 80
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/WeeklyController.java
  27. 0 60
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/WeeklyPersonController.java
  28. 0 60
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/operate/OperateWeeklyCompanyController.java
  29. 0 60
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/operate/OperateWeeklyDepartmentController.java
  30. 0 60
      virgo.api/src/main/java/com/bosshand/virgo/api/controller/operate/OperateWeeklyPersonController.java
  31. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/BimModelTargetDao.java
  32. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/BimTypeDao.java
  33. 0 18
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/CollaborativeDao.java
  34. 0 17
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/ConfigurationUrlDao.java
  35. 0 15
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/ConstructionLogDao.java
  36. 0 23
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/DesignChangeDao.java
  37. 0 19
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/DrawingsMarkedDao.java
  38. 0 15
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/ElementDao.java
  39. 0 21
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/ElementStepDao.java
  40. 0 19
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/ElementStepModelDao.java
  41. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/EnvironmentDao.java
  42. 0 18
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/EnvironmentTypeDao.java
  43. 0 22
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/EquipmentDao.java
  44. 0 18
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/EquipmentTypeDao.java
  45. 0 22
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowInstanceDao.java
  46. 0 22
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowInstanceNodeDao.java
  47. 0 22
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowModelDao.java
  48. 0 17
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowModelNodeDao.java
  49. 0 46
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowSynergyDataDao.java
  50. 0 17
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowUserConfigDao.java
  51. 0 37
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowYuiDataDao.java
  52. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/IdentifyTypeDao.java
  53. 0 25
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/InspectDao.java
  54. 0 27
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/MaterialBatchDao.java
  55. 0 22
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/MaterialCategoryDao.java
  56. 0 19
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/MaterialCheckDao.java
  57. 0 14
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/NoticeDao.java
  58. 0 26
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/PointToPointDao.java
  59. 0 23
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectCityWeatherDao.java
  60. 7 15
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectDao.java
  61. 0 14
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectFlowDao.java
  62. 23 16
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectItemDao.java
  63. 0 22
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/RectificationDao.java
  64. 0 21
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/ScheduleClient.java
  65. 0 17
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/SignOnBehalfDao.java
  66. 0 23
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/TypeCascadeDao.java
  67. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/WarehouseDao.java
  68. 0 24
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/WeeklyDao.java
  69. 0 25
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/WeeklyPersonDao.java
  70. 0 17
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/WeeklySetDao.java
  71. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/WeeklyTypeDao.java
  72. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/WeeklyTypePersonDao.java
  73. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/WorkTypeDao.java
  74. 0 23
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyCompanyDao.java
  75. 0 23
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyDepartmentDao.java
  76. 0 25
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyPersonDao.java
  77. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyTypeCompanyDao.java
  78. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyTypeDepartmentDao.java
  79. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyTypePersonDao.java
  80. 0 36
      virgo.api/src/main/java/com/bosshand/virgo/api/job/JobCityWeatherQuartz.java
  81. 0 44
      virgo.api/src/main/java/com/bosshand/virgo/api/job/JobOperateCompanyQuartz.java
  82. 0 42
      virgo.api/src/main/java/com/bosshand/virgo/api/job/JobOperateDepartmentQuartz.java
  83. 0 180
      virgo.api/src/main/java/com/bosshand/virgo/api/job/JobOperatePersonQuartz.java
  84. 0 385
      virgo.api/src/main/java/com/bosshand/virgo/api/job/JobQuartz.java
  85. 0 24
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/dao/PartItemMetaDataDao.java
  86. 0 22
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/dao/PartItemMetadataFlowNodeDao.java
  87. 0 14
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/dao/PartItemMetadataGenerateJsonDao.java
  88. 0 14
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/dao/ProjectFlowApproverMetaDataDao.java
  89. 0 20
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/dao/ProjectFlowMetaDataDao.java
  90. 0 95
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/model/PartItemMetaData.java
  91. 0 55
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/model/PartItemMetadataFlowNode.java
  92. 0 55
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/model/PartItemMetadataGenerateJson.java
  93. 0 55
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/model/ProjectFlowApproverMetaData.java
  94. 0 108
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/model/ProjectFlowMetaData.java
  95. 0 297
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/service/PartItemMetaDataService.java
  96. 0 23
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/service/ProjectFlowApproverMetaDataService.java
  97. 0 33
      virgo.api/src/main/java/com/bosshand/virgo/api/metadata/service/ProjectFlowMetaDataService.java
  98. 0 35
      virgo.api/src/main/java/com/bosshand/virgo/api/model/BimModelTarget.java
  99. 0 25
      virgo.api/src/main/java/com/bosshand/virgo/api/model/BimType.java
  100. 0 0
      virgo.api/src/main/java/com/bosshand/virgo/api/model/Collaborative.java

+ 700 - 0
log/virgo.api.log

@@ -0,0 +1,700 @@
+2024-04-24 11:18:17.408  INFO 28188 --- [main] com.bosshand.virgo.api.Application       : No active profile set, falling back to default profiles: default
+2024-04-24 11:18:19.284  INFO 28188 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-04-24 11:18:19.290  INFO 28188 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2024-04-24 11:18:19.347  INFO 28188 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 26ms. Found 0 repository interfaces.
+2024-04-24 11:18:19.537  WARN 28188 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format.
+2024-04-24 11:18:19.936  INFO 28188 --- [main] o.s.cloud.context.scope.GenericScope     : BeanFactory id=16eaeb78-fc3e-3c95-be0a-a41120c2cddb
+2024-04-24 11:18:19.949  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'shiroConfig' of type [com.bosshand.virgo.core.config.ShiroConfig$$EnhancerBySpringCGLIB$$2f1b351f] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.067  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mybatis-org.mybatis.spring.boot.autoconfigure.MybatisProperties' of type [org.mybatis.spring.boot.autoconfigure.MybatisProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.089  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration' of type [org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration$$EnhancerBySpringCGLIB$$3c35dce0] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.093  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure' of type [com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure$$EnhancerBySpringCGLIB$$230d8122] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.097  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.druid-com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceProperties' of type [com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.165  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dataSource' of type [com.alibaba.druid.pool.DruidDataSource] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.667  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'sqlSessionFactory' of type [org.apache.ibatis.session.defaults.DefaultSqlSessionFactory] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.672  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'sqlSessionTemplate' of type [org.mybatis.spring.SqlSessionTemplate] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.673  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.674  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserDao' of type [com.sun.proxy.$Proxy87] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.677  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserRoleDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.678  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserRoleDao' of type [com.sun.proxy.$Proxy88] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.681  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrRoleCodeDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.681  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrRoleCodeDao' of type [com.sun.proxy.$Proxy89] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.684  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.684  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationDao' of type [com.sun.proxy.$Proxy90] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.687  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrResourceDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.687  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrResourceDao' of type [com.sun.proxy.$Proxy91] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.690  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.690  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeDao' of type [com.sun.proxy.$Proxy92] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.693  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeRoleDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.693  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeRoleDao' of type [com.sun.proxy.$Proxy93] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.696  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.696  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordDao' of type [com.sun.proxy.$Proxy94] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.699  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordHistoryDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.699  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordHistoryDao' of type [com.sun.proxy.$Proxy95] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.701  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'redisManagerConfiguration' of type [com.bosshand.virgo.core.config.RedisManagerConfiguration$$EnhancerBySpringCGLIB$$ee662dd0] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.705  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'redisManager' of type [org.crazycake.shiro.RedisManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.708  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'redisSessionDAO' of type [org.crazycake.shiro.RedisSessionDAO] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.711  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'appUserTokenDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.712  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'appUserTokenDao' of type [com.sun.proxy.$Proxy97] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.712  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserService' of type [com.bosshand.virgo.core.service.MgrUserService] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.715  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'cacheManager' of type [org.crazycake.shiro.RedisCacheManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:20.720  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'userRealm' of type [com.bosshand.virgo.core.shiro.UserRealm] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:21.056  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'securityManager' of type [org.apache.shiro.web.mgt.DefaultWebSecurityManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:21.093  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'authorizationAttributeSourceAdvisor' of type [org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:21.134  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$9618bb0] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:21.172  INFO 28188 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$257b8ead] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:18:21.517  INFO 28188 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9106 (http)
+2024-04-24 11:18:21.541  INFO 28188 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2024-04-24 11:18:21.542  INFO 28188 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.24]
+2024-04-24 11:18:21.547  INFO 28188 --- [main] o.a.catalina.core.AprLifecycleListener   : Loaded APR based Apache Tomcat Native library [1.2.35] using APR version [1.7.0].
+2024-04-24 11:18:21.548  INFO 28188 --- [main] o.a.catalina.core.AprLifecycleListener   : APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true].
+2024-04-24 11:18:21.548  INFO 28188 --- [main] o.a.catalina.core.AprLifecycleListener   : APR/OpenSSL configuration: useAprConnector [false], useOpenSSL [true]
+2024-04-24 11:18:21.561  INFO 28188 --- [main] o.a.catalina.core.AprLifecycleListener   : OpenSSL successfully initialized [OpenSSL 1.1.1q  5 Jul 2022]
+2024-04-24 11:18:21.690  INFO 28188 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2024-04-24 11:18:21.690  INFO 28188 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 4249 ms
+2024-04-24 11:18:21.842  WARN 28188 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2024-04-24 11:18:21.842  INFO 28188 --- [main] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-04-24 11:18:21.855  INFO 28188 --- [main] c.netflix.config.DynamicPropertyFactory  : DynamicPropertyFactory is initialized with configuration sources: com.netflix.config.ConcurrentCompositeConfiguration@33ec2c0c
+2024-04-24 11:18:23.691  INFO 28188 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2024-04-24 11:18:23.834  WARN 28188 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2024-04-24 11:18:23.834  INFO 28188 --- [main] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-04-24 11:18:24.029  INFO 28188 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2024-04-24 11:18:24.595  INFO 28188 --- [main] org.quartz.impl.StdSchedulerFactory      : Using default implementation for ThreadExecutor
+2024-04-24 11:18:24.607  INFO 28188 --- [main] org.quartz.core.SchedulerSignalerImpl    : Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-04-24 11:18:24.608  INFO 28188 --- [main] org.quartz.core.QuartzScheduler          : Quartz Scheduler v.2.3.1 created.
+2024-04-24 11:18:24.608  INFO 28188 --- [main] org.quartz.simpl.RAMJobStore             : RAMJobStore initialized.
+2024-04-24 11:18:24.609  INFO 28188 --- [main] org.quartz.core.QuartzScheduler          : Scheduler meta-data: Quartz Scheduler (v2.3.1) 'quartzScheduler' with instanceId 'NON_CLUSTERED'
+  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
+  NOT STARTED.
+  Currently in standby mode.
+  Number of jobs executed: 0
+  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
+  Using job-store 'org.quartz.simpl.RAMJobStore' - which does not support persistence. and is not clustered.
+
+2024-04-24 11:18:24.610  INFO 28188 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-04-24 11:18:24.610  INFO 28188 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler version: 2.3.1
+2024-04-24 11:18:24.610  INFO 28188 --- [main] org.quartz.core.QuartzScheduler          : JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@68821f6
+2024-04-24 11:18:25.323  INFO 28188 --- [main] o.s.c.n.eureka.InstanceInfoFactory       : Setting initial instance status as: STARTING
+2024-04-24 11:18:25.370  INFO 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Initializing Eureka in region us-east-1
+2024-04-24 11:18:25.488  INFO 28188 --- [main] c.n.d.provider.DiscoveryJerseyProvider   : Using JSON encoding codec LegacyJacksonJson
+2024-04-24 11:18:25.489  INFO 28188 --- [main] c.n.d.provider.DiscoveryJerseyProvider   : Using JSON decoding codec LegacyJacksonJson
+2024-04-24 11:18:25.623  INFO 28188 --- [main] c.n.d.provider.DiscoveryJerseyProvider   : Using XML encoding codec XStreamXml
+2024-04-24 11:18:25.623  INFO 28188 --- [main] c.n.d.provider.DiscoveryJerseyProvider   : Using XML decoding codec XStreamXml
+2024-04-24 11:18:26.094  INFO 28188 --- [main] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 11:18:26.316  INFO 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Disable delta property : false
+2024-04-24 11:18:26.317  INFO 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Single vip registry refresh property : null
+2024-04-24 11:18:26.317  INFO 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Force full registry fetch : false
+2024-04-24 11:18:26.317  INFO 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Application is null : false
+2024-04-24 11:18:26.317  INFO 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Registered Applications size is zero : true
+2024-04-24 11:18:26.317  INFO 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Application version is -1: true
+2024-04-24 11:18:26.317  INFO 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Getting all instance registry info from the eureka server
+2024-04-24 11:18:30.459 ERROR 28188 --- [main] c.n.d.s.t.d.RedirectingEurekaHttpClient  : Request execution error. endpoint=DefaultEndpoint{ serviceUrl='http://localhost:9101/eureka/}
+
+com.sun.jersey.api.client.ClientHandlerException: java.net.ConnectException: Connection refused: connect
+	at com.sun.jersey.client.apache4.ApacheHttpClient4Handler.handle(ApacheHttpClient4Handler.java:187) ~[jersey-apache-client4-1.19.1.jar:1.19.1]
+	at com.sun.jersey.api.client.filter.GZIPContentEncodingFilter.handle(GZIPContentEncodingFilter.java:123) ~[jersey-client-1.19.1.jar:1.19.1]
+	at com.netflix.discovery.EurekaIdentityHeaderFilter.handle(EurekaIdentityHeaderFilter.java:27) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.sun.jersey.api.client.Client.handle(Client.java:652) ~[jersey-client-1.19.1.jar:1.19.1]
+	at com.sun.jersey.api.client.WebResource.handle(WebResource.java:682) ~[jersey-client-1.19.1.jar:1.19.1]
+	at com.sun.jersey.api.client.WebResource.access$200(WebResource.java:74) ~[jersey-client-1.19.1.jar:1.19.1]
+	at com.sun.jersey.api.client.WebResource$Builder.get(WebResource.java:509) ~[jersey-client-1.19.1.jar:1.19.1]
+	at com.netflix.discovery.shared.transport.jersey.AbstractJerseyEurekaHttpClient.getApplicationsInternal(AbstractJerseyEurekaHttpClient.java:194) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.jersey.AbstractJerseyEurekaHttpClient.getApplications(AbstractJerseyEurekaHttpClient.java:165) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$6.execute(EurekaHttpClientDecorator.java:137) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.MetricsCollectingEurekaHttpClient.execute(MetricsCollectingEurekaHttpClient.java:73) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$6.execute(EurekaHttpClientDecorator.java:137) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.RedirectingEurekaHttpClient.executeOnNewServer(RedirectingEurekaHttpClient.java:118) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.RedirectingEurekaHttpClient.execute(RedirectingEurekaHttpClient.java:79) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$6.execute(EurekaHttpClientDecorator.java:137) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.RetryableEurekaHttpClient.execute(RetryableEurekaHttpClient.java:120) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$6.execute(EurekaHttpClientDecorator.java:137) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.SessionedEurekaHttpClient.execute(SessionedEurekaHttpClient.java:77) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.getAndStoreFullRegistry(DiscoveryClient.java:1069) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.fetchRegistry(DiscoveryClient.java:983) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:430) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:276) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:272) [eureka-client-1.9.13.jar:1.9.13]
+	at org.springframework.cloud.netflix.eureka.CloudEurekaClient.<init>(CloudEurekaClient.java:67) [spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration$RefreshableEurekaClientConfiguration.eurekaClient(EurekaClientAutoConfiguration.java:330) [spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration$RefreshableEurekaClientConfiguration$$EnhancerBySpringCGLIB$$2ce487cc.CGLIB$eurekaClient$2(<generated>) [spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration$RefreshableEurekaClientConfiguration$$EnhancerBySpringCGLIB$$2ce487cc$$FastClassBySpringCGLIB$$f8f19481.invoke(<generated>) [spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:244) [spring-core-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:363) [spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration$RefreshableEurekaClientConfiguration$$EnhancerBySpringCGLIB$$2ce487cc.eurekaClient(<generated>) [spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_131]
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_131]
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_131]
+	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_131]
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:154) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiate(ConstructorResolver.java:622) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:607) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1321) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1160) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:555) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:515) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$1(AbstractBeanFactory.java:356) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.cloud.context.scope.GenericScope$BeanLifecycleWrapper.getBean(GenericScope.java:389) ~[spring-cloud-context-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.context.scope.GenericScope.get(GenericScope.java:186) ~[spring-cloud-context-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:353) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.aop.target.SimpleBeanTargetSource.getTarget(SimpleBeanTargetSource.java:35) ~[spring-aop-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration.getTargetObject(EurekaRegistration.java:129) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration.getEurekaClient(EurekaRegistration.java:117) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_131]
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_131]
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_131]
+	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_131]
+	at org.springframework.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:282) ~[spring-core-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.cloud.context.scope.GenericScope$LockedScopedProxyFactoryBean.invoke(GenericScope.java:499) ~[spring-cloud-context-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) ~[spring-aop-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688) ~[spring-aop-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration$$EnhancerBySpringCGLIB$$de22af5c.getEurekaClient(<generated>) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry.maybeInitializeClient(EurekaServiceRegistry.java:57) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry.register(EurekaServiceRegistry.java:38) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaAutoServiceRegistration.start(EurekaAutoServiceRegistration.java:83) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.context.support.DefaultLifecycleProcessor.doStart(DefaultLifecycleProcessor.java:182) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.support.DefaultLifecycleProcessor.access$200(DefaultLifecycleProcessor.java:53) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.support.DefaultLifecycleProcessor$LifecycleGroup.start(DefaultLifecycleProcessor.java:360) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.support.DefaultLifecycleProcessor.startBeans(DefaultLifecycleProcessor.java:158) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.support.DefaultLifecycleProcessor.onRefresh(DefaultLifecycleProcessor.java:122) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.support.AbstractApplicationContext.finishRefresh(AbstractApplicationContext.java:893) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.finishRefresh(ServletWebServerApplicationContext.java:162) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:552) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:141) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:744) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:391) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:312) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1215) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1204) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at com.bosshand.virgo.api.Application.main(Application.java:18) ~[classes/:na]
+Caused by: java.net.ConnectException: Connection refused: connect
+	at java.net.DualStackPlainSocketImpl.waitForConnect(Native Method) ~[na:1.8.0_131]
+	at java.net.DualStackPlainSocketImpl.socketConnect(DualStackPlainSocketImpl.java:85) ~[na:1.8.0_131]
+	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_131]
+	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_131]
+	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_131]
+	at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:172) ~[na:1.8.0_131]
+	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_131]
+	at java.net.Socket.connect(Socket.java:589) ~[na:1.8.0_131]
+	at org.apache.http.conn.scheme.PlainSocketFactory.connectSocket(PlainSocketFactory.java:121) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.conn.DefaultClientConnectionOperator.openConnection(DefaultClientConnectionOperator.java:180) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.conn.AbstractPoolEntry.open(AbstractPoolEntry.java:144) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.conn.AbstractPooledConnAdapter.open(AbstractPooledConnAdapter.java:134) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.client.DefaultRequestDirector.tryConnect(DefaultRequestDirector.java:605) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.client.DefaultRequestDirector.execute(DefaultRequestDirector.java:440) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.client.AbstractHttpClient.doExecute(AbstractHttpClient.java:835) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:118) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:56) ~[httpclient-4.5.9.jar:4.5.9]
+	at com.sun.jersey.client.apache4.ApacheHttpClient4Handler.handle(ApacheHttpClient4Handler.java:173) ~[jersey-apache-client4-1.19.1.jar:1.19.1]
+	... 79 common frames omitted
+
+2024-04-24 11:18:30.460  WARN 28188 --- [main] c.n.d.s.t.d.RetryableEurekaHttpClient    : Request execution failed with message: java.net.ConnectException: Connection refused: connect
+2024-04-24 11:18:30.461 ERROR 28188 --- [main] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-API/192.168.1.3:virgo-api:9106 - was unable to refresh its cache! status = Cannot execute request on any known server
+
+com.netflix.discovery.shared.transport.TransportException: Cannot execute request on any known server
+	at com.netflix.discovery.shared.transport.decorator.RetryableEurekaHttpClient.execute(RetryableEurekaHttpClient.java:112) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$6.execute(EurekaHttpClientDecorator.java:137) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.SessionedEurekaHttpClient.execute(SessionedEurekaHttpClient.java:77) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.getApplications(EurekaHttpClientDecorator.java:134) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.getAndStoreFullRegistry(DiscoveryClient.java:1069) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.fetchRegistry(DiscoveryClient.java:983) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:430) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:276) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.<init>(DiscoveryClient.java:272) [eureka-client-1.9.13.jar:1.9.13]
+	at org.springframework.cloud.netflix.eureka.CloudEurekaClient.<init>(CloudEurekaClient.java:67) [spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration$RefreshableEurekaClientConfiguration.eurekaClient(EurekaClientAutoConfiguration.java:330) [spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration$RefreshableEurekaClientConfiguration$$EnhancerBySpringCGLIB$$2ce487cc.CGLIB$eurekaClient$2(<generated>) [spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration$RefreshableEurekaClientConfiguration$$EnhancerBySpringCGLIB$$2ce487cc$$FastClassBySpringCGLIB$$f8f19481.invoke(<generated>) [spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cglib.proxy.MethodProxy.invokeSuper(MethodProxy.java:244) [spring-core-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.annotation.ConfigurationClassEnhancer$BeanMethodInterceptor.intercept(ConfigurationClassEnhancer.java:363) [spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration$RefreshableEurekaClientConfiguration$$EnhancerBySpringCGLIB$$2ce487cc.eurekaClient(<generated>) [spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_131]
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_131]
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_131]
+	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_131]
+	at org.springframework.beans.factory.support.SimpleInstantiationStrategy.instantiate(SimpleInstantiationStrategy.java:154) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiate(ConstructorResolver.java:622) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.ConstructorResolver.instantiateUsingFactoryMethod(ConstructorResolver.java:607) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.instantiateUsingFactoryMethod(AbstractAutowireCapableBeanFactory.java:1321) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBeanInstance(AbstractAutowireCapableBeanFactory.java:1160) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:555) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:515) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$1(AbstractBeanFactory.java:356) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.cloud.context.scope.GenericScope$BeanLifecycleWrapper.getBean(GenericScope.java:389) ~[spring-cloud-context-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.context.scope.GenericScope.get(GenericScope.java:186) ~[spring-cloud-context-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:353) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:199) [spring-beans-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.aop.target.SimpleBeanTargetSource.getTarget(SimpleBeanTargetSource.java:35) ~[spring-aop-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration.getTargetObject(EurekaRegistration.java:129) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration.getEurekaClient(EurekaRegistration.java:117) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) ~[na:1.8.0_131]
+	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) ~[na:1.8.0_131]
+	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) ~[na:1.8.0_131]
+	at java.lang.reflect.Method.invoke(Method.java:498) ~[na:1.8.0_131]
+	at org.springframework.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:282) ~[spring-core-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.cloud.context.scope.GenericScope$LockedScopedProxyFactoryBean.invoke(GenericScope.java:499) ~[spring-cloud-context-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:186) ~[spring-aop-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:688) ~[spring-aop-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration$$EnhancerBySpringCGLIB$$de22af5c.getEurekaClient(<generated>) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry.maybeInitializeClient(EurekaServiceRegistry.java:57) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry.register(EurekaServiceRegistry.java:38) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.cloud.netflix.eureka.serviceregistry.EurekaAutoServiceRegistration.start(EurekaAutoServiceRegistration.java:83) ~[spring-cloud-netflix-eureka-client-2.1.3.RELEASE.jar:2.1.3.RELEASE]
+	at org.springframework.context.support.DefaultLifecycleProcessor.doStart(DefaultLifecycleProcessor.java:182) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.support.DefaultLifecycleProcessor.access$200(DefaultLifecycleProcessor.java:53) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.support.DefaultLifecycleProcessor$LifecycleGroup.start(DefaultLifecycleProcessor.java:360) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.support.DefaultLifecycleProcessor.startBeans(DefaultLifecycleProcessor.java:158) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.support.DefaultLifecycleProcessor.onRefresh(DefaultLifecycleProcessor.java:122) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.context.support.AbstractApplicationContext.finishRefresh(AbstractApplicationContext.java:893) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.finishRefresh(ServletWebServerApplicationContext.java:162) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:552) ~[spring-context-5.1.9.RELEASE.jar:5.1.9.RELEASE]
+	at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:141) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:744) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:391) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:312) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1215) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at org.springframework.boot.SpringApplication.run(SpringApplication.java:1204) ~[spring-boot-2.1.8.RELEASE.jar:2.1.8.RELEASE]
+	at com.bosshand.virgo.api.Application.main(Application.java:18) ~[classes/:na]
+
+2024-04-24 11:18:30.462  WARN 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Using default backup registry implementation which does not do anything.
+2024-04-24 11:18:30.463  INFO 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Starting heartbeat executor: renew interval is: 30
+2024-04-24 11:18:30.465  INFO 28188 --- [main] c.n.discovery.InstanceInfoReplicator     : InstanceInfoReplicator onDemand update allowed rate per min is 4
+2024-04-24 11:18:30.468  INFO 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Discovery Client initialized at timestamp 1713928710466 with initial instances count: 0
+2024-04-24 11:18:30.473  INFO 28188 --- [main] o.s.c.n.e.s.EurekaServiceRegistry        : Registering application VIRGO-API with eureka with status UP
+2024-04-24 11:18:30.474  INFO 28188 --- [main] com.netflix.discovery.DiscoveryClient    : Saw local status change event StatusChangeEvent [timestamp=1713928710474, current=UP, previous=STARTING]
+2024-04-24 11:18:30.475  INFO 28188 --- [main] o.s.s.quartz.SchedulerFactoryBean        : Starting Quartz Scheduler now
+2024-04-24 11:18:30.475  INFO 28188 --- [main] org.quartz.core.QuartzScheduler          : Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-04-24 11:18:30.476  INFO 28188 --- [DiscoveryClient-InstanceInfoReplicator-0] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-API/192.168.1.3:virgo-api:9106: registering service...
+2024-04-24 11:18:30.489  INFO 28188 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2024-04-24 11:18:30.503  INFO 28188 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2024-04-24 11:18:30.513  INFO 28188 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2024-04-24 11:18:30.637  INFO 28188 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_1
+2024-04-24 11:18:30.638  INFO 28188 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_2
+2024-04-24 11:18:30.639  INFO 28188 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_3
+2024-04-24 11:18:30.649  INFO 28188 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getProjectUsingGET_1
+2024-04-24 11:18:30.751  INFO 28188 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9106 (http) with context path ''
+2024-04-24 11:18:30.752  INFO 28188 --- [main] .s.c.n.e.s.EurekaAutoServiceRegistration : Updating port to 9106
+2024-04-24 11:18:31.228  INFO 28188 --- [main] com.bosshand.virgo.api.Application       : Started Application in 16.862 seconds (JVM running for 18.757)
+2024-04-24 11:18:31.687  INFO 28188 --- [RMI TCP Connection(3)-192.168.1.3] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-04-24 11:18:31.687  INFO 28188 --- [RMI TCP Connection(3)-192.168.1.3] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2024-04-24 11:18:31.698  INFO 28188 --- [RMI TCP Connection(3)-192.168.1.3] o.s.web.servlet.DispatcherServlet        : Completed initialization in 10 ms
+2024-04-24 11:18:32.040  INFO 28188 --- [RMI TCP Connection(5)-192.168.1.3] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} inited
+2024-04-24 11:18:32.987  INFO 28188 --- [parallel-1] io.lettuce.core.EpollProvider            : Starting without optional epoll library
+2024-04-24 11:18:32.988  INFO 28188 --- [parallel-1] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
+2024-04-24 11:18:33.460  WARN 28188 --- [parallel-1] o.s.b.a.r.RedisReactiveHealthIndicator   : Redis health check failed
+
+org.springframework.data.redis.RedisConnectionFailureException: Unable to connect to Redis; nested exception is io.lettuce.core.RedisConnectionException: Unable to connect to git.bosshand.com:6666:6666
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory$SharedConnection.getNativeConnection(LettuceConnectionFactory.java:1106) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory$SharedConnection.getConnection(LettuceConnectionFactory.java:1085) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory.getSharedReactiveConnection(LettuceConnectionFactory.java:876) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory.getReactiveConnection(LettuceConnectionFactory.java:377) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory.getReactiveConnection(LettuceConnectionFactory.java:91) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at reactor.core.publisher.MonoSupplier.call(MonoSupplier.java:85) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at reactor.core.publisher.FluxSubscribeOnCallable$CallableSubscribeOnSubscription.run(FluxSubscribeOnCallable.java:225) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at reactor.core.scheduler.SchedulerTask.call(SchedulerTask.java:50) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at reactor.core.scheduler.SchedulerTask.call(SchedulerTask.java:27) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:180) ~[na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293) ~[na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) ~[na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) ~[na:1.8.0_131]
+	at java.lang.Thread.run(Thread.java:748) ~[na:1.8.0_131]
+Caused by: io.lettuce.core.RedisConnectionException: Unable to connect to git.bosshand.com:6666:6666
+	at io.lettuce.core.RedisConnectionException.create(RedisConnectionException.java:78) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at io.lettuce.core.RedisConnectionException.create(RedisConnectionException.java:56) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at io.lettuce.core.AbstractRedisClient.getConnection(AbstractRedisClient.java:235) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at io.lettuce.core.RedisClient.connect(RedisClient.java:204) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at org.springframework.data.redis.connection.lettuce.StandaloneConnectionProvider.lambda$getConnection$1(StandaloneConnectionProvider.java:113) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at java.util.Optional.orElseGet(Optional.java:267) ~[na:1.8.0_131]
+	at org.springframework.data.redis.connection.lettuce.StandaloneConnectionProvider.getConnection(StandaloneConnectionProvider.java:113) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory$SharedConnection.getNativeConnection(LettuceConnectionFactory.java:1104) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	... 14 common frames omitted
+Caused by: java.net.UnknownHostException: git.bosshand.com:6666
+	at java.net.Inet6AddressImpl.lookupAllHostAddr(Native Method) ~[na:1.8.0_131]
+	at java.net.InetAddress$2.lookupAllHostAddr(InetAddress.java:928) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAddressesFromNameService(InetAddress.java:1323) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAllByName0(InetAddress.java:1276) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAllByName(InetAddress.java:1192) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAllByName(InetAddress.java:1126) ~[na:1.8.0_131]
+	at java.net.InetAddress.getByName(InetAddress.java:1076) ~[na:1.8.0_131]
+	at io.netty.util.internal.SocketUtils$8.run(SocketUtils.java:146) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.internal.SocketUtils$8.run(SocketUtils.java:143) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at java.security.AccessController.doPrivileged(Native Method) ~[na:1.8.0_131]
+	at io.netty.util.internal.SocketUtils.addressByName(SocketUtils.java:143) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.DefaultNameResolver.doResolve(DefaultNameResolver.java:43) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.SimpleNameResolver.resolve(SimpleNameResolver.java:63) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.SimpleNameResolver.resolve(SimpleNameResolver.java:55) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.InetSocketAddressResolver.doResolve(InetSocketAddressResolver.java:57) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.InetSocketAddressResolver.doResolve(InetSocketAddressResolver.java:32) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.AbstractAddressResolver.resolve(AbstractAddressResolver.java:108) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap.doResolveAndConnect0(Bootstrap.java:204) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap.access$000(Bootstrap.java:50) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap$1.operationComplete(Bootstrap.java:184) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap$1.operationComplete(Bootstrap.java:170) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.notifyListener0(DefaultPromise.java:500) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.notifyListenersNow(DefaultPromise.java:474) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.notifyListeners(DefaultPromise.java:413) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.setValue0(DefaultPromise.java:538) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.setSuccess0(DefaultPromise.java:527) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.trySuccess(DefaultPromise.java:98) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.DefaultChannelPromise.trySuccess(DefaultChannelPromise.java:84) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe.safeSetSuccess(AbstractChannel.java:982) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe.register0(AbstractChannel.java:505) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe.access$200(AbstractChannel.java:416) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe$1.run(AbstractChannel.java:475) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java:163) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:416) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:515) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.SingleThreadEventExecutor$5.run(SingleThreadEventExecutor.java:918) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	... 1 common frames omitted
+
+2024-04-24 11:18:34.548 ERROR 28188 --- [DiscoveryClient-InstanceInfoReplicator-0] c.n.d.s.t.d.RedirectingEurekaHttpClient  : Request execution error. endpoint=DefaultEndpoint{ serviceUrl='http://localhost:9101/eureka/}
+
+com.sun.jersey.api.client.ClientHandlerException: java.net.ConnectException: Connection refused: connect
+	at com.sun.jersey.client.apache4.ApacheHttpClient4Handler.handle(ApacheHttpClient4Handler.java:187) ~[jersey-apache-client4-1.19.1.jar:1.19.1]
+	at com.sun.jersey.api.client.filter.GZIPContentEncodingFilter.handle(GZIPContentEncodingFilter.java:123) ~[jersey-client-1.19.1.jar:1.19.1]
+	at com.netflix.discovery.EurekaIdentityHeaderFilter.handle(EurekaIdentityHeaderFilter.java:27) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.sun.jersey.api.client.Client.handle(Client.java:652) ~[jersey-client-1.19.1.jar:1.19.1]
+	at com.sun.jersey.api.client.WebResource.handle(WebResource.java:682) ~[jersey-client-1.19.1.jar:1.19.1]
+	at com.sun.jersey.api.client.WebResource.access$200(WebResource.java:74) ~[jersey-client-1.19.1.jar:1.19.1]
+	at com.sun.jersey.api.client.WebResource$Builder.post(WebResource.java:570) ~[jersey-client-1.19.1.jar:1.19.1]
+	at com.netflix.discovery.shared.transport.jersey.AbstractJerseyEurekaHttpClient.register(AbstractJerseyEurekaHttpClient.java:56) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$1.execute(EurekaHttpClientDecorator.java:59) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.MetricsCollectingEurekaHttpClient.execute(MetricsCollectingEurekaHttpClient.java:73) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.register(EurekaHttpClientDecorator.java:56) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$1.execute(EurekaHttpClientDecorator.java:59) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.RedirectingEurekaHttpClient.executeOnNewServer(RedirectingEurekaHttpClient.java:118) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.RedirectingEurekaHttpClient.execute(RedirectingEurekaHttpClient.java:79) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.register(EurekaHttpClientDecorator.java:56) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$1.execute(EurekaHttpClientDecorator.java:59) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.RetryableEurekaHttpClient.execute(RetryableEurekaHttpClient.java:120) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.register(EurekaHttpClientDecorator.java:56) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$1.execute(EurekaHttpClientDecorator.java:59) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.SessionedEurekaHttpClient.execute(SessionedEurekaHttpClient.java:77) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.register(EurekaHttpClientDecorator.java:56) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.register(DiscoveryClient.java:847) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.InstanceInfoReplicator.run(InstanceInfoReplicator.java:121) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.InstanceInfoReplicator$1.run(InstanceInfoReplicator.java:101) [eureka-client-1.9.13.jar:1.9.13]
+	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) [na:1.8.0_131]
+	at java.util.concurrent.FutureTask.run(FutureTask.java:266) [na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:180) [na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293) [na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) [na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) [na:1.8.0_131]
+	at java.lang.Thread.run(Thread.java:748) [na:1.8.0_131]
+Caused by: java.net.ConnectException: Connection refused: connect
+	at java.net.DualStackPlainSocketImpl.waitForConnect(Native Method) ~[na:1.8.0_131]
+	at java.net.DualStackPlainSocketImpl.socketConnect(DualStackPlainSocketImpl.java:85) ~[na:1.8.0_131]
+	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[na:1.8.0_131]
+	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[na:1.8.0_131]
+	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[na:1.8.0_131]
+	at java.net.PlainSocketImpl.connect(PlainSocketImpl.java:172) ~[na:1.8.0_131]
+	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[na:1.8.0_131]
+	at java.net.Socket.connect(Socket.java:589) ~[na:1.8.0_131]
+	at org.apache.http.conn.scheme.PlainSocketFactory.connectSocket(PlainSocketFactory.java:121) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.conn.DefaultClientConnectionOperator.openConnection(DefaultClientConnectionOperator.java:180) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.conn.AbstractPoolEntry.open(AbstractPoolEntry.java:144) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.conn.AbstractPooledConnAdapter.open(AbstractPooledConnAdapter.java:134) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.client.DefaultRequestDirector.tryConnect(DefaultRequestDirector.java:605) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.client.DefaultRequestDirector.execute(DefaultRequestDirector.java:440) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.client.AbstractHttpClient.doExecute(AbstractHttpClient.java:835) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:118) ~[httpclient-4.5.9.jar:4.5.9]
+	at org.apache.http.impl.client.CloseableHttpClient.execute(CloseableHttpClient.java:56) ~[httpclient-4.5.9.jar:4.5.9]
+	at com.sun.jersey.client.apache4.ApacheHttpClient4Handler.handle(ApacheHttpClient4Handler.java:173) ~[jersey-apache-client4-1.19.1.jar:1.19.1]
+	... 30 common frames omitted
+
+2024-04-24 11:18:34.549  WARN 28188 --- [DiscoveryClient-InstanceInfoReplicator-0] c.n.d.s.t.d.RetryableEurekaHttpClient    : Request execution failed with message: java.net.ConnectException: Connection refused: connect
+2024-04-24 11:18:34.549  WARN 28188 --- [DiscoveryClient-InstanceInfoReplicator-0] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-API/192.168.1.3:virgo-api:9106 - registration failed Cannot execute request on any known server
+
+com.netflix.discovery.shared.transport.TransportException: Cannot execute request on any known server
+	at com.netflix.discovery.shared.transport.decorator.RetryableEurekaHttpClient.execute(RetryableEurekaHttpClient.java:112) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.register(EurekaHttpClientDecorator.java:56) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$1.execute(EurekaHttpClientDecorator.java:59) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.SessionedEurekaHttpClient.execute(SessionedEurekaHttpClient.java:77) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.register(EurekaHttpClientDecorator.java:56) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.register(DiscoveryClient.java:847) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.InstanceInfoReplicator.run(InstanceInfoReplicator.java:121) [eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.InstanceInfoReplicator$1.run(InstanceInfoReplicator.java:101) [eureka-client-1.9.13.jar:1.9.13]
+	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) [na:1.8.0_131]
+	at java.util.concurrent.FutureTask.run(FutureTask.java:266) [na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:180) [na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293) [na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) [na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) [na:1.8.0_131]
+	at java.lang.Thread.run(Thread.java:748) [na:1.8.0_131]
+
+2024-04-24 11:18:34.550  WARN 28188 --- [DiscoveryClient-InstanceInfoReplicator-0] c.n.discovery.InstanceInfoReplicator     : There was a problem with the instance info replicator
+
+com.netflix.discovery.shared.transport.TransportException: Cannot execute request on any known server
+	at com.netflix.discovery.shared.transport.decorator.RetryableEurekaHttpClient.execute(RetryableEurekaHttpClient.java:112) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.register(EurekaHttpClientDecorator.java:56) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator$1.execute(EurekaHttpClientDecorator.java:59) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.SessionedEurekaHttpClient.execute(SessionedEurekaHttpClient.java:77) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.shared.transport.decorator.EurekaHttpClientDecorator.register(EurekaHttpClientDecorator.java:56) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.DiscoveryClient.register(DiscoveryClient.java:847) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.InstanceInfoReplicator.run(InstanceInfoReplicator.java:121) ~[eureka-client-1.9.13.jar:1.9.13]
+	at com.netflix.discovery.InstanceInfoReplicator$1.run(InstanceInfoReplicator.java:101) [eureka-client-1.9.13.jar:1.9.13]
+	at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) [na:1.8.0_131]
+	at java.util.concurrent.FutureTask.run(FutureTask.java:266) [na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:180) [na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293) [na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) [na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) [na:1.8.0_131]
+	at java.lang.Thread.run(Thread.java:748) [na:1.8.0_131]
+
+2024-04-24 11:19:00.465  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Disable delta property : false
+2024-04-24 11:19:00.466  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Single vip registry refresh property : null
+2024-04-24 11:19:00.466  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Force full registry fetch : false
+2024-04-24 11:19:00.466  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Application is null : false
+2024-04-24 11:19:00.467  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Registered Applications size is zero : true
+2024-04-24 11:19:00.467  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Application version is -1: true
+2024-04-24 11:19:00.467  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Getting all instance registry info from the eureka server
+2024-04-24 11:19:00.712  INFO 28188 --- [DiscoveryClient-HeartbeatExecutor-0] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-API/192.168.1.3:virgo-api:9106 - Re-registering apps/VIRGO-API
+2024-04-24 11:19:00.712  INFO 28188 --- [DiscoveryClient-HeartbeatExecutor-0] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-API/192.168.1.3:virgo-api:9106: registering service...
+2024-04-24 11:19:00.735  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : The response status is 200
+2024-04-24 11:19:00.827  INFO 28188 --- [DiscoveryClient-HeartbeatExecutor-0] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-API/192.168.1.3:virgo-api:9106 - registration status: 204
+2024-04-24 11:19:30.743  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Disable delta property : false
+2024-04-24 11:19:30.744  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Single vip registry refresh property : null
+2024-04-24 11:19:30.745  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Force full registry fetch : false
+2024-04-24 11:19:30.745  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Application is null : false
+2024-04-24 11:19:30.745  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Registered Applications size is zero : true
+2024-04-24 11:19:30.745  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Application version is -1: false
+2024-04-24 11:19:30.746  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Getting all instance registry info from the eureka server
+2024-04-24 11:19:30.792  INFO 28188 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : The response status is 200
+2024-04-24 11:23:26.323  INFO 28188 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 11:28:26.327  INFO 28188 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 11:33:26.342  INFO 28188 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 11:38:26.358  INFO 28188 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 11:43:26.368  INFO 28188 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 11:48:26.373  INFO 28188 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 11:53:26.384  INFO 28188 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 11:55:31.507  INFO 28188 --- [Thread-38] o.s.c.n.e.s.EurekaServiceRegistry        : Unregistering application VIRGO-API with eureka with status DOWN
+2024-04-24 11:55:31.507  WARN 28188 --- [Thread-38] com.netflix.discovery.DiscoveryClient    : Saw local status change event StatusChangeEvent [timestamp=1713930931507, current=DOWN, previous=UP]
+2024-04-24 11:55:31.508  INFO 28188 --- [DiscoveryClient-InstanceInfoReplicator-0] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-API/192.168.1.3:virgo-api:9106: registering service...
+2024-04-24 11:55:31.513  INFO 28188 --- [Thread-38] org.quartz.core.QuartzScheduler          : Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-04-24 11:55:31.520  INFO 28188 --- [Thread-38] o.s.s.quartz.SchedulerFactoryBean        : Shutting down Quartz Scheduler
+2024-04-24 11:55:31.520  INFO 28188 --- [Thread-38] org.quartz.core.QuartzScheduler          : Scheduler quartzScheduler_$_NON_CLUSTERED shutting down.
+2024-04-24 11:55:31.520  INFO 28188 --- [Thread-38] org.quartz.core.QuartzScheduler          : Scheduler quartzScheduler_$_NON_CLUSTERED paused.
+2024-04-24 11:55:31.521  INFO 28188 --- [Thread-38] org.quartz.core.QuartzScheduler          : Scheduler quartzScheduler_$_NON_CLUSTERED shutdown complete.
+2024-04-24 11:55:31.521  INFO 28188 --- [DiscoveryClient-InstanceInfoReplicator-0] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-API/192.168.1.3:virgo-api:9106 - registration status: 204
+2024-04-24 11:55:31.523  INFO 28188 --- [Thread-38] o.s.s.concurrent.ThreadPoolTaskExecutor  : Shutting down ExecutorService 'applicationTaskExecutor'
+2024-04-24 11:55:32.676  INFO 28188 --- [Thread-38] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} closed
+2024-04-24 11:55:32.677  INFO 28188 --- [Thread-38] com.netflix.discovery.DiscoveryClient    : Shutting down DiscoveryClient ...
+2024-04-24 11:55:35.678  INFO 28188 --- [Thread-38] com.netflix.discovery.DiscoveryClient    : Unregistering ...
+2024-04-24 11:55:35.680  WARN 28188 --- [DiscoveryClient-0] c.netflix.discovery.TimedSupervisorTask  : task supervisor shutting down, can't accept the task
+2024-04-24 11:55:35.695  INFO 28188 --- [Thread-38] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-API/192.168.1.3:virgo-api:9106 - deregister  status: 200
+2024-04-24 11:55:35.705  INFO 28188 --- [Thread-38] com.netflix.discovery.DiscoveryClient    : Completed shut down of DiscoveryClient
+2024-04-24 11:56:31.099  INFO 26532 --- [main] com.bosshand.virgo.api.Application       : No active profile set, falling back to default profiles: default
+2024-04-24 11:56:32.275  INFO 26532 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-04-24 11:56:32.281  INFO 26532 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2024-04-24 11:56:32.334  INFO 26532 --- [main] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 25ms. Found 0 repository interfaces.
+2024-04-24 11:56:32.489  WARN 26532 --- [main] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format.
+2024-04-24 11:56:32.809  INFO 26532 --- [main] o.s.cloud.context.scope.GenericScope     : BeanFactory id=16eaeb78-fc3e-3c95-be0a-a41120c2cddb
+2024-04-24 11:56:32.822  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'shiroConfig' of type [com.bosshand.virgo.core.config.ShiroConfig$$EnhancerBySpringCGLIB$$5ea2dc6f] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:32.929  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mybatis-org.mybatis.spring.boot.autoconfigure.MybatisProperties' of type [org.mybatis.spring.boot.autoconfigure.MybatisProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:32.954  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration' of type [org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration$$EnhancerBySpringCGLIB$$6bbd8430] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:32.959  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure' of type [com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure$$EnhancerBySpringCGLIB$$52952872] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:32.964  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'spring.datasource.druid-com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceProperties' of type [com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.016  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'dataSource' of type [com.alibaba.druid.pool.DruidDataSource] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.599  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'sqlSessionFactory' of type [org.apache.ibatis.session.defaults.DefaultSqlSessionFactory] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.606  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'sqlSessionTemplate' of type [org.mybatis.spring.SqlSessionTemplate] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.607  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.609  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserDao' of type [com.sun.proxy.$Proxy87] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.616  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserRoleDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.617  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserRoleDao' of type [com.sun.proxy.$Proxy88] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.622  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrRoleCodeDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.623  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrRoleCodeDao' of type [com.sun.proxy.$Proxy89] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.629  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.630  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationDao' of type [com.sun.proxy.$Proxy90] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.635  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrResourceDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.636  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrResourceDao' of type [com.sun.proxy.$Proxy91] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.641  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.642  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeDao' of type [com.sun.proxy.$Proxy92] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.648  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeRoleDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.649  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeRoleDao' of type [com.sun.proxy.$Proxy93] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.654  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.655  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordDao' of type [com.sun.proxy.$Proxy94] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.660  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordHistoryDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.661  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordHistoryDao' of type [com.sun.proxy.$Proxy95] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.666  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'redisManagerConfiguration' of type [com.bosshand.virgo.core.config.RedisManagerConfiguration$$EnhancerBySpringCGLIB$$1dedd520] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.673  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'redisManager' of type [org.crazycake.shiro.RedisManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.679  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'redisSessionDAO' of type [org.crazycake.shiro.RedisSessionDAO] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.685  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'appUserTokenDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.686  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'appUserTokenDao' of type [com.sun.proxy.$Proxy97] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.687  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserService' of type [com.bosshand.virgo.core.service.MgrUserService] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.692  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'cacheManager' of type [org.crazycake.shiro.RedisCacheManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:33.703  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'userRealm' of type [com.bosshand.virgo.core.shiro.UserRealm] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:34.255  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'securityManager' of type [org.apache.shiro.web.mgt.DefaultWebSecurityManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:34.305  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'authorizationAttributeSourceAdvisor' of type [org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:34.370  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$38e93300] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:34.422  INFO 26532 --- [main] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$550335fd] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:34.889  INFO 26532 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9106 (http)
+2024-04-24 11:56:34.926  INFO 26532 --- [main] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2024-04-24 11:56:34.926  INFO 26532 --- [main] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.24]
+2024-04-24 11:56:34.936  INFO 26532 --- [main] o.a.catalina.core.AprLifecycleListener   : Loaded APR based Apache Tomcat Native library [1.2.35] using APR version [1.7.0].
+2024-04-24 11:56:34.937  INFO 26532 --- [main] o.a.catalina.core.AprLifecycleListener   : APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true].
+2024-04-24 11:56:34.937  INFO 26532 --- [main] o.a.catalina.core.AprLifecycleListener   : APR/OpenSSL configuration: useAprConnector [false], useOpenSSL [true]
+2024-04-24 11:56:34.942  INFO 26532 --- [main] o.a.catalina.core.AprLifecycleListener   : OpenSSL successfully initialized [OpenSSL 1.1.1q  5 Jul 2022]
+2024-04-24 11:56:35.164  INFO 26532 --- [main] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2024-04-24 11:56:35.164  INFO 26532 --- [main] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 4047 ms
+2024-04-24 11:56:35.427  WARN 26532 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2024-04-24 11:56:35.427  INFO 26532 --- [main] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-04-24 11:56:35.441  INFO 26532 --- [main] c.netflix.config.DynamicPropertyFactory  : DynamicPropertyFactory is initialized with configuration sources: com.netflix.config.ConcurrentCompositeConfiguration@443a06ad
+2024-04-24 11:56:37.909  INFO 26532 --- [main] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2024-04-24 11:56:38.166  WARN 26532 --- [main] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2024-04-24 11:56:38.166  INFO 26532 --- [main] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-04-24 11:56:38.528  INFO 26532 --- [main] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2024-04-24 11:56:39.277  INFO 26532 --- [main] org.quartz.impl.StdSchedulerFactory      : Using default implementation for ThreadExecutor
+2024-04-24 11:56:39.286  INFO 26532 --- [main] org.quartz.core.SchedulerSignalerImpl    : Initialized Scheduler Signaller of type: class org.quartz.core.SchedulerSignalerImpl
+2024-04-24 11:56:39.287  INFO 26532 --- [main] org.quartz.core.QuartzScheduler          : Quartz Scheduler v.2.3.1 created.
+2024-04-24 11:56:39.287  INFO 26532 --- [main] org.quartz.simpl.RAMJobStore             : RAMJobStore initialized.
+2024-04-24 11:56:39.288  INFO 26532 --- [main] org.quartz.core.QuartzScheduler          : Scheduler meta-data: Quartz Scheduler (v2.3.1) 'quartzScheduler' with instanceId 'NON_CLUSTERED'
+  Scheduler class: 'org.quartz.core.QuartzScheduler' - running locally.
+  NOT STARTED.
+  Currently in standby mode.
+  Number of jobs executed: 0
+  Using thread pool 'org.quartz.simpl.SimpleThreadPool' - with 10 threads.
+  Using job-store 'org.quartz.simpl.RAMJobStore' - which does not support persistence. and is not clustered.
+
+2024-04-24 11:56:39.288  INFO 26532 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler 'quartzScheduler' initialized from an externally provided properties instance.
+2024-04-24 11:56:39.288  INFO 26532 --- [main] org.quartz.impl.StdSchedulerFactory      : Quartz scheduler version: 2.3.1
+2024-04-24 11:56:39.288  INFO 26532 --- [main] org.quartz.core.QuartzScheduler          : JobFactory set to: org.springframework.scheduling.quartz.SpringBeanJobFactory@6e090aaa
+2024-04-24 11:56:40.023  INFO 26532 --- [main] o.s.c.n.eureka.InstanceInfoFactory       : Setting initial instance status as: STARTING
+2024-04-24 11:56:40.057  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : Initializing Eureka in region us-east-1
+2024-04-24 11:56:40.151  INFO 26532 --- [main] c.n.d.provider.DiscoveryJerseyProvider   : Using JSON encoding codec LegacyJacksonJson
+2024-04-24 11:56:40.152  INFO 26532 --- [main] c.n.d.provider.DiscoveryJerseyProvider   : Using JSON decoding codec LegacyJacksonJson
+2024-04-24 11:56:40.247  INFO 26532 --- [main] c.n.d.provider.DiscoveryJerseyProvider   : Using XML encoding codec XStreamXml
+2024-04-24 11:56:40.248  INFO 26532 --- [main] c.n.d.provider.DiscoveryJerseyProvider   : Using XML decoding codec XStreamXml
+2024-04-24 11:56:40.702  INFO 26532 --- [main] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 11:56:40.918  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : Disable delta property : false
+2024-04-24 11:56:40.919  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : Single vip registry refresh property : null
+2024-04-24 11:56:40.919  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : Force full registry fetch : false
+2024-04-24 11:56:40.919  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : Application is null : false
+2024-04-24 11:56:40.919  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : Registered Applications size is zero : true
+2024-04-24 11:56:40.919  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : Application version is -1: true
+2024-04-24 11:56:40.919  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : Getting all instance registry info from the eureka server
+2024-04-24 11:56:41.061  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : The response status is 200
+2024-04-24 11:56:41.063  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : Starting heartbeat executor: renew interval is: 30
+2024-04-24 11:56:41.066  INFO 26532 --- [main] c.n.discovery.InstanceInfoReplicator     : InstanceInfoReplicator onDemand update allowed rate per min is 4
+2024-04-24 11:56:41.069  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : Discovery Client initialized at timestamp 1713931001068 with initial instances count: 1
+2024-04-24 11:56:41.075  INFO 26532 --- [main] o.s.c.n.e.s.EurekaServiceRegistry        : Registering application VIRGO-API with eureka with status UP
+2024-04-24 11:56:41.076  INFO 26532 --- [main] com.netflix.discovery.DiscoveryClient    : Saw local status change event StatusChangeEvent [timestamp=1713931001076, current=UP, previous=STARTING]
+2024-04-24 11:56:41.078  INFO 26532 --- [main] o.s.s.quartz.SchedulerFactoryBean        : Starting Quartz Scheduler now
+2024-04-24 11:56:41.078  INFO 26532 --- [main] org.quartz.core.QuartzScheduler          : Scheduler quartzScheduler_$_NON_CLUSTERED started.
+2024-04-24 11:56:41.079  INFO 26532 --- [DiscoveryClient-InstanceInfoReplicator-0] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-API/192.168.1.3:virgo-api:9106: registering service...
+2024-04-24 11:56:41.097  INFO 26532 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2024-04-24 11:56:41.114  INFO 26532 --- [main] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2024-04-24 11:56:41.129  INFO 26532 --- [main] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2024-04-24 11:56:41.137  INFO 26532 --- [DiscoveryClient-InstanceInfoReplicator-0] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-API/192.168.1.3:virgo-api:9106 - registration status: 204
+2024-04-24 11:56:41.258  INFO 26532 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_1
+2024-04-24 11:56:41.259  INFO 26532 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_2
+2024-04-24 11:56:41.260  INFO 26532 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_3
+2024-04-24 11:56:41.272  INFO 26532 --- [main] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getProjectUsingGET_1
+2024-04-24 11:56:41.389  INFO 26532 --- [main] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9106 (http) with context path ''
+2024-04-24 11:56:41.390  INFO 26532 --- [main] .s.c.n.e.s.EurekaAutoServiceRegistration : Updating port to 9106
+2024-04-24 11:56:42.021  INFO 26532 --- [main] com.bosshand.virgo.api.Application       : Started Application in 13.401 seconds (JVM running for 15.071)
+2024-04-24 11:56:42.312  INFO 26532 --- [RMI TCP Connection(1)-192.168.1.3] com.alibaba.druid.pool.DruidDataSource   : {dataSource-1} inited
+2024-04-24 11:56:43.094  INFO 26532 --- [RMI TCP Connection(3)-192.168.1.3] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-04-24 11:56:43.095  INFO 26532 --- [RMI TCP Connection(3)-192.168.1.3] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2024-04-24 11:56:43.112  INFO 26532 --- [RMI TCP Connection(3)-192.168.1.3] o.s.web.servlet.DispatcherServlet        : Completed initialization in 17 ms
+2024-04-24 11:56:43.191  INFO 26532 --- [parallel-1] io.lettuce.core.EpollProvider            : Starting without optional epoll library
+2024-04-24 11:56:43.194  INFO 26532 --- [parallel-1] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
+2024-04-24 11:56:44.220  WARN 26532 --- [parallel-1] o.s.b.a.r.RedisReactiveHealthIndicator   : Redis health check failed
+
+org.springframework.data.redis.RedisConnectionFailureException: Unable to connect to Redis; nested exception is io.lettuce.core.RedisConnectionException: Unable to connect to git.bosshand.com:6666:6666
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory$SharedConnection.getNativeConnection(LettuceConnectionFactory.java:1106) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory$SharedConnection.getConnection(LettuceConnectionFactory.java:1085) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory.getSharedReactiveConnection(LettuceConnectionFactory.java:876) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory.getReactiveConnection(LettuceConnectionFactory.java:377) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory.getReactiveConnection(LettuceConnectionFactory.java:91) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at reactor.core.publisher.MonoSupplier.call(MonoSupplier.java:85) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at reactor.core.publisher.FluxSubscribeOnCallable$CallableSubscribeOnSubscription.run(FluxSubscribeOnCallable.java:225) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at reactor.core.scheduler.SchedulerTask.call(SchedulerTask.java:50) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at reactor.core.scheduler.SchedulerTask.call(SchedulerTask.java:27) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:180) ~[na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293) ~[na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) ~[na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) ~[na:1.8.0_131]
+	at java.lang.Thread.run(Thread.java:748) ~[na:1.8.0_131]
+Caused by: io.lettuce.core.RedisConnectionException: Unable to connect to git.bosshand.com:6666:6666
+	at io.lettuce.core.RedisConnectionException.create(RedisConnectionException.java:78) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at io.lettuce.core.RedisConnectionException.create(RedisConnectionException.java:56) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at io.lettuce.core.AbstractRedisClient.getConnection(AbstractRedisClient.java:235) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at io.lettuce.core.RedisClient.connect(RedisClient.java:204) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at org.springframework.data.redis.connection.lettuce.StandaloneConnectionProvider.lambda$getConnection$1(StandaloneConnectionProvider.java:113) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at java.util.Optional.orElseGet(Optional.java:267) ~[na:1.8.0_131]
+	at org.springframework.data.redis.connection.lettuce.StandaloneConnectionProvider.getConnection(StandaloneConnectionProvider.java:113) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory$SharedConnection.getNativeConnection(LettuceConnectionFactory.java:1104) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	... 14 common frames omitted
+Caused by: java.net.UnknownHostException: git.bosshand.com:6666
+	at java.net.Inet6AddressImpl.lookupAllHostAddr(Native Method) ~[na:1.8.0_131]
+	at java.net.InetAddress$2.lookupAllHostAddr(InetAddress.java:928) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAddressesFromNameService(InetAddress.java:1323) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAllByName0(InetAddress.java:1276) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAllByName(InetAddress.java:1192) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAllByName(InetAddress.java:1126) ~[na:1.8.0_131]
+	at java.net.InetAddress.getByName(InetAddress.java:1076) ~[na:1.8.0_131]
+	at io.netty.util.internal.SocketUtils$8.run(SocketUtils.java:146) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.internal.SocketUtils$8.run(SocketUtils.java:143) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at java.security.AccessController.doPrivileged(Native Method) ~[na:1.8.0_131]
+	at io.netty.util.internal.SocketUtils.addressByName(SocketUtils.java:143) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.DefaultNameResolver.doResolve(DefaultNameResolver.java:43) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.SimpleNameResolver.resolve(SimpleNameResolver.java:63) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.SimpleNameResolver.resolve(SimpleNameResolver.java:55) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.InetSocketAddressResolver.doResolve(InetSocketAddressResolver.java:57) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.InetSocketAddressResolver.doResolve(InetSocketAddressResolver.java:32) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.AbstractAddressResolver.resolve(AbstractAddressResolver.java:108) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap.doResolveAndConnect0(Bootstrap.java:204) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap.access$000(Bootstrap.java:50) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap$1.operationComplete(Bootstrap.java:184) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap$1.operationComplete(Bootstrap.java:170) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.notifyListener0(DefaultPromise.java:500) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.notifyListenersNow(DefaultPromise.java:474) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.notifyListeners(DefaultPromise.java:413) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.setValue0(DefaultPromise.java:538) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.setSuccess0(DefaultPromise.java:527) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.trySuccess(DefaultPromise.java:98) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.DefaultChannelPromise.trySuccess(DefaultChannelPromise.java:84) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe.safeSetSuccess(AbstractChannel.java:982) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe.register0(AbstractChannel.java:505) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe.access$200(AbstractChannel.java:416) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe$1.run(AbstractChannel.java:475) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java:163) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:416) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:515) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.SingleThreadEventExecutor$5.run(SingleThreadEventExecutor.java:918) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	... 1 common frames omitted
+
+2024-04-24 11:58:01.027  INFO 26532 --- [http-nio-9106-exec-2] a.s.s.m.AbstractValidatingSessionManager : Enabling session validation scheduler...
+2024-04-24 11:58:24.742 DEBUG 26532 --- [http-nio-9106-exec-6] c.b.v.a.d.ProjectItemDao.getDoneStatus   : ==>  Preparing: SELECT * FROM project_item where status=1 
+2024-04-24 11:58:24.780 DEBUG 26532 --- [http-nio-9106-exec-6] c.b.v.a.d.ProjectItemDao.getDoneStatus   : ==> Parameters: 
+2024-04-24 11:58:24.825 DEBUG 26532 --- [http-nio-9106-exec-6] c.b.v.a.d.ProjectItemDao.getDoneStatus   : <==      Total: 0
+2024-04-24 12:01:40.925  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:06:40.938  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:11:40.944  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:16:40.948  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:21:40.954  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:26:40.967  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:31:40.973  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:36:40.980  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:41:40.986  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:46:40.997  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:51:41.009  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:56:41.020  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:58:01.033  INFO 26532 --- [SessionValidationThread-1] a.s.s.m.AbstractValidatingSessionManager : Validating all active sessions...
+2024-04-24 12:58:01.302 ERROR 26532 --- [SessionValidationThread-1] org.crazycake.shiro.RedisSessionDAO      : get active sessions error.
+2024-04-24 12:58:01.302  INFO 26532 --- [SessionValidationThread-1] a.s.s.m.AbstractValidatingSessionManager : Finished session validation.  No sessions were stopped.
+2024-04-24 13:01:41.036  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 13:06:41.041  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 13:11:41.054  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 13:16:41.058  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 13:21:41.071  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 13:26:41.073  INFO 26532 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration

+ 259 - 0
log/virgo.manager.log

@@ -0,0 +1,259 @@
+2024-04-24 11:56:09.750  INFO 29244 --- [restartedMain] com.bosshand.virgo.Application           : No active profile set, falling back to default profiles: default
+2024-04-24 11:56:12.040  INFO 29244 --- [restartedMain] .s.d.r.c.RepositoryConfigurationDelegate : Multiple Spring Data modules found, entering strict repository configuration mode!
+2024-04-24 11:56:12.042  INFO 29244 --- [restartedMain] .s.d.r.c.RepositoryConfigurationDelegate : Bootstrapping Spring Data repositories in DEFAULT mode.
+2024-04-24 11:56:12.098  INFO 29244 --- [restartedMain] .s.d.r.c.RepositoryConfigurationDelegate : Finished Spring Data repository scanning in 45ms. Found 0 repository interfaces.
+2024-04-24 11:56:12.215  WARN 29244 --- [restartedMain] o.s.boot.actuate.endpoint.EndpointId     : Endpoint ID 'service-registry' contains invalid characters, please migrate to a valid format.
+2024-04-24 11:56:12.451  INFO 29244 --- [restartedMain] o.s.cloud.context.scope.GenericScope     : BeanFactory id=6235cbf7-69d6-305a-8e3e-7bb37f89513f
+2024-04-24 11:56:12.460  WARN 29244 --- [restartedMain] o.s.b.c.p.PropertySourcesDeducer         : Multiple PropertySourcesPlaceholderConfigurer beans registered [propertySourcesPlaceholderConfigurer, swaggerProperties], falling back to Environment
+2024-04-24 11:56:12.461  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'com.bosshand.virgo.core.config.ShiroConfig' of type [com.bosshand.virgo.core.config.ShiroConfig$$EnhancerBySpringCGLIB$$1842f5a0] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.527  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mybatis-org.mybatis.spring.boot.autoconfigure.MybatisProperties' of type [org.mybatis.spring.boot.autoconfigure.MybatisProperties] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.539  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration' of type [org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration$$EnhancerBySpringCGLIB$$255d9d61] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.545  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'druidConfiguration' of type [com.bosshand.virgo.config.DruidConfiguration$$EnhancerBySpringCGLIB$$be7792ca] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.598  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'dataSource' of type [com.alibaba.druid.pool.DruidDataSource] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.928  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'sqlSessionFactory' of type [org.apache.ibatis.session.defaults.DefaultSqlSessionFactory] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.934  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'sqlSessionTemplate' of type [org.mybatis.spring.SqlSessionTemplate] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.934  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.936  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserDao' of type [com.sun.proxy.$Proxy89] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.941  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserRoleDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.941  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserRoleDao' of type [com.sun.proxy.$Proxy90] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.945  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrRoleCodeDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.945  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrRoleCodeDao' of type [com.sun.proxy.$Proxy91] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.949  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.949  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationDao' of type [com.sun.proxy.$Proxy92] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.953  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrResourceDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.953  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrResourceDao' of type [com.sun.proxy.$Proxy93] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.957  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.958  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeDao' of type [com.sun.proxy.$Proxy94] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.961  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeRoleDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.962  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrOrganizationTypeRoleDao' of type [com.sun.proxy.$Proxy95] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.965  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.966  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordDao' of type [com.sun.proxy.$Proxy96] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.969  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordHistoryDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.969  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'operationRecordHistoryDao' of type [com.sun.proxy.$Proxy97] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.972  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'com.bosshand.virgo.core.config.RedisManagerConfiguration' of type [com.bosshand.virgo.core.config.RedisManagerConfiguration$$EnhancerBySpringCGLIB$$d78dee51] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.977  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'redisManager' of type [org.crazycake.shiro.RedisManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.981  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'redisSessionDAO' of type [org.crazycake.shiro.RedisSessionDAO] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.984  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'appUserTokenDao' of type [org.mybatis.spring.mapper.MapperFactoryBean] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.986  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'appUserTokenDao' of type [com.sun.proxy.$Proxy98] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.986  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'mgrUserService' of type [com.bosshand.virgo.core.service.MgrUserService] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:12.991  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'cacheManager' of type [org.crazycake.shiro.RedisCacheManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:13.001  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'userRealm' of type [com.bosshand.virgo.core.shiro.UserRealm] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:13.336  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'securityManager' of type [org.apache.shiro.web.mgt.DefaultWebSecurityManager] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:13.367  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'authorizationAttributeSourceAdvisor' of type [org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:13.406  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration' of type [org.springframework.transaction.annotation.ProxyTransactionManagementConfiguration$$EnhancerBySpringCGLIB$$f2894c31] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:13.433  INFO 29244 --- [restartedMain] trationDelegate$BeanPostProcessorChecker : Bean 'org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration' of type [org.springframework.cloud.autoconfigure.ConfigurationPropertiesRebinderAutoConfiguration$$EnhancerBySpringCGLIB$$ea34f2e] is not eligible for getting processed by all BeanPostProcessors (for example: not eligible for auto-proxying)
+2024-04-24 11:56:13.857  INFO 29244 --- [restartedMain] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat initialized with port(s): 9103 (http)
+2024-04-24 11:56:13.876  INFO 29244 --- [restartedMain] o.apache.catalina.core.StandardService   : Starting service [Tomcat]
+2024-04-24 11:56:13.876  INFO 29244 --- [restartedMain] org.apache.catalina.core.StandardEngine  : Starting Servlet engine: [Apache Tomcat/9.0.24]
+2024-04-24 11:56:13.881  INFO 29244 --- [restartedMain] o.a.catalina.core.AprLifecycleListener   : Loaded APR based Apache Tomcat Native library [1.2.35] using APR version [1.7.0].
+2024-04-24 11:56:13.882  INFO 29244 --- [restartedMain] o.a.catalina.core.AprLifecycleListener   : APR capabilities: IPv6 [true], sendfile [true], accept filters [false], random [true].
+2024-04-24 11:56:13.882  INFO 29244 --- [restartedMain] o.a.catalina.core.AprLifecycleListener   : APR/OpenSSL configuration: useAprConnector [false], useOpenSSL [true]
+2024-04-24 11:56:13.885  INFO 29244 --- [restartedMain] o.a.catalina.core.AprLifecycleListener   : OpenSSL successfully initialized [OpenSSL 1.1.1q  5 Jul 2022]
+2024-04-24 11:56:14.019  INFO 29244 --- [restartedMain] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2024-04-24 11:56:14.019  INFO 29244 --- [restartedMain] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 4243 ms
+2024-04-24 11:56:14.156  WARN 29244 --- [restartedMain] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2024-04-24 11:56:14.157  INFO 29244 --- [restartedMain] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-04-24 11:56:14.167  INFO 29244 --- [restartedMain] c.netflix.config.DynamicPropertyFactory  : DynamicPropertyFactory is initialized with configuration sources: com.netflix.config.ConcurrentCompositeConfiguration@479a5b3b
+2024-04-24 11:56:15.650  INFO 29244 --- [restartedMain] o.s.b.a.e.web.EndpointLinksResolver      : Exposing 2 endpoint(s) beneath base path '/actuator'
+2024-04-24 11:56:15.849  INFO 29244 --- [restartedMain] o.s.b.d.a.OptionalLiveReloadServer       : LiveReload server is running on port 35729
+2024-04-24 11:56:15.857  INFO 29244 --- [restartedMain] d.s.w.p.DocumentationPluginsBootstrapper : Context refreshed
+2024-04-24 11:56:15.892  INFO 29244 --- [restartedMain] d.s.w.p.DocumentationPluginsBootstrapper : Found 1 custom documentation plugin(s)
+2024-04-24 11:56:15.908  INFO 29244 --- [restartedMain] s.d.s.w.s.ApiListingReferenceScanner     : Scanning for api listing references
+2024-04-24 11:56:15.949  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.response.Response) -> ModelContext{type=com.bosshand.virgo.core.response.Response, isReturnType=true}. java.lang.NullPointerException
+2024-04-24 11:56:15.959  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.response.Response) -> ModelContext{type=com.bosshand.virgo.core.response.Response, isReturnType=true}. java.lang.NullPointerException
+2024-04-24 11:56:16.051  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.alibaba.fastjson.JSONObject) -> ModelContext{type=com.alibaba.fastjson.JSONObject, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.054  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrUser) -> ModelContext{type=com.bosshand.virgo.core.model.MgrUser, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.054  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrUser) -> ModelContext{type=com.bosshand.virgo.core.model.MgrUser, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.058  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrUserRole) -> ModelContext{type=com.bosshand.virgo.core.model.MgrUserRole, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.059  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrUserRole) -> ModelContext{type=com.bosshand.virgo.core.model.MgrUserRole, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.079  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(org.springframework.web.servlet.ModelAndView) -> ModelContext{type=org.springframework.web.servlet.ModelAndView, isReturnType=true}. java.lang.NullPointerException
+2024-04-24 11:56:16.079  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(org.springframework.web.servlet.ModelAndView) -> ModelContext{type=org.springframework.web.servlet.ModelAndView, isReturnType=true}. java.lang.NullPointerException
+2024-04-24 11:56:16.087  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.message.model.CompleteData) -> ModelContext{type=com.bosshand.virgo.message.model.CompleteData, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.088  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.message.model.CompleteData) -> ModelContext{type=com.bosshand.virgo.message.model.CompleteData, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.098  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrDepartment) -> ModelContext{type=com.bosshand.virgo.core.model.MgrDepartment, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.099  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrDepartment) -> ModelContext{type=com.bosshand.virgo.core.model.MgrDepartment, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.119  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getByUserIdUsingGET_1
+2024-04-24 11:56:16.122  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.message.model.NotificationMessage) -> ModelContext{type=com.bosshand.virgo.message.model.NotificationMessage, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.122  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.message.model.NotificationMessage) -> ModelContext{type=com.bosshand.virgo.message.model.NotificationMessage, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.125  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.message.model.OperateNotificationMessage) -> ModelContext{type=com.bosshand.virgo.message.model.OperateNotificationMessage, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.126  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.message.model.OperateNotificationMessage) -> ModelContext{type=com.bosshand.virgo.message.model.OperateNotificationMessage, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.130  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: pushMesssageUsingPOST_1
+2024-04-24 11:56:16.132  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: updateViewedUsingPUT_1
+2024-04-24 11:56:16.132  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(java.util.Map<java.lang.String,java.lang.String>) -> ModelContext{type=java.util.Map<java.lang.String,java.lang.String>, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.134  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_1
+2024-04-24 11:56:16.135  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_2
+2024-04-24 11:56:16.136  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: handleUsingGET_3
+2024-04-24 11:56:16.149  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrOrganization) -> ModelContext{type=com.bosshand.virgo.core.model.MgrOrganization, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.150  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrOrganization) -> ModelContext{type=com.bosshand.virgo.core.model.MgrOrganization, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.157  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrOrganizationType) -> ModelContext{type=com.bosshand.virgo.core.model.MgrOrganizationType, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.158  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrOrganizationType) -> ModelContext{type=com.bosshand.virgo.core.model.MgrOrganizationType, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.163  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getUserListUsingPOST_1
+2024-04-24 11:56:16.164  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrOrganizationTypeRole) -> ModelContext{type=com.bosshand.virgo.core.model.MgrOrganizationTypeRole, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.164  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrOrganizationTypeRole) -> ModelContext{type=com.bosshand.virgo.core.model.MgrOrganizationTypeRole, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.168  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getCodeUsingGET_1
+2024-04-24 11:56:16.179  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrResource) -> ModelContext{type=com.bosshand.virgo.core.model.MgrResource, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.179  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrResource) -> ModelContext{type=com.bosshand.virgo.core.model.MgrResource, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.182  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: deleteRoleCodeUsingGET_1
+2024-04-24 11:56:16.183  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getRoleCodeByorganizationTypeIdUsingGET_1
+2024-04-24 11:56:16.185  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: getUserListUsingPOST_2
+2024-04-24 11:56:16.186  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrRoleCode) -> ModelContext{type=com.bosshand.virgo.core.model.MgrRoleCode, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.186  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.MgrRoleCode) -> ModelContext{type=com.bosshand.virgo.core.model.MgrRoleCode, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.187  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: insertRoleCodeUsingPOST_1
+2024-04-24 11:56:16.189  INFO 29244 --- [restartedMain] .d.s.w.r.o.CachingOperationNameGenerator : Generating unique operation named: updateRoleCodeUsingPUT_1
+2024-04-24 11:56:16.197  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.OperationRecordHistory) -> ModelContext{type=com.bosshand.virgo.core.model.OperationRecordHistory, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.197  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.OperationRecordHistory) -> ModelContext{type=com.bosshand.virgo.core.model.OperationRecordHistory, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.211  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.Attendance) -> ModelContext{type=com.bosshand.virgo.core.model.Attendance, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.211  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.core.model.Attendance) -> ModelContext{type=com.bosshand.virgo.core.model.Attendance, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.215  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.message.model.Base64Image) -> ModelContext{type=com.bosshand.virgo.message.model.Base64Image, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.215  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.message.model.Base64Image) -> ModelContext{type=com.bosshand.virgo.message.model.Base64Image, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.217  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.model.VerificationQr) -> ModelContext{type=com.bosshand.virgo.model.VerificationQr, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.217  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.model.VerificationQr) -> ModelContext{type=com.bosshand.virgo.model.VerificationQr, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.221  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.message.model.YuiVerifyFace) -> ModelContext{type=com.bosshand.virgo.message.model.YuiVerifyFace, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.221  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(com.bosshand.virgo.message.model.YuiVerifyFace) -> ModelContext{type=com.bosshand.virgo.message.model.YuiVerifyFace, isReturnType=false}. java.lang.NullPointerException
+2024-04-24 11:56:16.224  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(org.springframework.boot.actuate.endpoint.web.Link) -> ModelContext{type=org.springframework.boot.actuate.endpoint.web.Link, isReturnType=true}. java.lang.NullPointerException
+2024-04-24 11:56:16.224  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(java.util.Map<java.lang.String,org.springframework.boot.actuate.endpoint.web.Link>) -> ModelContext{type=java.util.Map<java.lang.String,org.springframework.boot.actuate.endpoint.web.Link>, isReturnType=true}. java.lang.NullPointerException
+2024-04-24 11:56:16.224  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(java.util.Map<java.lang.String,java.util.Map<java.lang.String,org.springframework.boot.actuate.endpoint.web.Link>>) -> ModelContext{type=java.util.Map<java.lang.String,java.util.Map<java.lang.String,org.springframework.boot.actuate.endpoint.web.Link>>, isReturnType=true}. java.lang.NullPointerException
+2024-04-24 11:56:16.224  WARN 29244 --- [restartedMain] s.d.s.p.CachingModelPropertiesProvider   : Exception calculating properties for model(org.springframework.boot.actuate.endpoint.web.Link) -> ModelContext{type=org.springframework.boot.actuate.endpoint.web.Link, isReturnType=true}. java.lang.NullPointerException
+2024-04-24 11:56:16.509  WARN 29244 --- [restartedMain] c.n.c.sources.URLConfigurationSource     : No URLs will be polled as dynamic configuration sources.
+2024-04-24 11:56:16.511  INFO 29244 --- [restartedMain] c.n.c.sources.URLConfigurationSource     : To enable URLs as dynamic configuration sources, define System property archaius.configurationSource.additionalUrls or make config.properties available on classpath.
+2024-04-24 11:56:16.693  INFO 29244 --- [restartedMain] o.s.s.concurrent.ThreadPoolTaskExecutor  : Initializing ExecutorService 'applicationTaskExecutor'
+2024-04-24 11:56:16.737  INFO 29244 --- [restartedMain] o.s.b.a.w.s.WelcomePageHandlerMapping    : Adding welcome page: class path resource [static/index.html]
+2024-04-24 11:56:18.131  INFO 29244 --- [restartedMain] o.s.c.n.eureka.InstanceInfoFactory       : Setting initial instance status as: STARTING
+2024-04-24 11:56:18.182  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : Initializing Eureka in region us-east-1
+2024-04-24 11:56:18.329  INFO 29244 --- [restartedMain] c.n.d.provider.DiscoveryJerseyProvider   : Using JSON encoding codec LegacyJacksonJson
+2024-04-24 11:56:18.329  INFO 29244 --- [restartedMain] c.n.d.provider.DiscoveryJerseyProvider   : Using JSON decoding codec LegacyJacksonJson
+2024-04-24 11:56:18.776  INFO 29244 --- [restartedMain] c.n.d.provider.DiscoveryJerseyProvider   : Using XML encoding codec XStreamXml
+2024-04-24 11:56:18.776  INFO 29244 --- [restartedMain] c.n.d.provider.DiscoveryJerseyProvider   : Using XML decoding codec XStreamXml
+2024-04-24 11:56:19.066  INFO 29244 --- [restartedMain] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 11:56:19.400  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : Disable delta property : false
+2024-04-24 11:56:19.401  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : Single vip registry refresh property : null
+2024-04-24 11:56:19.402  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : Force full registry fetch : false
+2024-04-24 11:56:19.402  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : Application is null : false
+2024-04-24 11:56:19.402  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : Registered Applications size is zero : true
+2024-04-24 11:56:19.402  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : Application version is -1: true
+2024-04-24 11:56:19.402  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : Getting all instance registry info from the eureka server
+2024-04-24 11:56:19.562  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : The response status is 200
+2024-04-24 11:56:19.565  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : Starting heartbeat executor: renew interval is: 30
+2024-04-24 11:56:19.568  INFO 29244 --- [restartedMain] c.n.discovery.InstanceInfoReplicator     : InstanceInfoReplicator onDemand update allowed rate per min is 4
+2024-04-24 11:56:19.571  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : Discovery Client initialized at timestamp 1713930979570 with initial instances count: 0
+2024-04-24 11:56:19.580  INFO 29244 --- [restartedMain] o.s.c.n.e.s.EurekaServiceRegistry        : Registering application VIRGO-MANAGER with eureka with status UP
+2024-04-24 11:56:19.581  INFO 29244 --- [restartedMain] com.netflix.discovery.DiscoveryClient    : Saw local status change event StatusChangeEvent [timestamp=1713930979581, current=UP, previous=STARTING]
+2024-04-24 11:56:19.584  INFO 29244 --- [DiscoveryClient-InstanceInfoReplicator-0] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-MANAGER/192.168.1.3:virgo-manager:9103: registering service...
+2024-04-24 11:56:19.649  INFO 29244 --- [restartedMain] o.s.b.w.embedded.tomcat.TomcatWebServer  : Tomcat started on port(s): 9103 (http) with context path ''
+2024-04-24 11:56:19.650  INFO 29244 --- [restartedMain] .s.c.n.e.s.EurekaAutoServiceRegistration : Updating port to 9103
+2024-04-24 11:56:19.673  INFO 29244 --- [DiscoveryClient-InstanceInfoReplicator-0] com.netflix.discovery.DiscoveryClient    : DiscoveryClient_VIRGO-MANAGER/192.168.1.3:virgo-manager:9103 - registration status: 204
+2024-04-24 11:56:20.178  INFO 29244 --- [restartedMain] com.bosshand.virgo.Application           : Started Application in 13.035 seconds (JVM running for 14.892)
+2024-04-24 11:56:20.758  INFO 29244 --- [RMI TCP Connection(3)-192.168.1.3] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring DispatcherServlet 'dispatcherServlet'
+2024-04-24 11:56:20.758  INFO 29244 --- [RMI TCP Connection(3)-192.168.1.3] o.s.web.servlet.DispatcherServlet        : Initializing Servlet 'dispatcherServlet'
+2024-04-24 11:56:20.770  INFO 29244 --- [RMI TCP Connection(3)-192.168.1.3] o.s.web.servlet.DispatcherServlet        : Completed initialization in 11 ms
+2024-04-24 11:56:23.469  INFO 29244 --- [parallel-1] io.lettuce.core.EpollProvider            : Starting without optional epoll library
+2024-04-24 11:56:23.469  INFO 29244 --- [parallel-1] io.lettuce.core.KqueueProvider           : Starting without optional kqueue library
+2024-04-24 11:56:23.971  WARN 29244 --- [parallel-1] o.s.b.a.r.RedisReactiveHealthIndicator   : Redis health check failed
+
+org.springframework.data.redis.RedisConnectionFailureException: Unable to connect to Redis; nested exception is io.lettuce.core.RedisConnectionException: Unable to connect to git.bosshand.com:6666:6666
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory$SharedConnection.getNativeConnection(LettuceConnectionFactory.java:1106) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory$SharedConnection.getConnection(LettuceConnectionFactory.java:1085) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory.getSharedReactiveConnection(LettuceConnectionFactory.java:876) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory.getReactiveConnection(LettuceConnectionFactory.java:377) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory.getReactiveConnection(LettuceConnectionFactory.java:91) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at reactor.core.publisher.MonoSupplier.call(MonoSupplier.java:85) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at reactor.core.publisher.MonoCallableOnAssembly.call(MonoCallableOnAssembly.java:90) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at reactor.core.publisher.FluxSubscribeOnCallable$CallableSubscribeOnSubscription.run(FluxSubscribeOnCallable.java:225) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at reactor.core.scheduler.SchedulerTask.call(SchedulerTask.java:50) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at reactor.core.scheduler.SchedulerTask.call(SchedulerTask.java:27) ~[reactor-core-3.2.12.RELEASE.jar:3.2.12.RELEASE]
+	at java.util.concurrent.FutureTask.run(FutureTask.java:266) ~[na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.access$201(ScheduledThreadPoolExecutor.java:180) ~[na:1.8.0_131]
+	at java.util.concurrent.ScheduledThreadPoolExecutor$ScheduledFutureTask.run(ScheduledThreadPoolExecutor.java:293) ~[na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) ~[na:1.8.0_131]
+	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) ~[na:1.8.0_131]
+	at java.lang.Thread.run(Thread.java:748) ~[na:1.8.0_131]
+	Suppressed: reactor.core.publisher.FluxOnAssembly$OnAssemblyException: 
+Assembly trace from producer [reactor.core.publisher.MonoSubscribeOnCallable] :
+	reactor.core.publisher.Mono.subscribeOn(Mono.java:3948)
+	org.springframework.boot.actuate.redis.RedisReactiveHealthIndicator.getConnection(RedisReactiveHealthIndicator.java:59)
+Error has been observed by the following operator(s):
+	|_	Mono.subscribeOn ⇢ org.springframework.boot.actuate.redis.RedisReactiveHealthIndicator.getConnection(RedisReactiveHealthIndicator.java:59)
+	|_	Mono.flatMap ⇢ org.springframework.boot.actuate.redis.RedisReactiveHealthIndicator.doHealthCheck(RedisReactiveHealthIndicator.java:49)
+
+Caused by: io.lettuce.core.RedisConnectionException: Unable to connect to git.bosshand.com:6666:6666
+	at io.lettuce.core.RedisConnectionException.create(RedisConnectionException.java:78) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at io.lettuce.core.RedisConnectionException.create(RedisConnectionException.java:56) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at io.lettuce.core.AbstractRedisClient.getConnection(AbstractRedisClient.java:235) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at io.lettuce.core.RedisClient.connect(RedisClient.java:204) ~[lettuce-core-5.1.8.RELEASE.jar:na]
+	at org.springframework.data.redis.connection.lettuce.StandaloneConnectionProvider.lambda$getConnection$1(StandaloneConnectionProvider.java:113) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at java.util.Optional.orElseGet(Optional.java:267) ~[na:1.8.0_131]
+	at org.springframework.data.redis.connection.lettuce.StandaloneConnectionProvider.getConnection(StandaloneConnectionProvider.java:113) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	at org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory$SharedConnection.getNativeConnection(LettuceConnectionFactory.java:1104) ~[spring-data-redis-2.1.10.RELEASE.jar:2.1.10.RELEASE]
+	... 15 common frames omitted
+Caused by: java.net.UnknownHostException: git.bosshand.com:6666
+	at java.net.Inet6AddressImpl.lookupAllHostAddr(Native Method) ~[na:1.8.0_131]
+	at java.net.InetAddress$2.lookupAllHostAddr(InetAddress.java:928) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAddressesFromNameService(InetAddress.java:1323) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAllByName0(InetAddress.java:1276) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAllByName(InetAddress.java:1192) ~[na:1.8.0_131]
+	at java.net.InetAddress.getAllByName(InetAddress.java:1126) ~[na:1.8.0_131]
+	at java.net.InetAddress.getByName(InetAddress.java:1076) ~[na:1.8.0_131]
+	at io.netty.util.internal.SocketUtils$8.run(SocketUtils.java:146) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.internal.SocketUtils$8.run(SocketUtils.java:143) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at java.security.AccessController.doPrivileged(Native Method) ~[na:1.8.0_131]
+	at io.netty.util.internal.SocketUtils.addressByName(SocketUtils.java:143) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.DefaultNameResolver.doResolve(DefaultNameResolver.java:43) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.SimpleNameResolver.resolve(SimpleNameResolver.java:63) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.SimpleNameResolver.resolve(SimpleNameResolver.java:55) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.InetSocketAddressResolver.doResolve(InetSocketAddressResolver.java:57) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.InetSocketAddressResolver.doResolve(InetSocketAddressResolver.java:32) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.resolver.AbstractAddressResolver.resolve(AbstractAddressResolver.java:108) ~[netty-resolver-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap.doResolveAndConnect0(Bootstrap.java:204) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap.access$000(Bootstrap.java:50) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap$1.operationComplete(Bootstrap.java:184) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.bootstrap.Bootstrap$1.operationComplete(Bootstrap.java:170) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.notifyListener0(DefaultPromise.java:500) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.notifyListenersNow(DefaultPromise.java:474) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.notifyListeners(DefaultPromise.java:413) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.setValue0(DefaultPromise.java:538) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.setSuccess0(DefaultPromise.java:527) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.DefaultPromise.trySuccess(DefaultPromise.java:98) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.DefaultChannelPromise.trySuccess(DefaultChannelPromise.java:84) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe.safeSetSuccess(AbstractChannel.java:982) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe.register0(AbstractChannel.java:505) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe.access$200(AbstractChannel.java:416) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.AbstractChannel$AbstractUnsafe$1.run(AbstractChannel.java:475) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java:163) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:416) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:515) ~[netty-transport-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.SingleThreadEventExecutor$5.run(SingleThreadEventExecutor.java:918) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) ~[netty-common-4.1.39.Final.jar:4.1.39.Final]
+	... 1 common frames omitted
+
+2024-04-24 11:56:44.684  INFO 29244 --- [http-nio-9103-exec-1] a.s.s.m.AbstractValidatingSessionManager : Enabling session validation scheduler...
+2024-04-24 11:56:49.580  INFO 29244 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Disable delta property : false
+2024-04-24 11:56:49.581  INFO 29244 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Single vip registry refresh property : null
+2024-04-24 11:56:49.581  INFO 29244 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Force full registry fetch : false
+2024-04-24 11:56:49.581  INFO 29244 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Application is null : false
+2024-04-24 11:56:49.582  INFO 29244 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Registered Applications size is zero : true
+2024-04-24 11:56:49.582  INFO 29244 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Application version is -1: false
+2024-04-24 11:56:49.582  INFO 29244 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : Getting all instance registry info from the eureka server
+2024-04-24 11:56:49.630  INFO 29244 --- [DiscoveryClient-CacheRefreshExecutor-0] com.netflix.discovery.DiscoveryClient    : The response status is 200
+2024-04-24 12:01:19.410  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:06:19.422  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:11:19.429  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:16:19.443  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:21:19.446  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:26:19.461  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:31:19.465  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:36:19.480  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:41:19.495  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:46:19.499  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:51:19.501  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:56:19.513  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 12:56:44.693  INFO 29244 --- [SessionValidationThread-1] a.s.s.m.AbstractValidatingSessionManager : Validating all active sessions...
+2024-04-24 12:56:45.380 ERROR 29244 --- [SessionValidationThread-1] org.crazycake.shiro.RedisSessionDAO      : get active sessions error.
+2024-04-24 12:56:45.381  INFO 29244 --- [SessionValidationThread-1] a.s.s.m.AbstractValidatingSessionManager : Finished session validation.  No sessions were stopped.
+2024-04-24 13:01:19.521  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 13:06:19.524  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 13:11:19.538  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 13:16:19.544  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 13:21:19.550  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 13:26:19.556  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration
+2024-04-24 13:31:19.563  INFO 29244 --- [AsyncResolver-bootstrap-executor-0] c.n.d.s.r.aws.ConfigClusterResolver      : Resolving eureka endpoints via configuration

+ 1 - 1
virgo.api/src/main/java/com/bosshand/virgo/api/Application.java

@@ -11,7 +11,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @SpringBootApplication
 //@EnableEurekaClient
 @EnableTransactionManagement
-@MapperScan("com.bosshand.virgo.core.dao,com.bosshand.virgo.api.dao,com.bosshand.virgo.api.metadata.dao")
+@MapperScan("com.bosshand.virgo.core.dao,com.bosshand.virgo.api.dao")
 @ComponentScan(basePackages = {"com.bosshand"})
 public class Application {
 	public static void main(String[] args) {

+ 0 - 45
virgo.api/src/main/java/com/bosshand/virgo/api/controller/CollaborativeController.java

@@ -1,45 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bosshand.virgo.api.model.Collaborative;
-import com.bosshand.virgo.api.service.CollaborativeService;
-import com.bosshand.virgo.core.model.MgrUser;
-import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.core.utils.ContextUtils;
-
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@RequestMapping("collaborative")
-public class CollaborativeController {
-
-	@Autowired
-	private CollaborativeService collaborativeService;
-
-	@ApiOperation(value = "获取协同审核", notes = "获取协同审核")
-	@RequestMapping(value = "/{projectId}", method = RequestMethod.GET)
-	public Response getList(@PathVariable long projectId) {
-		MgrUser user = ContextUtils.getCurrentUser();
-		return Response.ok(collaborativeService.getList(user, projectId));
-	}
-
-	@ApiOperation(value = "新增协同审核", notes = "新增协同审核")
-	@RequestMapping(value = "/", method = RequestMethod.POST)
-	public Response insert(@RequestBody Collaborative collaborative) {
-		MgrUser user = ContextUtils.getCurrentUser();
-		return Response.ok(collaborativeService.insert(collaborative, user));
-	}
-	
-	@ApiOperation(value = "回执协同审核", notes = "回执协同审核")
-	@RequestMapping(value = "/{id}", method = RequestMethod.PUT)
-	public Response isReceipt(@PathVariable int id) {
-		return Response.ok(collaborativeService.isReceipt(id));
-	}
-
-}

+ 0 - 44
virgo.api/src/main/java/com/bosshand/virgo/api/controller/ConfigurationUrlController.java

@@ -1,44 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.bosshand.virgo.api.model.ConfigurationUrl;
-import com.bosshand.virgo.api.service.ConfigurationUrlService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@RequestMapping("configurationUrl")
-public class ConfigurationUrlController {
-	
-	@Autowired
-	private ConfigurationUrlService configurationUrlService;
-
-	@RequestMapping(value = "/url", method = RequestMethod.GET)
-	public String get() {
-		return JSONObject.toJSONString(configurationUrlService.getList().get(0));
-	}
-
-	@ApiOperation(value = "获取配置url", notes = "获取配置url")
-	@RequestMapping(value = "/", method = RequestMethod.GET)
-	public Response getList() {
-		return Response.ok(configurationUrlService.getList());
-	}
-
-	@ApiOperation(value = "配置url", notes = "配置url")
-	@RequestMapping(value = "/", method = RequestMethod.POST)
-	public Response insert(@RequestBody ConfigurationUrl configurationUrl) {
-		return Response.ok(configurationUrlService.insert(configurationUrl));
-	}
-	
-	@ApiOperation(value = "修改配置url", notes = "修改配置url")
-	@RequestMapping(value = "/", method = RequestMethod.PUT)
-	public Response update(@RequestBody ConfigurationUrl configurationUrl) {
-		return Response.ok(configurationUrlService.update(configurationUrl));
-	}
-
-}

+ 0 - 41
virgo.api/src/main/java/com/bosshand/virgo/api/controller/ConstructionLogController.java

@@ -1,41 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.bosshand.virgo.api.service.ConstructionLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import com.bosshand.virgo.api.model.Project;
-import com.bosshand.virgo.api.service.ProjectService;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@RequestMapping("constructionLog")
-public class ConstructionLogController {
-	
-	@Autowired
-	private ConstructionLogService constructionLogService;
-	
-	@Autowired
-	private ProjectService projectService;
-
-	@RequestMapping(value = "/saveNotice", method = RequestMethod.POST)
-	public void saveNotice(@RequestBody String data) {
-		constructionLogService.saveConstructionLog(data);
-	}
-
-	@ApiOperation(value = "施工日志", notes = "施工日志")
-	@RequestMapping(value = "/{projectId}", method = RequestMethod.GET)
-	public Response getNotice(@PathVariable long projectId) {
-		Project project = projectService.get(projectId);
-		return Response.ok(constructionLogService.getByProjectId(project.getYuiProjectId()));
-	}
-
-	@ApiOperation(value = "安全日志", notes = "安全日志")
-	@RequestMapping(value = "/security/{projectId}", method = RequestMethod.GET)
-	public Response getSecurityNotice(@PathVariable long projectId) {
-		Project project = projectService.get(projectId);
-		return Response.ok(constructionLogService.getSecurityNotice(project.getYuiProjectId()));
-	}
-
-}

+ 0 - 71
virgo.api/src/main/java/com/bosshand/virgo/api/controller/DesignChangeController.java

@@ -1,71 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.bosshand.virgo.api.model.DesignChange;
-import com.bosshand.virgo.api.service.DesignChangeService;
-import com.bosshand.virgo.core.model.MgrUser;
-import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.core.utils.ContextUtils;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@RestController
-public class DesignChangeController {
-
-    @Autowired
-    private DesignChangeService designChangeService;
-
-    @ApiOperation(value = "新增", notes = "新增")
-    @RequestMapping(value = "designChange", method = RequestMethod.POST)
-    public Response add(@RequestBody DesignChange designChange) {
-        MgrUser user = ContextUtils.getCurrentUser();
-        designChange.setCreateBy(user.getName());
-        designChange.setCreateByUserId(user.getId());
-        return Response.ok(designChangeService.save(designChange));
-    }
-
-    @ApiOperation(value = "编辑", notes = "编辑")
-    @RequestMapping(value = "designChange", method = RequestMethod.PUT)
-    public Response edit(@RequestBody DesignChange designChange) {
-        MgrUser user = ContextUtils.getCurrentUser();
-        designChange.setCreateBy(user.getName());
-        designChange.setCreateByUserId(user.getId());
-        return Response.ok(designChangeService.update(designChange));
-    }
-
-    @ApiOperation(value = "删除", notes = "删除")
-    @RequestMapping(value = "designChange/{id}", method = RequestMethod.DELETE)
-    public Response del(@PathVariable long id) {
-        designChangeService.delete(id);
-        return Response.ok();
-    }
-
-    @ApiOperation(value = "查询列表", notes = "查询列表")
-    @RequestMapping(value = "designChange/queryList", method = RequestMethod.POST)
-    public Response getByList(@RequestBody DesignChange designChange) {
-        return Response.ok(designChangeService.queryByList(designChange));
-    }
-
-    @ApiOperation(value = "查询", notes = "查询")
-    @RequestMapping(value = "designChange/query", method = RequestMethod.POST)
-    public Response getByProjectId(@RequestBody DesignChange designChange) {
-        return Response.ok(designChangeService.query(designChange));
-    }
-
-    @ApiOperation(value = "分页查询", notes = "分页查询")
-    @RequestMapping(value = "designChange/query/{currPage}/{pageSize}", method = RequestMethod.POST)
-    public Response getPageByProjectId(@RequestBody DesignChange designChange, @PathVariable int currPage, @PathVariable int pageSize) {
-        List<DesignChange> totalCount = designChangeService.query(designChange);
-        List<DesignChange> dataList = totalCount.stream().skip((currPage - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-        Map<String, Object> result = new HashMap<String, Object>();
-        result.put("dataList", dataList);
-        result.put("totalCount", totalCount.size());
-        return Response.ok(result);
-    }
-
-}

+ 0 - 42
virgo.api/src/main/java/com/bosshand/virgo/api/controller/DrawingsMarkedController.java

@@ -1,42 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.bosshand.virgo.api.model.DrawingsMarked;
-import com.bosshand.virgo.api.service.DrawingsMarkedService;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("drawingsMarked")
-public class DrawingsMarkedController {
-
-    @Autowired
-    DrawingsMarkedService drawingsMarkedService;
-
-
-    @ApiOperation(value = "保存图纸标注", notes = "保存图纸标注")
-    @RequestMapping(value = "/", method = RequestMethod.POST)
-    public Response saveDrawingsMarked(@RequestBody DrawingsMarked drawingsMarked) {
-        return Response.ok( drawingsMarkedService.save(drawingsMarked));
-    }
-
-    @ApiOperation(value = "修改图纸标注", notes = "修改图纸标注")
-    @RequestMapping(value = "/", method = RequestMethod.PUT)
-    public Response updateDrawingsMarked(@RequestBody DrawingsMarked drawingsMarked) {
-        return Response.ok(drawingsMarkedService.update(drawingsMarked));
-    }
-
-    @ApiOperation(value = "根据ids获取图纸标注", notes = "根据ids获取图纸标注")
-    @RequestMapping(value = "/{ids}", method = RequestMethod.GET)
-    public Response getDrawingsMarkedByIds(@PathVariable String ids) {
-        return Response.ok(drawingsMarkedService.getIds(ids));
-    }
-
-    @ApiOperation(value = "根据fileId获取图纸标注", notes = "根据fileId获取图纸标注")
-    @RequestMapping(value = "/file/{fileId}", method = RequestMethod.GET)
-    public Response getDrawingsMarkedByFileId(@PathVariable int fileId) {
-        return Response.ok(drawingsMarkedService.getFileId(fileId));
-    }
-
-}

+ 0 - 93
virgo.api/src/main/java/com/bosshand/virgo/api/controller/ElementController.java

@@ -1,93 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.bosshand.virgo.api.model.Element;
-import com.bosshand.virgo.api.service.ConfigurationUrlService;
-import com.bosshand.virgo.api.service.ElementService;
-import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.core.utils.QRCodeUtil;
-import com.bosshand.virgo.exception.ServiceException;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@RestController
-@RequestMapping("element")
-public class ElementController {
-
-    @Autowired
-    ElementService elementService;
-
-    @Autowired
-    ConfigurationUrlService configurationUrlService;
-
-    @ApiOperation(value = "生成构件列表", notes = "生成构件列表")
-    @RequestMapping(value = "/create/{integrateId}", method = RequestMethod.GET)
-    public Response create(@PathVariable String integrateId) {
-        if (elementService.create(integrateId)) {
-            return Response.ok();
-        }
-        return Response.fail(200001, "查看集成是否成功");
-    }
-
-    @ApiOperation(value = "重新生成构件列表", notes = "重新生成构件列表")
-    @RequestMapping(value = "/recreate/{integrateId}", method = RequestMethod.GET)
-    public Response recreate(@PathVariable String integrateId) {
-        if (elementService.recreate(integrateId)) {
-            return Response.ok();
-        }
-        return Response.fail(200001, "查看集成是否成功");
-    }
-
-    @ApiOperation(value = "查询构件列表", notes = "查询构件列表")
-    @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Response getList(@RequestBody Element element) {
-        return Response.ok(elementService.getIntegrateId(element));
-    }
-
-    @ApiOperation(value = "查询构件列表", notes = "查询构件列表")
-    @RequestMapping(value = "/list/{currPage}/{pageSize}", method = RequestMethod.POST)
-    public Response getList(@RequestBody Element element, @PathVariable int currPage, @PathVariable int pageSize) {
-        List<Element> list = elementService.getIntegrateId(element);
-        List<Element> dataList = list.stream().skip((currPage - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-        Map<String, Object> result = new HashMap<>();
-        result.put("dataList", dataList);
-        result.put("totalCount", list.size());
-        return Response.ok(result);
-    }
-
-    @ApiOperation(value = "查看构件二维码", notes = "查看构件二维码")
-    @RequestMapping(value = "/qr/{id}", method = RequestMethod.GET)
-    public Response getQr(@PathVariable long id) {
-        String url = configurationUrlService.getList().get(0).getCoordinationUrl();
-        byte[] qr = null;
-        try {
-            qr = QRCodeUtil.getQRCodeBytes(url + "/api/element/track/" + id);
-        } catch (Exception e) {
-            throw new ServiceException("qr is fail");
-        }
-        Map<String, Object> result = new HashMap<String, Object>();
-        String qrBase64 = "data:image/png;base64," + Base64.getEncoder().encodeToString(qr);
-        result.put("qrBase64", qrBase64);
-        return Response.ok(result);
-    }
-
-    @ApiOperation(value = "追踪", notes = "追踪")
-    @RequestMapping(value = "/track/{id}", method = RequestMethod.GET)
-    public Response track(@PathVariable long id) {
-        return Response.ok(elementService.track(id));
-    }
-
-    @ApiOperation(value = "更新加工厂和状态字段", notes = "更新加工厂和状态字段")
-    @RequestMapping(value = "/factory", method = RequestMethod.POST)
-    public Response track(@RequestBody Element element) {
-        elementService.factory(element);
-        return Response.ok();
-    }
-
-}

+ 0 - 72
virgo.api/src/main/java/com/bosshand/virgo/api/controller/ElementStepController.java

@@ -1,72 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.bosshand.virgo.api.model.ElementStep;
-import com.bosshand.virgo.api.model.ElementStepModel;
-import com.bosshand.virgo.api.service.ElementStepService;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("elementStep")
-public class ElementStepController {
-
-    @Autowired
-    ElementStepService elementStepService;
-
-    @ApiOperation(value = "默认步骤", notes = "默认步骤")
-    @RequestMapping(value = "/model", method = RequestMethod.GET)
-    public Response getListModel() {
-        return Response.ok(elementStepService.getModelList());
-    }
-
-    @ApiOperation(value = "新加默认步骤", notes = "新加默认步骤")
-    @RequestMapping(value = "/model", method = RequestMethod.POST)
-    public Response saveModel(@RequestBody ElementStepModel elementStepModel) {
-        elementStepService.saveModel(elementStepModel);
-        return Response.ok();
-    }
-
-    @ApiOperation(value = "删除默认步骤", notes = "删除默认步骤")
-    @RequestMapping(value = "/model/{id}", method = RequestMethod.DELETE)
-    public Response deleteModel(@PathVariable long id) {
-        elementStepService.deleteModel(id);
-        return Response.ok();
-    }
-
-    @ApiOperation(value = "修改默认步骤", notes = "修改默认步骤")
-    @RequestMapping(value = "/model", method = RequestMethod.PUT)
-    public Response updateModel(@RequestBody ElementStepModel elementStepModel) {
-        elementStepService.updateModel(elementStepModel);
-        return Response.ok();
-    }
-
-    @ApiOperation(value = "通过elementId获取步骤", notes = "通过elementId获取步骤")
-    @RequestMapping(value = "/{elementId}", method = RequestMethod.GET)
-    public Response getList(@PathVariable String elementId) {
-        return Response.ok(elementStepService.getList(elementId));
-    }
-
-    @ApiOperation(value = "增加单个构件下的步骤", notes = "增加单个构件下的步骤")
-    @RequestMapping(value = "", method = RequestMethod.POST)
-    public Response save(@RequestBody ElementStep elementStep) {
-        elementStepService.save(elementStep);
-        return Response.ok();
-    }
-
-    @ApiOperation(value = "修改单个构件下的步骤", notes = "修改单个构件下的步骤")
-    @RequestMapping(value = "", method = RequestMethod.PUT)
-    public Response update(@RequestBody ElementStep elementStep) {
-        elementStepService.update(elementStep);
-        return Response.ok();
-    }
-
-    @ApiOperation(value = "删除单个构件下的步骤", notes = "删除单个构件下的步骤")
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public Response delete(@PathVariable long id) {
-        elementStepService.delete(id);
-        return Response.ok();
-    }
-
-}

+ 0 - 414
virgo.api/src/main/java/com/bosshand/virgo/api/controller/FlowManagerController.java

@@ -1,414 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.bosshand.virgo.api.model.*;
-import com.bosshand.virgo.api.service.FlowInstanceService;
-import com.bosshand.virgo.api.service.FlowUserConfigService;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-
-@RestController
-public class FlowManagerController {
-
-	@Autowired
-	private FlowInstanceService flowInstanceService;
-
-	@Autowired
-	private FlowUserConfigService flowUserConfigService;
-
-	@ApiOperation(value = "流程样例模板新增", notes = "流程样例模板新增")
-	@RequestMapping(value = "/flowModel/{type}", method = RequestMethod.POST)
-	public Response insertFlowModel(@PathVariable int type, @RequestBody FlowModel flowModel) {
-		flowModel.setType(type);
-		flowInstanceService.insertflowModel(flowModel);
-		return Response.ok(flowModel);
-	}
-
-	@ApiOperation(value = "流程样例模板修改", notes = "流程样例模板修改")
-	@RequestMapping(value = "/flowModel/", method = RequestMethod.PUT)
-	public Response insertFlowModel(@RequestBody FlowModel flowModel) {
-		flowInstanceService.updateflowModel(flowModel);
-		return Response.ok(flowModel);
-	}
-
-	@ApiOperation(value = "流程样例模板删除", notes = "流程样例模板删除")
-	@RequestMapping(value = "/flowModel/{id}", method = RequestMethod.DELETE)
-	public Response insertFlowModel(@PathVariable long id) {
-		flowInstanceService.deleteflowModel(id);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "流程模板节点样例新增", notes = "流程模板节点样例新增")
-	@RequestMapping(value = "/flowModelNode/{flowModelId}", method = RequestMethod.POST)
-	public Response insertFlowModelNode(@PathVariable long flowModelId, @RequestBody FlowModelNode flowModelNode) {
-		flowModelNode.setFlowModelId(flowModelId);
-		flowInstanceService.insertflowModelNode(flowModelNode);
-		return Response.ok(flowModelNode);
-	}
-
-	@ApiOperation(value = "流程模板节点样例修改", notes = "流程模板节点样例修改")
-	@RequestMapping(value = "/flowModelNode/", method = RequestMethod.PUT)
-	public Response insertFlowModelNode(@RequestBody FlowModelNode flowModelNode) {
-		flowInstanceService.updateflowModelNode(flowModelNode);
-		return Response.ok(flowModelNode);
-	}
-
-	@ApiOperation(value = "流程模板节点样例删除", notes = "流程模板节点样例删除")
-	@RequestMapping(value = "/flowModelNode/{id}", method = RequestMethod.DELETE)
-	public Response deleteFlowModelNode(@PathVariable long id) {
-		flowInstanceService.deleteflowModelNode(id);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "协同流程同有极流程绑定", notes = "协同流程同有极流程绑定")
-	@RequestMapping(value = "/binding/flowModel/{id}/{yuiFlowTypes}", method = RequestMethod.POST)
-	public Response bindingFlowModel(@PathVariable int id, @PathVariable String yuiFlowTypes) {
-		FlowModel flowModel = flowInstanceService.get(id);
-		flowModel.setYuiFlowTypes(yuiFlowTypes);
-		flowInstanceService.updateflowModel(flowModel);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "协同流程同施工方流程绑定", notes = "协同流程同施工方流程绑定")
-	@RequestMapping(value = "/binding/flowModel/construction/{id}/{constructionFlowTypes}", method = RequestMethod.POST)
-	public Response bindingFlowModelByConstruction(@PathVariable int id, @PathVariable String constructionFlowTypes) {
-		FlowModel flowModel = flowInstanceService.get(id);
-		flowModel.setConstructionFlowTypes(constructionFlowTypes);
-		flowInstanceService.updateflowModel(flowModel);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "获取流程样例列表", notes = "获取流程样例列表")
-	@RequestMapping(value = "flow/", method = RequestMethod.GET)
-	public Response getAll() {
-		return Response.ok(flowInstanceService.getAllFlowModel());
-	}
-	
-	@ApiOperation(value = "根据organizationType获取流程样例列表", notes = "根据organizationType获取流程样例列表")
-	@RequestMapping(value = "flow/organizationType/{organizationType}", method = RequestMethod.GET)
-	public Response getByOrganizationType(@PathVariable int organizationType) {
-		return Response.ok(flowInstanceService.getAllFlowModel(organizationType));
-	}
-	
-	@ApiOperation(value = "根据yuiProjectId获取流程样例列表", notes = "根据yuiProjectId获取流程样例列表")
-	@RequestMapping(value = "flow/projectFromYui/{yuiProjectId}", method = RequestMethod.GET)
-	public Response getProjectFromYuiAll(@PathVariable long yuiProjectId) {
-		return Response.ok(flowInstanceService.getProjectFromYuiAll(yuiProjectId));
-	}
-
-	@ApiOperation(value = "获取流程样例", notes = "获取流程样例")
-	@RequestMapping(value = "flow/{id}", method = RequestMethod.GET)
-	public Response get(@PathVariable long id) {
-		return Response.ok(flowInstanceService.get(id));
-	}
-
-	@ApiOperation(value = "根据项目ID获取流程设置", notes = "根据项目ID获取流程设置")
-	@RequestMapping(value = "project/{projectId}/{projectItemId}/flowInstance/", method = RequestMethod.GET)
-	public Response getAll(@PathVariable long projectId, @PathVariable long projectItemId) {
-		return Response.ok(flowInstanceService.getAllFlowInstance(projectId, projectItemId));
-	}
-
-	@ApiOperation(value = "根据项目ID开启流程", notes = "根据项目ID开启流程")
-	@RequestMapping(value = "project/{projectId}/{projectItemId}/flowInstance/", method = RequestMethod.POST)
-	public Response enable(@PathVariable long projectId, @PathVariable long projectItemId) {
-		flowInstanceService.enableFlow(projectId, projectItemId);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "获取流程模板信息", notes = "获取流程模板信息")
-	@RequestMapping(value = "project/{projectId}/flowInstance/{flowInstanceId}", method = RequestMethod.GET)
-	public Response getFlowInstance(@PathVariable long projectId, @PathVariable long flowInstanceId) {
-		// TODO check the project and flow
-		return Response.ok(flowInstanceService.getInstance(flowInstanceId));
-	}
-	
-	@ApiOperation(value = "设置流程模板节点", notes = "设置流程模板节点")
-	@RequestMapping(value = "project/{projectId}/flowInstance/{flowInstanceId}", method = RequestMethod.POST)
-	public Response updateFlowInstanceNode(@RequestBody FlowInstanceNode node){
-		//TODO check the project and flow 
-		return Response.ok(flowInstanceService.updateInstanceNode(node));
-
-	}
-	
-	@ApiOperation(value = "新增节点", notes = "新增节点")
-	@RequestMapping(value = "flowInstanceNode", method = RequestMethod.POST)
-	public Response insertInstanceNode(@RequestBody FlowInstanceNode flowInstanceNode) {
-		return Response.ok(flowInstanceService.insertInstanceNode(flowInstanceNode));
-	}
-
-	@ApiOperation(value = "更新节点", notes = "更新节点")
-	@RequestMapping(value = "flowInstanceNode", method = RequestMethod.PUT)
-	public Response updateInstanceNode(@RequestBody FlowInstanceNode flowInstanceNode) {
-		flowInstanceService.updateInstanceNode(flowInstanceNode);
-		return Response.ok(flowInstanceNode);
-	}
-
-	@ApiOperation(value = "删除节点", notes = "删除节点")
-	@RequestMapping(value = "flowInstanceNode/{id}", method = RequestMethod.DELETE)
-	public Response deleteInstanceNode(@PathVariable long id) {
-		flowInstanceService.deleteInstanceNode(id);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "更新节点状态", notes = "更新节点状态")
-	@RequestMapping(value = "flowInstanceNode/{id}", method = RequestMethod.PUT)
-	public Response updateFlowInstanceNodeStatus(@PathVariable long id){
-		return Response.ok(flowInstanceService.updateFlowInstanceNodeStatus(id));
-	}
-
-	@ApiOperation(value = "更新组织对应的审核步骤", notes = "更新组织对应的审核步骤")
-	@RequestMapping(value = "/{organizationType}/{flowType}", method = RequestMethod.POST)
-	public Response updateFlowUserList(@PathVariable long organizationType, @PathVariable long flowType, @RequestBody FlowApproverListDto dto) {
-		flowInstanceService.updateFlowUserList(organizationType, flowType, dto);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "更新提交者", notes = "更新提交者")
-	@RequestMapping(value = "/{organizationType}/{flowType}", method = RequestMethod.PUT)
-	public Response updateFlowUserListToSubmitter(@PathVariable long organizationType, @PathVariable long flowType, @RequestBody FlowApproverListDto dto) {
-		flowInstanceService.updateFlowUserListToSubmitter(flowType, dto);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "根据单位工程获取单个组织对应的审核步骤", notes = "根据单位工程获取单个组织对应的审核步骤")
-	@RequestMapping(value = "projectItem/{projectItemId}/{organizationType}/{flowType}", method = RequestMethod.GET)
-	public Response getFlowUserList(@PathVariable long projectItemId, @PathVariable long organizationType, @PathVariable long flowType) {
-		return Response.ok(JSON.parse(flowInstanceService.getFlowUserList(projectItemId, organizationType, flowType)));
-	}
-	
-	@ApiOperation(value = "根据有极系统中单位工程获取包含的所有流程", notes = "根据有极系统中单位工程获取包含的所有流程")
-	@RequestMapping(value = "projectItemFromYui/{projectItemId}", method = RequestMethod.GET)
-	public Response getAllFlowFromYui(@PathVariable long projectItemId) {
-		return Response.ok(JSON.toJSON(flowInstanceService.getAllFlowFromYui(projectItemId)));
-	}
-	
-	@ApiOperation(value = "根据有极系统中单位工程flowType获取包含的单个或多个流程", notes = "根据有极系统中单位工程flowType获取包含的单个或多个流程")
-	@RequestMapping(value = "projectItemFromYui/{projectItemId}/{flowType}", method = RequestMethod.GET)
-	public Response getOnlyFlowFromYui(@PathVariable long projectItemId, @PathVariable String flowType) {
-		return Response.ok(JSON.toJSON(flowInstanceService.getOnlyFlowFromYui(projectItemId, flowType)));
-	}
-	
-	@ApiOperation(value = "根据施工方单位工程flowType获取包含的单个或多个流程", notes = "根据施工方单位工程flowType获取包含的单个或多个流程")
-	@RequestMapping(value = "projectItemFromConstruction/{projectItemId}/{flowType}", method = RequestMethod.GET)
-	public Response getOnlyFlowFromConstruction(@PathVariable long projectItemId, @PathVariable String flowType) {
-		return Response.ok(JSON.toJSON(flowInstanceService.getOnlyFlowFromConstruction(projectItemId, flowType)));
-	}
-	
-	@ApiOperation(value = "根据协同系统中单位工程flowType获取包含的单个流程", notes = "根据协同系统中单位工程flowType获取包含的单个流程")
-	@RequestMapping(value = "projectItemFromCoordination/{projectItemId}/{flowType}", method = RequestMethod.GET)
-	public Response getOnlyFlow(@PathVariable long projectItemId, @PathVariable long flowType) {
-		return Response.ok(JSON.toJSON(flowInstanceService.getOnlyFlow(projectItemId, flowType)));
-	}
-	
-	@ApiOperation(value = "根据协同系统中单位工程flowType获取包含的单个流程2", notes = "根据协同系统中单位工程flowType获取包含的单个流程2")
-	@RequestMapping(value = "projectItemFromCoordination2/{projectItemId}/{flowType}", method = RequestMethod.GET)
-	public Response getOnlyFlow2(@PathVariable long projectItemId, @PathVariable long flowType) {
-		return Response.ok(JSON.toJSON(flowInstanceService.getOnlyFlow2(projectItemId, flowType)));
-	}
-	
-	@ApiOperation(value = "根据协同系统中项目flowType获取包含的单个流程", notes = "根据协同系统中项目flowType获取包含的单个流程")
-	@RequestMapping(value = "projectFromCoordination/{projectItemId}/{flowType}", method = RequestMethod.GET)
-	public Response getProjectOnlyFlow(@PathVariable long projectItemId, @PathVariable long flowType) {
-		return Response.ok(JSON.toJSON(flowInstanceService.getProjectOnlyFlow(projectItemId, flowType)));
-	}
-
-	@ApiOperation(value = "根据id获取有极流程数据", notes = "根据id获取有极流程数据")
-	@RequestMapping(value = "flowYuiDataFromYui/details/{id}", method = RequestMethod.GET)
-	public Response getFlowYuiDataById(@PathVariable long id) {
-		return Response.ok(flowInstanceService.getFlowYuiData(id));
-	}
-	
-	@ApiOperation(value = "根据projectFlowId获取有极流程数据", notes = "根据projectFlowId获取有极流程数据")
-	@RequestMapping(value = "flowYuiDataFromYui/projectFlow/{projectFlowId}", method = RequestMethod.GET)
-	public Response getFlowYuiDataByProjectFlowId(@PathVariable long projectFlowId) {
-		return Response.ok(flowInstanceService.getByProjectFlowId(projectFlowId));
-	}
-	
-	@ApiOperation(value = "有极流程数据新增", notes = "有极流程数据新增")
-	@RequestMapping(value = "flowYuiDataFromYui/", method = RequestMethod.POST)
-	public Response insertFlowYuiData(
-		@RequestParam(value="flowId", required=true) long flowId, 
-		@RequestParam(value="flowName", required=true) String flowName,
-		@RequestParam(value="flowType", required=true) int flowType,
-		@RequestParam(value="yuiFlowType", required=true) int yuiFlowType,
-		@RequestParam(value="yuiProjectId", required=true) int yuiProjectId,
-		@RequestParam(value="yuiProjectItemId", required=true) long yuiProjectItemId,
-		@RequestParam(value="yuiProjectItemTargetId", required=false) Long yuiProjectItemTargetId,
-		@RequestParam(value="yuiProjectFlowId", required=false) Long yuiProjectFlowId,
-		@RequestParam(value="coment", required=false) String coment, 
-		@RequestParam(value="content", required=true) String content, 
-		@RequestParam(value="flowTemplateId", required=false) Long flowTemplateId,
-		@RequestParam(value="flowUserList", required=true) String flowUserList) {
-		FlowYuiData flowYuiData = new FlowYuiData();
-		flowYuiData.setDate(new Date());
-		flowYuiData.setFlowId(flowId);
-		flowYuiData.setFlowName(flowName);
-		flowYuiData.setFlowType(flowType);
-		flowYuiData.setYuiFlowType(yuiFlowType);
-		flowYuiData.setYuiProjectId(yuiProjectId);
-		flowYuiData.setYuiProjectItemId(yuiProjectItemId);
-		flowYuiData.setYuiProjectItemTargetId(yuiProjectItemTargetId == null ? 0 : yuiProjectItemTargetId);
-		flowYuiData.setYuiProjectFlowId(yuiProjectFlowId == null ? 0 : yuiProjectFlowId);
-		flowYuiData.setComent(coment);
-		flowYuiData.setContent(content);
-		flowYuiData.setFlowTemplateId(flowTemplateId == null ? 0 : flowTemplateId);
-		flowYuiData.setFlowUserList(flowUserList);
-		flowInstanceService.insertFlowYuiData(flowYuiData);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "通过youjiProjectFlowId获取thisProjectFlowId", notes = "通过youjiProjectFlowId获取thisProjectFlowId")
-	@RequestMapping(value = "flowYuiDataFromYui/youjiProjectFlowId/{youjiProjectFlowId}", method = RequestMethod.GET)
-	public Response getProjectFlowId(@PathVariable long youjiProjectFlowId) {
-		return Response.ok(flowInstanceService.getProjectFlowId(youjiProjectFlowId));
-	}
-	
-	@ApiOperation(value = "有极流程数据yuiProjectItemTargetId查询", notes = "有极流程数据yuiProjectItemTargetId查询")
-	@RequestMapping(value = "flowYuiDataFromYui/{yuiFlowType}/{yuiProjectItemTargetId}/", method = RequestMethod.GET)
-	public Response getFlowYuiDataListByTargetId(@PathVariable int yuiFlowType, @PathVariable long yuiProjectItemTargetId) {
-		FlowYuiData flowYuiData = new FlowYuiData();
-		flowYuiData.setStatus(-1);
-		flowYuiData.setYuiFlowType(yuiFlowType);
-		flowYuiData.setYuiProjectItemTargetId(yuiProjectItemTargetId);
-		return Response.ok(flowInstanceService.getListByFlowYuiData(flowYuiData));
-	}
-	
-	@ApiOperation(value = "有极流程数据yuiProjectItemId查询", notes = "有极流程数据yuiProjectItemId查询")
-	@RequestMapping(value = "flowYuiDataFromYui/{yuiFlowType}/itemId/{yuiProjectItemId}/", method = RequestMethod.GET)
-	public Response getFlowYuiDataListByItemId(@PathVariable int yuiFlowType, @PathVariable long yuiProjectItemId) {
-		FlowYuiData flowYuiData = new FlowYuiData();
-		flowYuiData.setStatus(-1);
-		flowYuiData.setYuiFlowType(yuiFlowType);
-		flowYuiData.setYuiProjectItemId(yuiProjectItemId);
-		return Response.ok(flowInstanceService.getListByFlowYuiData(flowYuiData));
-	}
-	
-	@ApiOperation(value = "有极流程数据yuiProjectId查询", notes = "有极流程数据yuiProjectId查询")
-	@RequestMapping(value = "flowYuiDataFromYui/{yuiFlowType}/projectId/{yuiProjectId}/", method = RequestMethod.GET)
-	public Response getFlowYuiDataListByProjectId(@PathVariable int yuiFlowType, @PathVariable long yuiProjectId) {
-		FlowYuiData flowYuiData = new FlowYuiData();
-		flowYuiData.setStatus(-1);
-		flowYuiData.setYuiFlowType(yuiFlowType);
-		flowYuiData.setYuiProjectId(yuiProjectId);
-		return Response.ok(flowInstanceService.getListByFlowYuiData(flowYuiData));
-	}
-	
-	@ApiOperation(value = "有极流程数据编辑", notes = "有极流程数据编辑")
-	@RequestMapping(value = "flowYuiDataFromYui/", method = RequestMethod.PUT)
-	public Response updateFlowYuiData(@RequestBody FlowYuiData flowYuiData) {
-		flowInstanceService.updateFlowYuiData(flowYuiData);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "根据yuiProjectId有极流程数据查询", notes = "根据yuiProjectId有极流程数据查询")
-	@RequestMapping(value = "fromYui/{yuiProjectId}/", method = RequestMethod.GET)
-	public Response getFlowYuiDataListByYuiProjectId(@PathVariable long yuiProjectId) {
-		FlowYuiData flowYuiData = new FlowYuiData();
-		flowYuiData.setStatus(-1);
-		flowYuiData.setYuiProjectId(yuiProjectId);
-		return Response.ok(flowInstanceService.getListByFlowYuiData(flowYuiData));
-	}
-	
-	@ApiOperation(value = "根据yuiFlowType和yuiProjectId有极流程数据查询", notes = "根据yuiFlowType和yuiProjectId有极流程数据查询")
-	@RequestMapping(value = "fromYui/{yuiFlowType}/{yuiProjectId}/", method = RequestMethod.GET)
-	public Response getFlowYuiDataListByYuiFlowType(@PathVariable int yuiFlowType, @PathVariable long yuiProjectId) {
-		FlowYuiData flowYuiData = new FlowYuiData();
-		flowYuiData.setStatus(-1);
-		flowYuiData.setYuiFlowType(yuiFlowType);
-		flowYuiData.setYuiProjectId(yuiProjectId);
-		return Response.ok(flowInstanceService.getListByFlowYuiData(flowYuiData));
-	}
-	
-	@ApiOperation(value = "根据flowTemplateId查询协同流程数据", notes = "根据flowTemplateId查询协同流程数据")
-	@RequestMapping(value = "fromYuiByFlowTemplateId/{yuiProjectId}/{flowTemplateId}/", method = RequestMethod.GET)
-	public Response getFlowYuiDataByFlowTemplateId(@PathVariable long yuiProjectId, @PathVariable long flowTemplateId) {
-		FlowYuiData flowYuiData = new FlowYuiData();
-		flowYuiData.setStatus(-1);
-		flowYuiData.setYuiFlowType(-1);
-		flowYuiData.setFlowTemplateId(flowTemplateId);
-		flowYuiData.setYuiProjectId(yuiProjectId);
-		return Response.ok(flowInstanceService.getListByFlowYuiData(flowYuiData));
-	}
-	
-	@ApiOperation(value = "更新状态", notes = "更新状态")
-	@RequestMapping(value = "flowYuiDataFromYui/{id}/projectFlow/{projectFlowId}", method = RequestMethod.PUT)
-	public Response updateFlowYuiDataStatus(@PathVariable long id, @PathVariable long projectFlowId) {
-		flowInstanceService.updateFlowYuiDataStatus(id, projectFlowId);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "恢复状态", notes = "恢复状态")
-	@RequestMapping(value = "flowYuiDataFromYui/restore/{id}", method = RequestMethod.PUT)
-	public Response restoreFlowYuiDataStatus(@PathVariable long id) {
-		flowInstanceService.restoreFlowYuiDataStatus(id);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "根据organizationId获取有极流程数据", notes = "根据organizationId获取有极流程数据")
-	@RequestMapping(value = "flowYuiDataFromYui/{organizationId}", method = RequestMethod.GET)
-	public Response getFlowYuiData(@PathVariable long organizationId) {
-		return Response.ok(flowInstanceService.getFlowYuiDataByFlowId(organizationId));
-	}
-	
-	@ApiOperation(value = "获取TargetId已提交projectFlowId", notes = "获取TargetId已提交projectFlowId")
-	@RequestMapping(value = "flowYuiDataFromYui/document/{yuiFlowType}/{yuiProjectItemTargetId}/", method = RequestMethod.GET)
-	public Response getCommitedByProjectFlowIdByTargetId(@PathVariable int yuiFlowType, @PathVariable long yuiProjectItemTargetId) {
-		FlowYuiData flowYuiData = new FlowYuiData();
-		flowYuiData.setStatus(1);
-		flowYuiData.setYuiFlowType(yuiFlowType);
-		flowYuiData.setYuiProjectItemTargetId(yuiProjectItemTargetId);
-		return Response.ok(flowInstanceService.getListByFlowYuiData(flowYuiData));
-	}
-	
-	@ApiOperation(value = "获取ItemId已提交projectFlowId", notes = "获取ItemId已提交projectFlowId")
-	@RequestMapping(value = "flowYuiDataFromYui/document/{yuiFlowType}/ItemId/{yuiProjectItemId}/", method = RequestMethod.GET)
-	public Response getCommitedByProjectFlowIdByItemId(@PathVariable int yuiFlowType, @PathVariable long yuiProjectItemId) {
-		FlowYuiData flowYuiData = new FlowYuiData();
-		flowYuiData.setStatus(1);
-		flowYuiData.setYuiFlowType(yuiFlowType);
-		flowYuiData.setYuiProjectItemId(yuiProjectItemId);
-		return Response.ok(flowInstanceService.getListByFlowYuiData(flowYuiData));
-	}
-	
-	@ApiOperation(value = "获取ProjectId已提交projectFlowId", notes = "获取ProjectId已提交projectFlowId")
-	@RequestMapping(value = "flowYuiDataFromYui/document/{yuiFlowType}/ProjectId/{yuiProjectId}/", method = RequestMethod.GET)
-	public Response getCommitedByProjectFlowIdByProjectId(@PathVariable int yuiFlowType, @PathVariable long yuiProjectId) {
-		FlowYuiData flowYuiData = new FlowYuiData();
-		flowYuiData.setStatus(1);
-		flowYuiData.setYuiFlowType(yuiFlowType);
-		flowYuiData.setYuiProjectId(yuiProjectId);
-		return Response.ok(flowInstanceService.getListByFlowYuiData(flowYuiData));
-	}
-	
-	@ApiOperation(value = "获取已完成流程中documentIds", notes = "获取已完成流程中documentIds")
-	@RequestMapping(value = "flowYuiDataFromYui/document/{projectFlowIds}/", method = RequestMethod.GET)
-	public Response getFlowFinishDocumentIds(@PathVariable String projectFlowIds) {
-		return Response.ok(flowInstanceService.getFlowFinishDocumentIds(projectFlowIds));
-	}
-	
-	@ApiOperation(value = "统计流程状态", notes = "统计流程状态")
-	@RequestMapping(value = "flowYuiDataFromYui/peojectFlow/{yuiProjectId}/{yuiFlowTypes}/", method = RequestMethod.GET)
-	public Response statisticalProcessState(@PathVariable long yuiProjectId, @PathVariable String yuiFlowTypes) {
-		return Response.ok(flowInstanceService.statisticalProcessState(yuiProjectId, yuiFlowTypes));
-	}
-
-	//===================================================================================================
-
-	@ApiOperation(value = "流程用户配置", notes = "流程用户配置")
-	@RequestMapping(value = "/flowUserConfig", method = RequestMethod.POST)
-	public Response saveOrUpdateFlowUserConfig(@RequestBody FlowUserConfig flowUserConfig) {
-		flowUserConfigService.saveOrUpdateFlowUserConfig(flowUserConfig);
-		return Response.ok(flowUserConfig);
-	}
-
-	@ApiOperation(value = "获取流程用户配置", notes = "获取流程用户配置")
-	@RequestMapping(value = "/flowUserConfig/{projectId}/{userId}", method = RequestMethod.GET)
-	public Response getFlowUserConfig(@PathVariable long projectId, @PathVariable long userId) {
-		return Response.ok(flowUserConfigService.getUserProjectId(userId, projectId));
-	}
-
-}

+ 0 - 177
virgo.api/src/main/java/com/bosshand/virgo/api/controller/FlowSynergyDataController.java

@@ -1,177 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.bosshand.virgo.api.model.FlowSynergyData;
-import com.bosshand.virgo.api.service.FlowSynergyDataService;
-import com.bosshand.virgo.api.service.InspectService;
-import com.bosshand.virgo.api.service.PointToPointService;
-import com.bosshand.virgo.api.service.SignOnBehalfService;
-import com.bosshand.virgo.core.model.MgrUser;
-import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.core.utils.ContextUtils;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@RestController
-@RequestMapping("flowSynergy")
-public class FlowSynergyDataController {
-
-	@Autowired
-	FlowSynergyDataService flowSynergyDataService;
-
-	@Autowired
-	InspectService inspectService;
-
-	@Autowired
-	PointToPointService pointToPointService;
-
-	@Autowired
-	SignOnBehalfService signOnBehalfService;
-
-	@ApiOperation(value = "协同流程查询", notes = "协同流程查询")
-	@RequestMapping(value = "/list", method = RequestMethod.POST)
-	public Response list(@RequestBody FlowSynergyData flowSynergyData) {
-		return Response.ok(flowSynergyDataService.getListAll(flowSynergyData));
-	}
-
-	@ApiOperation(value = "协同流程待办数据", notes = "协同流程待办数据")
-	@RequestMapping(value = "/stay/{projectId}", method = RequestMethod.GET)
-	public Response stay(@PathVariable long projectId) {
-		return Response.ok(flowSynergyDataService.stay(projectId));
-	}
-
-	@ApiOperation(value = "项目中心的记录查询", notes = "项目中心的记录查询")
-	@RequestMapping(value = "/query/list", method = RequestMethod.POST)
-	public Response listQuery(@RequestBody FlowSynergyData flowSynergyData) {
-		return Response.ok(flowSynergyDataService.listQuery(flowSynergyData));
-	}
-
-	@ApiOperation(value = "当前用户有查看记录权限", notes = "当前用户有查看记录权限")
-	@RequestMapping(value = "/judge/{id}", method = RequestMethod.GET)
-	public Response judge(@PathVariable long id) {
-		FlowSynergyData flowSynergyData = flowSynergyDataService.judge(id);
-		if (flowSynergyData != null) {
-			return Response.ok(flowSynergyData);
-		}
-		return Response.fail(200001, "该用户没有查看权限");
-	}
-
-	@ApiOperation(value = "协同流程统计查询", notes = "协同流程统计查询")
-	@RequestMapping(value = "/census", method = RequestMethod.POST)
-	public Response census(@RequestParam(value="startDate", required=true) String startDate,
-						   @RequestParam(value="endDate", required=true) String endDate,
-						   @RequestParam(value="projectId", required=true) long projectId,
-						   @RequestParam(value="projectItemId", required=true) long projectItemId,
-						   @RequestParam(value="flowType", required=true) int flowType) {
-		return Response.ok(flowSynergyDataService.census(startDate,endDate,projectId,projectItemId,flowType));
-	}
-
-	@ApiOperation(value = "协同流程统计多个flowType查询", notes = "协同流程统计多个flowType查询")
-	@RequestMapping(value = "/censusByFlowTypes", method = RequestMethod.POST)
-	public Response censusByFlowTypes(@RequestParam(value="startDate", required=true) String startDate,
-						   @RequestParam(value="endDate", required=true) String endDate,
-						   @RequestParam(value="projectId", required=true) long projectId,
-						   @RequestParam(value="flowTypes", required=true) String flowTypes) {
-		return Response.ok(flowSynergyDataService.censusByFlowTypes(startDate,endDate,projectId,flowTypes));
-	}
-
-	@ApiOperation(value = "协同流程分页查询", notes = "协同流程分页查询")
-	@RequestMapping(value = "/list/{currPage}/{pageSize}", method = RequestMethod.POST)
-	public Response listLimit(@RequestBody FlowSynergyData flowSynergyData, @PathVariable int currPage, @PathVariable int pageSize) {
-		List<FlowSynergyData> list = flowSynergyDataService.getList(flowSynergyData);
-		List<FlowSynergyData> dataList = list.stream().skip((currPage - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-		Map<String, Object> result = new HashMap<>();
-		result.put("dataList", dataList);
-		result.put("totalCount", list.size());
-		return Response.ok(result);
-	}
-
-	@ApiOperation(value = "消息中心统计", notes = "消息中心统计")
-	@RequestMapping(value = "/censusSum/{projectId}", method = RequestMethod.GET)
-	public Response censusType(@PathVariable long projectId) {
-		long userId = ContextUtils.getCurrentUser().getId();
-		JSONObject json = new JSONObject();
-		JSONObject jo = inspectService.censusInspect(-projectId);
-		json.put("inspect", jo.getIntValue("create")
-				+ jo.getIntValue("receive")
-				+ jo.getIntValue("cc"));
-		JSONObject ja = pointToPointService.census(projectId);
-		json.put("pointToPoint", ja.getIntValue("create")
-				+ ja.getIntValue("receive")
-				+ ja.getIntValue("cc"));
-		json.put("process", flowSynergyDataService.censusSum(projectId, userId));
-		JSONObject stay = inspectService.stay(-projectId, userId);
-		JSONObject stay1 = flowSynergyDataService.stay(projectId);
-		JSONObject stay2 = pointToPointService.stay(projectId);
-		JSONObject stay3 = signOnBehalfService.stay(projectId, userId);
-		json.put("stay", stay.getJSONArray("stayReply").size()
-				+ stay.getJSONArray("stayWriteOff").size()
-				+ stay1.getJSONArray("submitList").size()
-				+ stay1.getJSONArray("returnList").size()
-				+ stay1.getJSONArray("examineList").size()
-				+ stay2.getJSONArray("staySignIn").size()
-				+ stay2.getJSONArray("stayReceipt").size()
-				+ stay2.getJSONArray("staySubmit").size()
-				+ stay3.getJSONArray("send").size()
-				+ stay3.getJSONArray("receive").size());
-		return Response.ok(json);
-	}
-
-	@ApiOperation(value = "协同流程类型统计分页查询", notes = "协同流程类型统计分页查询")
-	@RequestMapping(value = "/census/{projectId}/{type}/{currPage}/{pageSize}", method = RequestMethod.POST)
-	public Response listCensusLimit(@PathVariable long projectId,
-									@PathVariable int type,
-									@PathVariable int currPage,
-									@PathVariable int pageSize) {
-		long userId = ContextUtils.getCurrentUser().getId();
-		List<FlowSynergyData> list = flowSynergyDataService.getListByProject(type, projectId, userId);
-		List<FlowSynergyData> dataList = list.stream().skip((currPage - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
-		Map<String, Object> result = new HashMap<>();
-		result.put("dataList", dataList);
-		result.put("totalCount", list.size());
-		return Response.ok(result);
-	}
-	
-	@ApiOperation(value = "协同流程按照flowType查询", notes = "协同流程按照flowType查询")
-	@RequestMapping(value = "/list/{projectId}/{flowTypes}", method = RequestMethod.GET)
-	public Response listByFlowType(@PathVariable long projectId, @PathVariable String flowTypes) {
-		return Response.ok(flowSynergyDataService.getListByFlowType(projectId,flowTypes));
-	}
-
-	@ApiOperation(value = "协同流程新增", notes = "协同流程新增")
-	@RequestMapping(value = "/", method = RequestMethod.POST)
-	public Response insert(@RequestBody FlowSynergyData flowSynergyData) {
-		MgrUser user = ContextUtils.getCurrentUser() ;
-		flowSynergyData.setCreatedByUserId(user.getId());
-		flowSynergyData.setCreatedByUserName(user.getName());
-		return Response.ok(flowSynergyDataService.insert(flowSynergyData));
-	}
-
-	@ApiOperation(value = "协同流程删除", notes = "协同流程删除")
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-	public Response delete(@PathVariable long id) {
-		flowSynergyDataService.delete(id);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "协同流程更新", notes = "协同流程更新")
-	@RequestMapping(value = "/", method = RequestMethod.PUT)
-	public Response update(@RequestBody FlowSynergyData flowSynergyData) {
-		flowSynergyDataService.update(flowSynergyData);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "协同流程更新状态", notes = "协同流程更新状态")
-	@RequestMapping(value = "/state", method = RequestMethod.PUT)
-	public Response updateState(@RequestBody FlowSynergyData flowSynergyData) {
-		flowSynergyDataService.updateState(flowSynergyData);
-		return Response.ok();
-	}
-
-}

+ 0 - 113
virgo.api/src/main/java/com/bosshand/virgo/api/controller/InspectController.java

@@ -1,113 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.bosshand.virgo.api.model.Inspect;
-import com.bosshand.virgo.api.service.InspectService;
-import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.core.utils.ContextUtils;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-
-@RestController
-@RequestMapping("inspect")
-public class InspectController {
-
-	@Autowired
-	private InspectService inspectService;
-
-	@ApiOperation(value = "巡查详情", notes = "巡查详情")
-	@RequestMapping(value = "/detail/{id}", method = RequestMethod.GET)
-	public Response getInspect(@PathVariable long id) {
-		return Response.ok(inspectService.getInspect(id));
-	}
-
-	@ApiOperation(value = "根据类型获取巡查列表", notes = "根据类型获取巡查列表")
-	@RequestMapping(value = "/{inspectType}/{yuiProjectId}", method = RequestMethod.GET)
-	public Response getByInspectType(@PathVariable int inspectType, @PathVariable long yuiProjectId) {
-		return Response.ok(inspectService.getByInspectType(inspectType, yuiProjectId));
-	}
-
-	@ApiOperation(value = "统计巡查", notes = "统计巡查")
-	@RequestMapping(value = "/census/{yuiProjectId}", method = RequestMethod.GET)
-	public Response censusInspect(@PathVariable long yuiProjectId) {
-		return Response.ok(inspectService.censusInspect(yuiProjectId));
-	}
-
-	@ApiOperation(value = "企业间公开的已销项巡查列表", notes = "企业间公开的已销项巡查列表")
-	@RequestMapping(value = "/open", method = RequestMethod.POST)
-	public Response getByInspectOpen(@RequestBody Inspect inspect) {
-		inspect.setIsRed(2);
-		return Response.ok(inspectService.getByInspect(inspect));
-	}
-
-	@ApiOperation(value = "与自己相关的已销项巡查列表", notes = "与自己相关的已销项巡查列表")
-	@RequestMapping(value = "/oneself", method = RequestMethod.POST)
-	public Response getByInspectSelf(@RequestBody Inspect inspect) {
-		long userId = ContextUtils.getCurrentUser().getId();
-		return Response.ok(inspectService.getByInspectSelf(inspect, userId));
-	}
-
-	@ApiOperation(value = "与自己相关的待办巡查列表", notes = "与自己相关的待办巡查列表")
-	@RequestMapping(value = "/oneself/{yuiProjectId}", method = RequestMethod.GET)
-	public Response stay(@PathVariable long yuiProjectId) {
-		long userId = ContextUtils.getCurrentUser().getId();
-		return Response.ok(inspectService.stay(yuiProjectId, userId));
-	}
-
-	@ApiOperation(value = "新增巡查", notes = "新增巡查")
-	@RequestMapping(value = "/", method = RequestMethod.POST)
-	public Response insertInspect(@RequestParam(value = "inspectType", required = false) Integer inspectType,
-			@RequestParam(value = "yuiProjectId", required = false) Long yuiProjectId,
-			@RequestParam(value = "yuiProjectItemId", required = false) Long yuiProjectItemId,
-			@RequestParam(value = "yuiProjectItemName", required = false) String yuiProjectItemName,
-			@RequestParam(value = "isRed", required = false) Integer isRed,
-			@RequestParam(value = "status", required = false) Integer status,
-			@RequestParam(value = "approveList", required = false) String approveList,
-			@RequestParam(value = "content", required = false) String content) {
-		Inspect inspect = new Inspect();
-		inspect.setDate(new Date());
-		inspect.setInspectType(inspectType == null ? 0 : inspectType);
-		inspect.setYuiProjectId(yuiProjectId == null ? 0 : yuiProjectId);
-		inspect.setYuiProjectItemId(yuiProjectItemId == null ? 0 : yuiProjectItemId);
-		inspect.setYuiProjectItemName(yuiProjectItemName);
-		inspect.setIsRed(isRed == null ? 0 : isRed);
-		inspect.setStatus(status == null ? 0 : status);
-		inspect.setApproveList(approveList);
-		inspect.setContent(content);
-		inspectService.addInspect(inspect);
-		return Response.ok(inspect);
-	}
-
-	@ApiOperation(value = "删除巡查", notes = "删除巡查")
-	@RequestMapping(value = "/", method = RequestMethod.DELETE)
-	public Response deleteInspect(@PathVariable long id) {
-		inspectService.deleteInspect(id);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "修改巡查", notes = "修改巡查")
-	@RequestMapping(value = "/", method = RequestMethod.PUT)
-	public Response updateInspect(@RequestParam(value = "id", required = true) long id,
-			@RequestParam(value = "yuiProjectId", required = false) Long yuiProjectId,
-			@RequestParam(value = "yuiProjectItemId", required = false) Long yuiProjectItemId,
-			@RequestParam(value = "yuiProjectItemName", required = false) String yuiProjectItemName,
-			@RequestParam(value = "isRed", required = false) Integer isRed,
-			@RequestParam(value = "status", required = false) Integer status,
-			@RequestParam(value = "approveList", required = false) String approveList,
-			@RequestParam(value = "content", required = false) String content) {
-		Inspect inspect = new Inspect();
-		inspect.setId(id);
-		inspect.setYuiProjectId(yuiProjectId == null ? 0 : yuiProjectId);
-		inspect.setYuiProjectItemId(yuiProjectItemId == null ? 0 : yuiProjectItemId);
-		inspect.setYuiProjectItemName(yuiProjectItemName);
-		inspect.setIsRed(isRed == null ? 0 : isRed);
-		inspect.setStatus(status == null ? 0 : status);
-		inspect.setApproveList(approveList);
-		inspect.setContent(content);
-		inspectService.updateInspect(inspect);
-		return Response.ok();
-	}
-
-}

+ 0 - 76
virgo.api/src/main/java/com/bosshand/virgo/api/controller/MaterialBatchController.java

@@ -1,76 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bosshand.virgo.api.model.MaterialBatch;
-import com.bosshand.virgo.api.service.MaterialBatchService;
-import com.bosshand.virgo.core.model.MgrUser;
-import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.core.utils.ContextUtils;
-
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-public class MaterialBatchController {
-
-	@Autowired
-	private MaterialBatchService materialBatchService;
-
-	@ApiOperation(value = "新增", notes = "新增")
-	@RequestMapping(value = "materialbatch", method = RequestMethod.POST)
-	public Response addMaterialBatch(@RequestBody MaterialBatch materialBatch) {
-		MgrUser user = ContextUtils.getCurrentUser();
-		materialBatch.setCreateBy(user.getName());
-		materialBatch.setCreateByUserId(user.getId());
-		return Response.ok(materialBatchService.save(materialBatch));
-	}
-
-	@ApiOperation(value = "编辑", notes = "编辑")
-	@RequestMapping(value = "materialbatch", method = RequestMethod.PUT)
-	public Response editMaterialBatch(@RequestBody MaterialBatch materialBatch) {
-		MgrUser user = ContextUtils.getCurrentUser();
-		materialBatch.setCreateBy(user.getName());
-		materialBatch.setCreateByUserId(user.getId());
-		return Response.ok(materialBatchService.update(materialBatch));
-	}
-
-	@ApiOperation(value = "删除", notes = "删除")
-	@RequestMapping(value = "materialbatch/{id}", method = RequestMethod.DELETE)
-	public Response delMaterialBatch(@PathVariable long id) {
-		materialBatchService.delete(id);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "查询列表", notes = "查询列表")
-	@RequestMapping(value = "materialbatch/queryList", method = RequestMethod.POST)
-	public Response getMaterialBatchByList(@RequestBody MaterialBatch materialBatch) {
-		return Response.ok(materialBatchService.queryByList(materialBatch));
-	}
-	
-	@ApiOperation(value = "查询", notes = "查询")
-	@RequestMapping(value = "materialbatch/query", method = RequestMethod.POST)
-	public Response getMaterialBatchByProjectId(@RequestBody MaterialBatch materialBatch) {
-		return Response.ok(materialBatchService.query(materialBatch));
-	}
-	
-	@ApiOperation(value = "分页查询", notes = "分页查询")
-	@RequestMapping(value = "materialbatch/query/{currPage}/{pageSize}", method = RequestMethod.POST)
-	public Response getMaterialBatchByProjectId(@RequestBody MaterialBatch materialBatch, @PathVariable int currPage, @PathVariable int pageSize) {
-		List<MaterialBatch> list = materialBatchService.query(materialBatch, currPage, pageSize);
-		List<MaterialBatch> totalCount = materialBatchService.query(materialBatch);
-		Map<String, Object> result = new HashMap<String, Object>();
-		result.put("dataList", list);
-		result.put("totalCount", totalCount.size());
-		return Response.ok(result);
-	}
-
-}

+ 0 - 44
virgo.api/src/main/java/com/bosshand/virgo/api/controller/MaterialCheckController.java

@@ -1,44 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.bosshand.virgo.api.model.MaterialCheck;
-import com.bosshand.virgo.api.service.MaterialCheckService;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("materialcheck")
-public class MaterialCheckController {
-
-    @Autowired
-    private MaterialCheckService materialcheckService;
-
-    @ApiOperation(value = "查询", notes = "查询")
-    @RequestMapping(value = "/query", method = RequestMethod.POST)
-    public Response getList(@RequestBody MaterialCheck materialCheck) {
-        return Response.ok(materialcheckService.getList(materialCheck));
-    }
-
-    @ApiOperation(value = "新增", notes = "新增")
-    @RequestMapping(value = "", method = RequestMethod.POST)
-    public Response add(@RequestBody MaterialCheck materialCheck) {
-        materialcheckService.save(materialCheck);
-        return Response.ok();
-    }
-
-    @ApiOperation(value = "编辑", notes = "编辑")
-    @RequestMapping(value = "", method = RequestMethod.PUT)
-    public Response edit(@RequestBody MaterialCheck materialCheck) {
-        materialcheckService.update(materialCheck);
-        return Response.ok();
-    }
-
-    @ApiOperation(value = "删除", notes = "删除")
-    @RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-    public Response edit(@PathVariable long id) {
-        materialcheckService.delete(id);
-        return Response.ok();
-    }
-
-}

+ 0 - 51
virgo.api/src/main/java/com/bosshand/virgo/api/controller/NoticeController.java

@@ -1,51 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import java.util.Date;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bosshand.virgo.api.model.Notice;
-import com.bosshand.virgo.api.service.NoticeService;
-import com.bosshand.virgo.core.response.Response;
-
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@RequestMapping("notice")
-public class NoticeController {
-
-	@Autowired
-	private NoticeService noticeService;
-
-	@ApiOperation(value = "项目公告", notes = "项目公告")
-	@RequestMapping(value = "/{yuiProjectId}", method = RequestMethod.GET)
-	public Response getNotice(@PathVariable long yuiProjectId) {
-		return Response.ok(noticeService.getByYuiProjectId(yuiProjectId));
-	}
-	
-	@ApiOperation(value = "项目公告删除", notes = "项目公告删除")
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-	public Response deleteNotice(@PathVariable long id) {
-		noticeService.deleteNotice(id);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "项目公告导入", notes = "项目公告导入")
-	@RequestMapping(value = "/noticeImport", method = RequestMethod.POST)
-	public Response insertNotice(
-		@RequestParam(value = "yuiProjectId", required = true) long yuiProjectId,
-		@RequestParam(value = "data", required = true) String data) {
-		Notice notice = new Notice();
-		notice.setDate(new Date());
-		notice.setData(data);
-		notice.setYuiProjectId(yuiProjectId);
-		noticeService.insert(notice);
-		return Response.ok();
-	}
-
-}

+ 0 - 111
virgo.api/src/main/java/com/bosshand/virgo/api/controller/PartItemMetaDataController.java

@@ -1,111 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bosshand.virgo.api.metadata.model.PartItemMetaData;
-import com.bosshand.virgo.api.metadata.model.PartItemMetadataFlowNode;
-import com.bosshand.virgo.api.metadata.service.PartItemMetaDataService;
-import com.bosshand.virgo.core.response.Response;
-
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@RequestMapping("part")
-public class PartItemMetaDataController {
-
-	@Autowired
-	PartItemMetaDataService partItemMetaDataService;
-
-	@ApiOperation(value = "项目类型", notes = "项目类型")
-	@RequestMapping(value = "/list", method = RequestMethod.GET)
-	public Response list() {
-		return Response.ok(partItemMetaDataService.getParentId(-1));
-	}
-	
-	@ApiOperation(value = "通过parentId获取", notes = "通过parentId获取")
-	@RequestMapping(value = "/list/{parentId}", method = RequestMethod.GET)
-	public Response listByParentId(@PathVariable long parentId) {
-		return Response.ok(partItemMetaDataService.getParentId(parentId));
-	}
-	
-	@ApiOperation(value = "类别树", notes = "类别树")
-	@RequestMapping(value = "/tree/{id}", method = RequestMethod.GET)
-	public Response getTree(@PathVariable long id) {
-		return Response.ok(partItemMetaDataService.getRootPartItemMetaData(id));
-	}
-	
-	@ApiOperation(value = "类别树", notes = "传多个id类别树")
-	@RequestMapping(value = "/tree/list/{ids}", method = RequestMethod.GET)
-	public Response getTree(@PathVariable String ids) {
-		return Response.ok(partItemMetaDataService.getList(ids));
-	}
-	
-	@ApiOperation(value = "最底层类别树", notes = "最底层类别树")
-	@RequestMapping(value = "/tree/checked/{ids}", method = RequestMethod.GET)
-	public Response getOnlyPartItemMetaData(@PathVariable String ids) {
-		return Response.ok(partItemMetaDataService.checked(ids));
-	}
-	
-	@ApiOperation(value = "json", notes = "json")
-	@RequestMapping(value = "/{typeId}", method = RequestMethod.GET)
-	public Response getTypeId(@PathVariable long typeId) {
-		return Response.ok(partItemMetaDataService.getTypeId(typeId));
-	}
-	
-	@ApiOperation(value = "类别树节点修改", notes = "类别树节点修改")
-	@RequestMapping(value = "/tree", method = RequestMethod.PUT)
-	public Response updatePartItemMetaData(@RequestBody PartItemMetaData partItemMetaData) {
-		return Response.ok(partItemMetaDataService.updatePartItemMetaData(partItemMetaData));
-	}
-	
-	@ApiOperation(value = "类别树节点IdentifyType批量修改", notes = "类别树节点IdentifyType批量修改")
-	@RequestMapping(value = "/tree/identifyType/{id}", method = RequestMethod.PUT)
-	public Response updatePartItemMetaDataByIdentifyType(@PathVariable long id) {
-		partItemMetaDataService.updatePartItemMetaDataByIdentifyType(id);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "类别树节点保存", notes = "类别树节点保存")
-	@RequestMapping(value = "/tree", method = RequestMethod.POST)
-	public Response savePartItemMetaData(@RequestBody PartItemMetaData partItemMetaData) {
-		return Response.ok(partItemMetaDataService.savePartItemMetaData(partItemMetaData));
-	}
-	
-	@ApiOperation(value = "类别树节点删除", notes = "类别树节点删除")
-	@RequestMapping(value = "/tree/{id}", method = RequestMethod.DELETE)
-	public Response deletePartItemMetaData(@PathVariable long id) {
-		partItemMetaDataService.deletePartItemMetaData(id);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "获取检验批", notes = "获取检验批")
-	@RequestMapping(value = "/partItem/{partItemIds}", method = RequestMethod.GET)
-	public Response getPartItemId(@PathVariable String partItemIds) {
-		return Response.ok(partItemMetaDataService.getPartItemIds(partItemIds));
-	}
-	
-	@ApiOperation(value = "修改检验批", notes = "修改检验批")
-	@RequestMapping(value = "/partItem", method = RequestMethod.PUT)
-	public Response updatePartItemMetadataFlowNode(@RequestBody PartItemMetadataFlowNode partItemMetadataFlowNode) {
-		return Response.ok(partItemMetaDataService.updatePartItemMetadataFlowNode(partItemMetadataFlowNode));
-	}
-	
-	@ApiOperation(value = "保存检验批", notes = "保存检验批")
-	@RequestMapping(value = "/partItem", method = RequestMethod.POST)
-	public Response savePartItemMetadataFlowNode(@RequestBody PartItemMetadataFlowNode partItemMetadataFlowNode){
-		return Response.ok(partItemMetaDataService.savePartItemMetadataFlowNode(partItemMetadataFlowNode));
-	}
-	
-	@ApiOperation(value = "删除检验批", notes = "删除检验批")
-	@RequestMapping(value = "/partItem/{id}", method = RequestMethod.DELETE)
-	public Response deletePartItemMetadataFlowNode(@PathVariable long id) {
-		partItemMetaDataService.deletePartItemMetadataFlowNode(id);
-		return Response.ok();
-	}
-
-}

+ 0 - 80
virgo.api/src/main/java/com/bosshand/virgo/api/controller/PointToPointController.java

@@ -1,80 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bosshand.virgo.api.model.PointToPoint;
-import com.bosshand.virgo.api.service.PointToPointService;
-import com.bosshand.virgo.core.model.MgrUser;
-import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.core.utils.ContextUtils;
-
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@RequestMapping("pointToPoint")
-public class PointToPointController {
-
-	@Autowired
-	private PointToPointService pointToPointService;
-
-	@ApiOperation(value = "详情", notes = "详情")
-	@RequestMapping(value = "/detail/{id}", method = RequestMethod.GET)
-	public Response getPointToPoint(@PathVariable long id) {
-		return Response.ok(pointToPointService.get(id));
-	}
-
-	@ApiOperation(value = "列表", notes = "列表")
-	@RequestMapping(value = "/{projectId}", method = RequestMethod.GET)
-	public Response getList(@PathVariable long projectId) {
-		MgrUser user = ContextUtils.getCurrentUser();
-		return Response.ok(pointToPointService.getList(user.getId(), projectId));
-	}
-
-	@ApiOperation(value = "待办数据", notes = "待办数据")
-	@RequestMapping(value = "/stay/{projectId}", method = RequestMethod.GET)
-	public Response stay(@PathVariable long projectId) {
-		return Response.ok(pointToPointService.stay(projectId));
-	}
-
-	@ApiOperation(value = "统计", notes = "统计")
-	@RequestMapping(value = "/census/{projectId}", method = RequestMethod.GET)
-	public Response census(@PathVariable long projectId) {
-		return Response.ok(pointToPointService.census(projectId));
-	}
-
-	@ApiOperation(value = "新增", notes = "新增")
-	@RequestMapping(value = "/", method = RequestMethod.POST)
-	public Response insert(@RequestBody PointToPoint pointToPoint) {
-		MgrUser user = ContextUtils.getCurrentUser();
-		pointToPoint.setSender(user.getId());
-		pointToPointService.insert(pointToPoint);
-		return Response.ok(pointToPoint);
-	}
-
-	@ApiOperation(value = "修改", notes = "修改")
-	@RequestMapping(value = "/", method = RequestMethod.PUT)
-	public Response update(@RequestBody PointToPoint pointToPoint) {
-		pointToPointService.update(pointToPoint);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "修改状态", notes = "修改状态")
-	@RequestMapping(value = "/{id}/{state}", method = RequestMethod.PUT)
-	public Response updateState(@PathVariable long id, @PathVariable int state) {
-		pointToPointService.updateState(id, state);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "删除", notes = "删除")
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-	public Response delete(@PathVariable long id) {
-		pointToPointService.delete(id);
-		return Response.ok();
-	}
-
-}

+ 0 - 73
virgo.api/src/main/java/com/bosshand/virgo/api/controller/ProjectController.java

@@ -1,16 +1,13 @@
 package com.bosshand.virgo.api.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bosshand.virgo.api.model.Project;
 import com.bosshand.virgo.api.service.ProjectService;
 import com.bosshand.virgo.core.model.MgrUser;
 import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.core.utils.AESUtil;
 import com.bosshand.virgo.core.utils.ContextUtils;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
@@ -35,24 +32,6 @@ public class ProjectController {
 		return Response.ok(result);
 	}
 
-	@ApiOperation(value = "获取项目中所有集成过的BIM", notes = "获取项目中所有集成过的BIM")
-	@RequestMapping(value = "/getBimByList", method = RequestMethod.GET)
-	public Response getBimByList() {
-		return Response.ok(projectService.getBimByList());
-	}
-
-	@ApiOperation(value = "获取项目下模型列表", notes = "获取项目下模型列表")
-	@RequestMapping(value = "/bimList/{id}", method = RequestMethod.GET)
-	public Response bimList(@PathVariable long id) {
-		return Response.ok(projectService.bimList(id));
-	}
-	
-	@ApiOperation(value = "项目管理", notes = "项目名称")
-	@RequestMapping(value = "/getProjectName/{yuiProjectId}", method = RequestMethod.GET)
-	public Response getProjectName(@PathVariable long yuiProjectId) {
-		return Response.ok(projectService.getByYuiProjectId(yuiProjectId));
-	}
-	
 	@ApiOperation(value = "项目管理", notes = "项目修改")
 	@RequestMapping(value = "/update", method = RequestMethod.PUT)
 	public Response updateProject(@RequestBody Project project) {
@@ -87,21 +66,6 @@ public class ProjectController {
 		projectService.insert(project);
 		return Response.ok(project);
 	}
-
-	@ApiOperation(value = "运营项目管理", notes = "运营项目新增")
-	@RequestMapping(value = "/operate/{operateOrganizationId}", method = RequestMethod.POST)
-	public Response insertOperateProject(@PathVariable long operateOrganizationId, @RequestBody Project project) {
-		project.setOperateOrganizationId(operateOrganizationId);
-		projectService.insertOperateProject(project);
-		return Response.ok(project);
-	}
-
-	@ApiOperation(value = "根据运营组织获取项目", notes = "根据运营组织获取项目列表")
-	@RequestMapping(value = "/operate/{operateOrganizationId}", method = RequestMethod.GET)
-	public Response getOperateOrganizationId(@PathVariable long operateOrganizationId) {
-		List<Project> list = projectService.getOperateOrganizationId(operateOrganizationId);
-		return Response.ok(list);
-	}
 	
 	@ApiOperation(value = "根据组织获取项目", notes = "根据组织获取项目列表")
 	@RequestMapping(value = "/{organizationId}/", method = RequestMethod.GET)
@@ -110,22 +74,6 @@ public class ProjectController {
 		return Response.ok(list);
 	}
 	
-	@ApiOperation(value = "从有极同步项目到协同平台", notes = "从有极同步项目到协同平台")
-	@RequestMapping(value = "/youji/{url}/", method = RequestMethod.GET)
-	public Response syncProject(@PathVariable String url) {
-		String result = projectService.syncProject(AESUtil.decrypt(url));
-		return Response.ok(JSON.parse(result));
-	}
-	
-	@ApiOperation(value = "协同平台删除有极项目", notes = "协同平台删除有极项目")
-	@RequestMapping(value = "/youji/{url}/delete/{id}/", method = RequestMethod.DELETE)
-	@Transactional
-	public Response deleteProjectByYui(@PathVariable long id, @PathVariable String url) {
-		projectService.syncProject(AESUtil.decrypt(url));
-		projectService.deleteProject(id);
-		return Response.ok();
-	}
-	
 	@ApiOperation(value="切换用户项目", notes="切换项目")
 	@RequestMapping(value = "/", method = RequestMethod.POST)
 	public Response saveLastProject(@RequestBody Project project) {
@@ -134,26 +82,5 @@ public class ProjectController {
 		//save user
 		return Response.ok();
 	}
-	
-	@ApiOperation(value = "获取有极审核过程", notes = "获取有极审核过程")
-	@RequestMapping(value = "/youji/flowApprover", method = RequestMethod.GET)
-	public Response flowApprover(@RequestParam(value="flowId", required=true) long flowId, @RequestParam(value="projectId", required=true) long projectId, 
-			@RequestParam(value="url", required=true) String url) {
-		String path = url + "/projectVision/showDetail?projectFlowId=" + flowId +"&projectId="+ projectId;
-		return Response.ok(JSON.parse(projectService.flowApprover(path)));
-	}
-	
-	@ApiOperation(value = "获取有极单位工程结构", notes = "获取有极单位工程结构")
-	@RequestMapping(value = "/youji/showPartItem", method = RequestMethod.POST)
-	public Response insertFlowYuiData(@RequestParam(value="url", required=true) String url) {
-		return Response.ok(JSON.parse(projectService.flowApprover(url)));
-	}
-
-	@ApiOperation(value = "重新部署后重新启动周报任务", notes = "重新部署后重新启动周报任务")
-	@RequestMapping(value = "/regenerate/{projectId}", method = RequestMethod.GET)
-	public Response regenerate(@PathVariable long projectId) {
-		projectService.regenerate(projectId);
-		return Response.ok();
-	}
 
 }

+ 0 - 69
virgo.api/src/main/java/com/bosshand/virgo/api/controller/ProjectFlowMetaDataController.java

@@ -1,69 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bosshand.virgo.api.metadata.model.ProjectFlowApproverMetaData;
-import com.bosshand.virgo.api.metadata.model.ProjectFlowMetaData;
-import com.bosshand.virgo.api.metadata.service.ProjectFlowApproverMetaDataService;
-import com.bosshand.virgo.api.metadata.service.ProjectFlowMetaDataService;
-import com.bosshand.virgo.core.response.Response;
-
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@RequestMapping("projectFlowMetaData")
-public class ProjectFlowMetaDataController {
-	
-	@Autowired
-	ProjectFlowMetaDataService projectFlowMetaDataService;
-	
-	@Autowired
-	ProjectFlowApproverMetaDataService projectFlowApproverMetaDataService;
-	
-	@ApiOperation(value = "流程模板", notes = "流程模板列表")
-	@RequestMapping(value = "/", method = RequestMethod.GET)
-	public Response getList() {
-		return Response.ok(projectFlowMetaDataService.getList());
-	}
-	
-	@ApiOperation(value = "流程模板", notes = "流程模板新增")
-	@RequestMapping(value = "/", method = RequestMethod.POST)
-	public Response insert(@RequestBody ProjectFlowMetaData projectFlowMetaData) {
-		projectFlowMetaDataService.save(projectFlowMetaData);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "流程模板", notes = "流程模板修改")
-	@RequestMapping(value = "/", method = RequestMethod.PUT)
-	public Response update(@RequestBody ProjectFlowMetaData projectFlowMetaDat) {
-		projectFlowMetaDataService.update(projectFlowMetaDat);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "流程模板", notes = "流程模板删除")
-	@RequestMapping(value = "/{id}", method = RequestMethod.DELETE)
-	public Response delete(@PathVariable long id) {
-		projectFlowMetaDataService.delete(id);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "流程模板节点", notes = "流程模板节点新增")
-	@RequestMapping(value = "/node", method = RequestMethod.POST)
-	public Response insert(@RequestBody ProjectFlowApproverMetaData projectFlowApproverMetaData) {
-		projectFlowApproverMetaDataService.save(projectFlowApproverMetaData);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "流程模板节点", notes = "流程模板节点删除")
-	@RequestMapping(value = "/node/{id}", method = RequestMethod.DELETE)
-	public Response deleteNode(@PathVariable long id) {
-		projectFlowApproverMetaDataService.delete(id);
-		return Response.ok();
-	}
-
-}

+ 5 - 95
virgo.api/src/main/java/com/bosshand/virgo/api/controller/ProjectItemController.java

@@ -1,10 +1,11 @@
 package com.bosshand.virgo.api.controller;
 
-import com.bosshand.virgo.api.model.*;
+import com.bosshand.virgo.api.model.ProjectItem;
+import com.bosshand.virgo.api.model.ProjectItemTarget;
+import com.bosshand.virgo.api.model.ProjectItemTargetRoom;
 import com.bosshand.virgo.api.service.ProjectItemService;
 import com.bosshand.virgo.api.service.ProjectService;
 import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.core.utils.AESUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -46,27 +47,13 @@ public class ProjectItemController {
 	public Response getProjectItemList(@PathVariable long projectId) {
 		return Response.ok(projectItemService.getProjectItemList(projectId));
 	}
-	
-	@ApiOperation(value = "单位工程管理", notes = "单位工程集成次数修改")
-	@RequestMapping(value = "/update/integrate/{projectItemId}", method = RequestMethod.PUT)
-	public Response updateProjectItemIntegrateNumber(@PathVariable long projectItemId) {
-		projectItemService.updateProjectItemIntegrateNumber(projectItemId);
-		return Response.ok();
-	}
-	
+
 	@ApiOperation(value = "单位工程管理", notes = "单位工程信息")
 	@RequestMapping(value = "/projectItem/{projectItemId}", method = RequestMethod.GET)
 	public Response getProjectItem(@PathVariable long projectItemId) {
 		return Response.ok(projectItemService.getProjectItem(projectItemId));
 	}
-	
-	@ApiOperation(value = "同步有极单位工程", notes = "同步有极单位工程")
-	@RequestMapping(value = "youji/{url}/project/{projectId}/", method = RequestMethod.GET)
-	public Response syncProjectItem(@PathVariable String url, @PathVariable long projectId) {
-		String result = projectService.syncProject(AESUtil.decrypt(url));
-		return Response.ok(projectItemService.syncProjectItem(projectId, result));
-	}
-	
+
 	@ApiOperation(value = "获取指定项目中所有organizationId", notes = "获取指定项目中所有organizationId")
 	@RequestMapping(value = "/organization/{projectId}", method = RequestMethod.GET)
 	public Response getOrganizationIds(@PathVariable long projectId) {
@@ -150,82 +137,5 @@ public class ProjectItemController {
 	public Response getProjectItemTargetRoom(@PathVariable long id) {
 		return Response.ok(projectItemService.getByProjectItemTargetRootId(id));
 	}
-	
-	@ApiOperation(value = "bim绑定", notes = "获取")
-	@RequestMapping(value = "/target/{projectItemTargetId}", method = RequestMethod.GET)
-	public Response getBimModelTarget(@PathVariable long projectItemTargetId) {
-		return Response.ok(projectItemService.getBimModelTarget(projectItemTargetId));
-	}
-	
-	@ApiOperation(value = "bim绑定", notes = "绑定")
-	@RequestMapping(value = "/target", method = RequestMethod.POST)
-	public Response saveBimModelTarget(@RequestBody BimModelTarget bimModelTarget) {
-		projectItemService.saveBimModelTarget(bimModelTarget);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "bim绑定", notes = "修改")
-	@RequestMapping(value = "/target", method = RequestMethod.PUT)
-	public Response updateBimModelTarget(@RequestBody BimModelTarget bimModelTarget) {
-		projectItemService.updateBimModelTarget(bimModelTarget);
-		return Response.ok();
-	}
-	
-	//*******************************************************************
-	
-	@ApiOperation(value = "bim类型列表", notes = "bim类型列表")
-	@RequestMapping(value = "/bimType", method = RequestMethod.GET)
-	public Response getBimTypeList() {
-		return Response.ok(projectItemService.getBimTypeList());
-	}
-	
-	@ApiOperation(value = "bim类型保存", notes = "bim类型保存")
-	@RequestMapping(value = "/bimType", method = RequestMethod.POST)
-	public Response saveBimType(@RequestBody BimType bimType) {
-		projectItemService.saveBimType(bimType);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "bim类型修改", notes = "bim类型修改")
-	@RequestMapping(value = "/bimType", method = RequestMethod.PUT)
-	public Response updateBimType(@RequestBody BimType bimType) {
-		projectItemService.updateBimType(bimType);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "bim类型删除", notes = "bim类型删除")
-	@RequestMapping(value = "/bimType/{id}", method = RequestMethod.DELETE)
-	public Response deleteBimType(@PathVariable int id) {
-		projectItemService.deleteBimType(id);
-		return Response.ok();
-	}
-	
-	//*******************************************************************
 
-	@ApiOperation(value = "IdentifyType类型列表", notes = "IdentifyType类型列表")
-	@RequestMapping(value = "/identifyType", method = RequestMethod.GET)
-	public Response getIdentifyTypeList() {
-		return Response.ok(projectItemService.getIdentifyTypeList());
-	}
-	
-	@ApiOperation(value = "IdentifyType类型保存", notes = "IdentifyType类型保存")
-	@RequestMapping(value = "/identifyType", method = RequestMethod.POST)
-	public Response saveIdentifyType(@RequestBody IdentifyType identifyType) {
-		projectItemService.saveIdentifyType(identifyType);
-		return Response.ok(identifyType);
-	}
-	
-	@ApiOperation(value = "IdentifyType类型修改", notes = "IdentifyType类型修改")
-	@RequestMapping(value = "/identifyType", method = RequestMethod.PUT)
-	public Response updateIdentifyType(@RequestBody IdentifyType identifyType) {
-		projectItemService.updateIdentifyType(identifyType);
-		return Response.ok(identifyType);
-	}
-	
-	@ApiOperation(value = "IdentifyType类型删除", notes = "IdentifyType类型删除")
-	@RequestMapping(value = "/identifyType/{id}", method = RequestMethod.DELETE)
-	public Response deleteIdentifyType(@PathVariable int id) {
-		projectItemService.deleteIdentifyType(id);
-		return Response.ok();
-	}
 }

+ 0 - 69
virgo.api/src/main/java/com/bosshand/virgo/api/controller/RectificationController.java

@@ -1,69 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.bosshand.virgo.api.model.Rectification;
-import com.bosshand.virgo.api.service.RectificationService;
-import com.bosshand.virgo.core.model.MgrUser;
-import com.bosshand.virgo.core.response.Response;
-import com.bosshand.virgo.core.utils.ContextUtils;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-public class RectificationController {
-
-    @Autowired
-    private RectificationService rectificationService;
-
-    @ApiOperation(value = "新增", notes = "新增")
-    @RequestMapping(value = "/rectification", method = RequestMethod.POST)
-    public Response add(@RequestBody Rectification rectification) {
-        Rectification rf = new Rectification();
-        rf.setFlowSynergyDataId(rectification.getFlowSynergyDataId());
-        List<Rectification> rfs = rectificationService.getList(rf);
-        if (rfs.size() > 0) {
-            rectification.setId(rfs.get(0).getId());
-            rectificationService.update(rectification);
-            return Response.ok(rectification);
-        }
-        MgrUser user = ContextUtils.getCurrentUser();
-        rectification.setCreateUserId(user.getId());
-        rectification.setCreateUserName(user.getName());
-        return Response.ok(rectificationService.insert(rectification));
-    }
-
-    @ApiOperation(value = "编辑", notes = "编辑")
-    @RequestMapping(value = "/rectification", method = RequestMethod.PUT)
-    public Response edit(@RequestBody Rectification rectification) {
-        return Response.ok(rectificationService.update(rectification));
-    }
-
-    @ApiOperation(value = "删除", notes = "删除")
-    @RequestMapping(value = "/rectification/{id}", method = RequestMethod.DELETE)
-    public Response del(@PathVariable long id) {
-        rectificationService.delete(id);
-        return Response.ok();
-    }
-
-    @ApiOperation(value = "查询", notes = "查询")
-    @RequestMapping(value = "/rectification/query", method = RequestMethod.POST)
-    public Response getList(@RequestBody Rectification rectification) {
-        return Response.ok(rectificationService.getList(rectification));
-    }
-
-    @ApiOperation(value = "分页查询", notes = "分页查询")
-    @RequestMapping(value = "/rectification/{currPage}/{pageSize}", method = RequestMethod.POST)
-    public Response listLimit(@RequestBody Rectification rectification, @PathVariable int currPage, @PathVariable int pageSize) {
-        List<Rectification> list = rectificationService.getList(rectification, currPage, pageSize);
-        List<Rectification> totalCount = rectificationService.getList(rectification);
-        Map<String, Object> result = new HashMap<String, Object>();
-        result.put("dataList", list);
-        result.put("totalCount", totalCount.size());
-        return Response.ok(result);
-    }
-
-}

+ 0 - 213
virgo.api/src/main/java/com/bosshand/virgo/api/controller/SetUpController.java

@@ -1,213 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.bosshand.virgo.api.model.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bosshand.virgo.api.service.SetUpService;
-import com.bosshand.virgo.core.response.Response;
-
-import io.swagger.annotations.ApiOperation;
-
-import java.util.List;
-
-@RestController
-@RequestMapping("setup")
-public class SetUpController {
-	
-	@Autowired
-	private SetUpService setUpService;
-	
-	@ApiOperation(value = "查询工种", notes = "查询工种")
-	@RequestMapping(value = "/workType/{projectId}", method = RequestMethod.GET)
-	public Response getWorkType(@PathVariable long projectId) {
-		return Response.ok(setUpService.getWorkTypeProjectId(projectId));
-	}
-	
-	@ApiOperation(value = "新增工种", notes = "新增工种")
-	@RequestMapping(value = "/workType", method = RequestMethod.POST)
-	public Response addWorkType(@RequestBody WorkType workType) {
-		return Response.ok(setUpService.saveWorkType(workType));
-	}
-	
-	@ApiOperation(value = "编辑工种", notes = "编辑工种")
-	@RequestMapping(value = "/workType", method = RequestMethod.PUT)
-	public Response editWorkType(@RequestBody WorkType workType) {
-		return Response.ok(setUpService.updateWorkType(workType));
-	}
-	
-	@ApiOperation(value = "删除工种", notes = "删除工种")
-	@RequestMapping(value = "/workType/{id}", method = RequestMethod.DELETE)
-	public Response delWorkType(@PathVariable long id) {
-		setUpService.deleteWorkType(id);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "查询仓库", notes = "查询仓库")
-	@RequestMapping(value = "/warehouse/{projectId}", method = RequestMethod.GET)
-	public Response getWarehouse(@PathVariable long projectId) {
-		return Response.ok(setUpService.getWarehouseProjectId(projectId));
-	}
-	
-	@ApiOperation(value = "新增仓库", notes = "新增仓库")
-	@RequestMapping(value = "/warehouse", method = RequestMethod.POST)
-	public Response addWarehouse(@RequestBody Warehouse warehouse) {
-		return Response.ok(setUpService.saveWarehouse(warehouse));
-	}
-	
-	@ApiOperation(value = "编辑仓库", notes = "编辑仓库")
-	@RequestMapping(value = "/warehouse", method = RequestMethod.PUT)
-	public Response editWarehouse(@RequestBody Warehouse warehouse) {
-		return Response.ok(setUpService.updateWarehouse(warehouse));
-	}
-	
-	@ApiOperation(value = "删除仓库", notes = "删除仓库")
-	@RequestMapping(value = "/warehouse/{id}", method = RequestMethod.DELETE)
-	public Response delWarehouse(@PathVariable long id) {
-		setUpService.deleteWarehouse(id);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "查询设备", notes = "查询设备")
-	@RequestMapping(value = "/equipment/query", method = RequestMethod.POST)
-	public Response getEquipmentQuery(@RequestBody Equipment equipment) {
-		return Response.ok(setUpService.getEquipmentQuery(equipment));
-	}
-
-	@ApiOperation(value = "查询设备", notes = "查询设备")
-	@RequestMapping(value = "/equipment/{projectId}", method = RequestMethod.GET)
-	public Response getEquipment(@PathVariable long projectId) {
-		return Response.ok(setUpService.getEquipmentProjectId(projectId));
-	}
-	
-	@ApiOperation(value = "新增设备", notes = "新增设备")
-	@RequestMapping(value = "/equipment", method = RequestMethod.POST)
-	public Response addEquipment(@RequestBody Equipment equipment) {
-		return Response.ok(setUpService.saveEquipment(equipment));
-	}
-	
-	@ApiOperation(value = "编辑设备", notes = "编辑设备")
-	@RequestMapping(value = "/equipment", method = RequestMethod.PUT)
-	public Response editEquipment(@RequestBody Equipment equipment) {
-		return Response.ok(setUpService.updateEquipment(equipment));
-	}
-	
-	@ApiOperation(value = "删除设备", notes = "删除设备")
-	@RequestMapping(value = "/equipment/{id}", method = RequestMethod.DELETE)
-	public Response delEquipment(@PathVariable long id) {
-		setUpService.deleteEquipment(id);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "查询环境", notes = "查询环境")
-	@RequestMapping(value = "/environment/query", method = RequestMethod.POST)
-	public Response getEnvironmentQuery(@RequestBody Environment environment) {
-		return Response.ok(setUpService.getEnvironmentQuery(environment));
-	}
-
-	@ApiOperation(value = "查询环境", notes = "查询环境")
-	@RequestMapping(value = "/environment/{projectId}", method = RequestMethod.GET)
-	public Response getEnvironment(@PathVariable long projectId) {
-		return Response.ok(setUpService.getEnvironmentProjectId(projectId));
-	}
-
-	@ApiOperation(value = "新增环境", notes = "新增环境")
-	@RequestMapping(value = "/environment", method = RequestMethod.POST)
-	public Response addEnvironment(@RequestBody Environment environment) {
-		return Response.ok(setUpService.saveEnvironment(environment));
-	}
-
-	@ApiOperation(value = "编辑环境", notes = "编辑环境")
-	@RequestMapping(value = "/environment", method = RequestMethod.PUT)
-	public Response editEnvironment(@RequestBody Environment environment) {
-		return Response.ok(setUpService.updateEnvironment(environment));
-	}
-
-	@ApiOperation(value = "删除环境", notes = "删除环境")
-	@RequestMapping(value = "/environment/{id}", method = RequestMethod.DELETE)
-	public Response delEnvironment(@PathVariable long id) {
-		setUpService.deleteEnvironment(id);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "删除环境类型", notes = "删除环境类型")
-	@RequestMapping(value = "/environmentType/{id}", method = RequestMethod.DELETE)
-	public Response deleteEnvironmentType(@PathVariable long id) {
-		setUpService.deleteEnvironmentType(id);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "保存环境类型", notes = "保存环境类型")
-	@RequestMapping(value = "/environmentType", method = RequestMethod.POST)
-	public Response saveEnvironmentType(@RequestBody EnvironmentType environmentType) {
-		return Response.ok(setUpService.saveEnvironmentType(environmentType));
-	}
-
-	@ApiOperation(value = "修改环境类型", notes = "修改环境类型")
-	@RequestMapping(value = "/environmentType", method = RequestMethod.PUT)
-	public Response updateEnvironmentType(@RequestBody EnvironmentType environmentType) {
-		return Response.ok(setUpService.updateEnvironmentType(environmentType));
-	}
-
-	@ApiOperation(value = "查询环境类型", notes = "查询环境类型")
-	@RequestMapping(value = "/environmentType", method = RequestMethod.GET)
-	public Response getEnvironmentTypeList() {
-		return Response.ok(setUpService.getEnvironmentTypeList());
-	}
-
-	@ApiOperation(value = "删除设备类型", notes = "删除设备类型")
-	@RequestMapping(value = "/equipmentType/{id}", method = RequestMethod.DELETE)
-	public Response deleteEquipmentType(@PathVariable long id) {
-		setUpService.deleteEquipmentType(id);
-		return Response.ok();
-	}
-
-	@ApiOperation(value = "保存设备类型", notes = "保存设备类型")
-	@RequestMapping(value = "/equipmentType", method = RequestMethod.POST)
-	public Response saveEquipmentType(@RequestBody EquipmentType equipmentType) {
-		return Response.ok(setUpService.saveEquipmentType(equipmentType));
-	}
-
-	@ApiOperation(value = "修改设备类型", notes = "修改设备类型")
-	@RequestMapping(value = "/equipmentType", method = RequestMethod.PUT)
-	public Response updateEquipmentType(@RequestBody EquipmentType equipmentType) {
-		return Response.ok(setUpService.updateEquipmentType(equipmentType));
-	}
-
-	@ApiOperation(value = "查询设备类型", notes = "查询设备类型")
-	@RequestMapping(value = "/equipmentType", method = RequestMethod.GET)
-	public Response getEquipmentTypeList() {
-		return Response.ok(setUpService.getEquipmentTypeList());
-	}
-
-
-	@ApiOperation(value = "获取材料分类", notes = "获取材料分类")
-	@RequestMapping(value = "/materialcategory", method = RequestMethod.GET)
-	public Response getMaterialCategory() {
-		return Response.ok(setUpService.getNodeTreeById(1));
-	}
-	
-	@ApiOperation(value = "新增材料分类", notes = "新增材料分类")
-	@RequestMapping(value = "/materialcategory", method = RequestMethod.POST)
-	public Response addMaterialCategory(@RequestBody MaterialCategory materialCategory) {
-		return Response.ok(setUpService.saveMaterialCategory(materialCategory));
-	}
-	
-	@ApiOperation(value = "编辑材料分类", notes = "编辑材料分类")
-	@RequestMapping(value = "/materialcategory", method = RequestMethod.PUT)
-	public Response editMaterialCategory(@RequestBody MaterialCategory materialcategory) {
-		return Response.ok(setUpService.updateMaterialCategory(materialcategory));
-	}
-	
-	@ApiOperation(value = "删除材料分类", notes = "删除材料分类")
-	@RequestMapping(value = "/materialcategory/{id}", method = RequestMethod.DELETE)
-	public Response delMaterialCategory(@PathVariable long id) {
-		setUpService.deleteMaterialCategory(id);
-		return Response.ok();
-	}
-	
-}

+ 0 - 41
virgo.api/src/main/java/com/bosshand/virgo/api/controller/SignOnBehalfControler.java

@@ -1,41 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-
-import com.bosshand.virgo.api.model.SignOnBehalf;
-import com.bosshand.virgo.api.service.SignOnBehalfService;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("signonbehalf")
-public class SignOnBehalfControler {
-
-    @Autowired
-    private SignOnBehalfService signOnBehalfService;
-
-    @ApiOperation(value = "查询", notes = "查询")
-    @RequestMapping(value = "/query", method = RequestMethod.POST)
-    public Response getList(@RequestBody SignOnBehalf signOnBehalf) {
-        return Response.ok(signOnBehalfService.getList(signOnBehalf));
-    }
-
-    @ApiOperation(value = "新增", notes = "新增")
-    @RequestMapping(value = "", method = RequestMethod.POST)
-    public Response add(@RequestBody SignOnBehalf signOnBehalf) {
-        signOnBehalfService.save(signOnBehalf);
-        return Response.ok();
-    }
-
-    @ApiOperation(value = "编辑", notes = "编辑")
-    @RequestMapping(value = "", method = RequestMethod.PUT)
-    public Response edit(@RequestBody SignOnBehalf signOnBehalf) {
-        signOnBehalfService.update(signOnBehalf);
-        return Response.ok();
-    }
-
-}

+ 0 - 51
virgo.api/src/main/java/com/bosshand/virgo/api/controller/TypeCascadeController.java

@@ -1,51 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.bosshand.virgo.api.model.TypeCascade;
-import com.bosshand.virgo.api.service.TypeCascadeService;
-import com.bosshand.virgo.core.response.Response;
-
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@RequestMapping("typeCascade")
-public class TypeCascadeController {
-	
-	@Autowired
-	private TypeCascadeService typeCascadeService;
-	
-	@ApiOperation(value = "新增", notes = "新增")
-	@RequestMapping(value = "/tree", method = RequestMethod.POST)
-	public Response addTree(@RequestBody TypeCascade typeCascade) {
-		return Response.ok(typeCascadeService.addTree(typeCascade));
-	}
-	
-	@ApiOperation(value = "编辑", notes = "编辑")
-	@RequestMapping(value = "/tree", method = RequestMethod.PUT)
-	public Response editTree(@RequestBody TypeCascade typeCascade) {
-		return Response.ok(typeCascadeService.updateTree(typeCascade));
-	}
-	
-	@ApiOperation(value = "删除", notes = "删除")
-	@RequestMapping(value = "/tree/{id}", method = RequestMethod.DELETE)
-	public Response delTree(@PathVariable long id) {
-		typeCascadeService.delTree(id);
-		return Response.ok();
-	}
-	
-	@ApiOperation(value = "级联树", notes = "级联树")
-	@RequestMapping(value = "/tree/{id}", method = RequestMethod.GET)
-	public Response getTree(@PathVariable long id) {
-		if(id == -1) {
-			return Response.ok(typeCascadeService.getParentId(id));
-		}
-		return Response.ok(typeCascadeService.getRoot(id));
-	}
-
-}

+ 0 - 80
virgo.api/src/main/java/com/bosshand/virgo/api/controller/WeeklyController.java

@@ -1,80 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.bosshand.virgo.api.model.Weekly;
-import com.bosshand.virgo.api.model.WeeklySet;
-import com.bosshand.virgo.api.model.WeeklyType;
-import com.bosshand.virgo.api.service.WeeklyService;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("weekly")
-public class WeeklyController {
-
-    @Autowired
-    private WeeklyService weeklyService;
-
-    @ApiOperation(value = "根据project获取周报", notes = "根据project获取周报")
-    @RequestMapping(value = "/{projectId}", method = RequestMethod.GET)
-    public Response list(@PathVariable long projectId) {
-        return Response.ok(weeklyService.getByProjectId(projectId));
-    }
-
-    @ApiOperation(value = "获取提交出来的周报", notes = "获取提交出来的周报")
-    @RequestMapping(value = "/submit/{projectId}", method = RequestMethod.GET)
-    public Response listProjectSubmit(@PathVariable long projectId) {
-        return Response.ok(weeklyService.getByProject(projectId));
-    }
-
-    @ApiOperation(value = "获取与自己企业相关的提交出来的周报", notes = "根据project获取提交出来的周报")
-    @RequestMapping(value = "/submit/{organizationId}/{projectId}", method = RequestMethod.GET)
-    public Response listOrganizationSubmit(@PathVariable long organizationId, @PathVariable long projectId) {
-        return Response.ok(weeklyService.getByOrganization(organizationId, projectId));
-    }
-
-    @ApiOperation(value = "修改周报状态", notes = "修改周报状态")
-    @RequestMapping(method = RequestMethod.PUT)
-    public Response updateState(@RequestBody Weekly weekly) {
-        return Response.ok(weeklyService.updateState(weekly));
-    }
-
-    @ApiOperation(value = "周报类型详情", notes = "周报类型详情")
-    @RequestMapping(value = "/type/{weeklyId}", method = RequestMethod.GET)
-    public Response getWeeklyType(@PathVariable long weeklyId) {
-        return Response.ok(weeklyService.getByWeeklyId(weeklyId));
-    }
-
-    @ApiOperation(value = "新增类型", notes = "新增类型")
-    @RequestMapping(value = "/type", method = RequestMethod.POST)
-    public Response addWeeklyType(@RequestBody WeeklyType weeklyType) {
-        return Response.ok(weeklyService.saveWeeklyType(weeklyType));
-    }
-
-    @ApiOperation(value = "编辑类型", notes = "编辑类型")
-    @RequestMapping(value = "/type", method = RequestMethod.PUT)
-    public Response editWeeklyType(@RequestBody WeeklyType weeklyType) {
-        return Response.ok(weeklyService.updateWeeklyType(weeklyType));
-    }
-
-    @ApiOperation(value = "新增配置", notes = "新增配置")
-    @RequestMapping(value = "/set", method = RequestMethod.POST)
-    public Response saveWeeklySet(@RequestBody WeeklySet weeklySet) {
-        return Response.ok(weeklyService.saveWeeklySet(weeklySet));
-    }
-
-    @ApiOperation(value = "编辑配置", notes = "编辑配置")
-    @RequestMapping(value = "/set", method = RequestMethod.PUT)
-    public Response updateWeeklySet(@RequestBody WeeklySet weeklySet) {
-        return Response.ok(weeklyService.updateWeeklySet(weeklySet));
-    }
-
-    @ApiOperation(value = "获取配置", notes = "获取配置")
-    @RequestMapping(value = "/set/query", method = RequestMethod.POST)
-    public Response getByWeeklySet(@RequestBody WeeklySet weeklySet) {
-        return Response.ok(weeklyService.getByWeeklySet(weeklySet));
-    }
-
-
-}

+ 0 - 60
virgo.api/src/main/java/com/bosshand/virgo/api/controller/WeeklyPersonController.java

@@ -1,60 +0,0 @@
-package com.bosshand.virgo.api.controller;
-
-import com.bosshand.virgo.api.model.WeeklyPerson;
-import com.bosshand.virgo.api.model.WeeklyTypePerson;
-import com.bosshand.virgo.api.service.WeeklyPersonService;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("weeklyPerson")
-public class WeeklyPersonController {
-
-    @Autowired
-    private WeeklyPersonService weeklyPersonService;
-
-    @ApiOperation(value = "获取周报列表", notes = "获取周报列表")
-    @RequestMapping(value = "/{organizationId}/{projectId}/{userId}", method = RequestMethod.GET)
-    public Response list(@PathVariable long organizationId, @PathVariable long projectId, @PathVariable long userId) {
-        return Response.ok(weeklyPersonService.getList(organizationId,projectId, userId));
-    }
-
-    @ApiOperation(value = "根据期数获取周报", notes = "根据期数获取周报")
-    @RequestMapping(value = "/number/{organizationId}/{projectId}/{userId}/{number}", method = RequestMethod.GET)
-    public Response getNumber(@PathVariable long organizationId, @PathVariable long projectId, @PathVariable long userId, @PathVariable int number) {
-        return Response.ok(weeklyPersonService.getNumber(organizationId,projectId,userId,number));
-    }
-
-    @ApiOperation(value = "根据状态获取周报", notes = "根据状态获取周报")
-    @RequestMapping(value = "/{organizationId}/{projectId}/{userId}/{state}", method = RequestMethod.GET)
-    public Response listState(@PathVariable long organizationId, @PathVariable long projectId, @PathVariable long userId, @PathVariable int state) {
-        return Response.ok(weeklyPersonService.getState(organizationId, projectId, userId, state));
-    }
-
-    @ApiOperation(value = "修改个人周报状态", notes = "修改个人周报状态")
-    @RequestMapping(method = RequestMethod.PUT)
-    public Response updateState(@RequestBody WeeklyPerson weeklyPerson) {
-        return Response.ok(weeklyPersonService.updateState(weeklyPerson));
-    }
-
-    @ApiOperation(value = "个人周报类型详情", notes = "个人周报类型详情")
-    @RequestMapping(value = "/type/{weeklyPersonId}", method = RequestMethod.GET)
-    public Response getWeeklyTypePerson(@PathVariable long weeklyPersonId) {
-        return Response.ok(weeklyPersonService.getByWeeklyPersonId(weeklyPersonId));
-    }
-
-    @ApiOperation(value = "新增类型", notes = "新增类型")
-    @RequestMapping(value = "/type", method = RequestMethod.POST)
-    public Response addWeeklyTypePerson(@RequestBody WeeklyTypePerson weeklyTypePerson) {
-        return Response.ok(weeklyPersonService.saveWeeklyTypePerson(weeklyTypePerson));
-    }
-
-    @ApiOperation(value = "编辑类型", notes = "编辑类型")
-    @RequestMapping(value = "/type", method = RequestMethod.PUT)
-    public Response editWeeklyTypePerson(@RequestBody WeeklyTypePerson weeklyTypePerson) {
-        return Response.ok(weeklyPersonService.updateWeeklyTypePerson(weeklyTypePerson));
-    }
-
-}

+ 0 - 60
virgo.api/src/main/java/com/bosshand/virgo/api/controller/operate/OperateWeeklyCompanyController.java

@@ -1,60 +0,0 @@
-package com.bosshand.virgo.api.controller.operate;
-
-import com.bosshand.virgo.api.model.operate.OperateWeeklyCompany;
-import com.bosshand.virgo.api.model.operate.OperateWeeklyTypeCompany;
-import com.bosshand.virgo.api.service.operate.OperateWeeklyCompanyService;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("operateWeeklyCompany")
-public class OperateWeeklyCompanyController {
-
-    @Autowired
-    private OperateWeeklyCompanyService operateWeeklyCompanyService;
-
-    @ApiOperation(value = "根据project获取周报", notes = "根据project获取周报")
-    @RequestMapping(value = "/{projectId}", method = RequestMethod.GET)
-    public Response list(@PathVariable long projectId) {
-        return Response.ok(operateWeeklyCompanyService.getByProjectId(projectId));
-    }
-
-    @ApiOperation(value = "获取提交出来的周报", notes = "获取提交出来的周报")
-    @RequestMapping(value = "/submit/{projectId}", method = RequestMethod.GET)
-    public Response listProjectSubmit(@PathVariable long projectId) {
-        return Response.ok(operateWeeklyCompanyService.getByProject(projectId));
-    }
-
-    @ApiOperation(value = "获取与自己企业相关的提交出来的周报", notes = "根据project获取提交出来的周报")
-    @RequestMapping(value = "/submit/{organizationId}/{projectId}", method = RequestMethod.GET)
-    public Response listOrganizationSubmit(@PathVariable long organizationId, @PathVariable long projectId) {
-        return Response.ok(operateWeeklyCompanyService.getByOrganization(organizationId, projectId));
-    }
-
-    @ApiOperation(value = "修改周报状态", notes = "修改周报状态")
-    @RequestMapping(method = RequestMethod.PUT)
-    public Response updateState(@RequestBody OperateWeeklyCompany operateWeeklyCompany) {
-        return Response.ok(operateWeeklyCompanyService.updateState(operateWeeklyCompany));
-    }
-
-    @ApiOperation(value = "周报类型详情", notes = "周报类型详情")
-    @RequestMapping(value = "/type/{weeklyId}", method = RequestMethod.GET)
-    public Response getWeeklyType(@PathVariable long weeklyId) {
-        return Response.ok(operateWeeklyCompanyService.getByWeeklyId(weeklyId));
-    }
-
-    @ApiOperation(value = "新增类型", notes = "新增类型")
-    @RequestMapping(value = "/type", method = RequestMethod.POST)
-    public Response addWeeklyType(@RequestBody OperateWeeklyTypeCompany operateWeeklyTypeCompany) {
-        return Response.ok(operateWeeklyCompanyService.saveWeeklyType(operateWeeklyTypeCompany));
-    }
-
-    @ApiOperation(value = "编辑类型", notes = "编辑类型")
-    @RequestMapping(value = "/type", method = RequestMethod.PUT)
-    public Response editWeeklyType(@RequestBody OperateWeeklyTypeCompany operateWeeklyTypeCompany) {
-        return Response.ok(operateWeeklyCompanyService.updateWeeklyType(operateWeeklyTypeCompany));
-    }
-
-}

+ 0 - 60
virgo.api/src/main/java/com/bosshand/virgo/api/controller/operate/OperateWeeklyDepartmentController.java

@@ -1,60 +0,0 @@
-package com.bosshand.virgo.api.controller.operate;
-
-import com.bosshand.virgo.api.model.operate.OperateWeeklyDepartment;
-import com.bosshand.virgo.api.model.operate.OperateWeeklyTypeDepartment;
-import com.bosshand.virgo.api.service.operate.OperateWeeklyDepartmentService;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("operateWeeklyDepartment")
-public class OperateWeeklyDepartmentController {
-
-    @Autowired
-    private OperateWeeklyDepartmentService operateWeeklyDepartmentService;
-
-    @ApiOperation(value = "根据project获取周报", notes = "根据project获取周报")
-    @RequestMapping(value = "/{projectId}", method = RequestMethod.GET)
-    public Response list(@PathVariable long projectId) {
-        return Response.ok(operateWeeklyDepartmentService.getByProjectId(projectId));
-    }
-
-    @ApiOperation(value = "获取提交出来的周报", notes = "获取提交出来的周报")
-    @RequestMapping(value = "/submit/{projectId}", method = RequestMethod.GET)
-    public Response listProjectSubmit(@PathVariable long projectId) {
-        return Response.ok(operateWeeklyDepartmentService.getByProject(projectId));
-    }
-
-    @ApiOperation(value = "获取与自己企业相关的提交出来的周报", notes = "根据project获取提交出来的周报")
-    @RequestMapping(value = "/submit/{organizationId}/{projectId}", method = RequestMethod.GET)
-    public Response listOrganizationSubmit(@PathVariable long organizationId, @PathVariable long projectId) {
-        return Response.ok(operateWeeklyDepartmentService.getByOrganization(organizationId, projectId));
-    }
-
-    @ApiOperation(value = "修改周报状态", notes = "修改周报状态")
-    @RequestMapping(method = RequestMethod.PUT)
-    public Response updateState(@RequestBody OperateWeeklyDepartment operateWeeklyDepartment) {
-        return Response.ok(operateWeeklyDepartmentService.updateState(operateWeeklyDepartment));
-    }
-
-    @ApiOperation(value = "周报类型详情", notes = "周报类型详情")
-    @RequestMapping(value = "/type/{weeklyId}", method = RequestMethod.GET)
-    public Response getWeeklyType(@PathVariable long weeklyId) {
-        return Response.ok(operateWeeklyDepartmentService.getByWeeklyId(weeklyId));
-    }
-
-    @ApiOperation(value = "新增类型", notes = "新增类型")
-    @RequestMapping(value = "/type", method = RequestMethod.POST)
-    public Response addWeeklyType(@RequestBody OperateWeeklyTypeDepartment operateWeeklyTypeDepartment) {
-        return Response.ok(operateWeeklyDepartmentService.saveWeeklyType(operateWeeklyTypeDepartment));
-    }
-
-    @ApiOperation(value = "编辑类型", notes = "编辑类型")
-    @RequestMapping(value = "/type", method = RequestMethod.PUT)
-    public Response editWeeklyType(@RequestBody OperateWeeklyTypeDepartment operateWeeklyTypeDepartment) {
-        return Response.ok(operateWeeklyDepartmentService.updateWeeklyType(operateWeeklyTypeDepartment));
-    }
-
-}

+ 0 - 60
virgo.api/src/main/java/com/bosshand/virgo/api/controller/operate/OperateWeeklyPersonController.java

@@ -1,60 +0,0 @@
-package com.bosshand.virgo.api.controller.operate;
-
-import com.bosshand.virgo.api.model.operate.OperateWeeklyPerson;
-import com.bosshand.virgo.api.model.operate.OperateWeeklyTypePerson;
-import com.bosshand.virgo.api.service.operate.OperateWeeklyPersonService;
-import com.bosshand.virgo.core.response.Response;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("operateWeeklyPerson")
-public class OperateWeeklyPersonController {
-
-    @Autowired
-    private OperateWeeklyPersonService operateWeeklyPersonService;
-
-    @ApiOperation(value = "获取周报列表", notes = "获取周报列表")
-    @RequestMapping(value = "/{organizationId}/{projectId}/{userId}", method = RequestMethod.GET)
-    public Response list(@PathVariable long organizationId, @PathVariable long projectId, @PathVariable long userId) {
-        return Response.ok(operateWeeklyPersonService.getList(organizationId,projectId, userId));
-    }
-
-    @ApiOperation(value = "根据期数获取周报", notes = "根据期数获取周报")
-    @RequestMapping(value = "/number/{organizationId}/{projectId}/{userId}/{number}", method = RequestMethod.GET)
-    public Response getNumber(@PathVariable long organizationId, @PathVariable long projectId, @PathVariable long userId, @PathVariable int number) {
-        return Response.ok(operateWeeklyPersonService.getNumber(organizationId,projectId,userId,number));
-    }
-
-    @ApiOperation(value = "根据状态获取周报", notes = "根据状态获取周报")
-    @RequestMapping(value = "/{organizationId}/{projectId}/{userId}/{state}", method = RequestMethod.GET)
-    public Response listState(@PathVariable long organizationId, @PathVariable long projectId, @PathVariable long userId, @PathVariable int state) {
-        return Response.ok(operateWeeklyPersonService.getState(organizationId, projectId, userId, state));
-    }
-
-    @ApiOperation(value = "修改个人周报状态", notes = "修改个人周报状态")
-    @RequestMapping(method = RequestMethod.PUT)
-    public Response updateState(@RequestBody OperateWeeklyPerson operateWeeklyPerson) {
-        return Response.ok(operateWeeklyPersonService.updateState(operateWeeklyPerson));
-    }
-
-    @ApiOperation(value = "个人周报类型详情", notes = "个人周报类型详情")
-    @RequestMapping(value = "/type/{weeklyPersonId}", method = RequestMethod.GET)
-    public Response getWeeklyTypePerson(@PathVariable long weeklyPersonId) {
-        return Response.ok(operateWeeklyPersonService.getByWeeklyPersonId(weeklyPersonId));
-    }
-
-    @ApiOperation(value = "新增类型", notes = "新增类型")
-    @RequestMapping(value = "/type", method = RequestMethod.POST)
-    public Response addWeeklyTypePerson(@RequestBody OperateWeeklyTypePerson operateWeeklyTypePerson) {
-        return Response.ok(operateWeeklyPersonService.saveWeeklyTypePerson(operateWeeklyTypePerson));
-    }
-
-    @ApiOperation(value = "编辑类型", notes = "编辑类型")
-    @RequestMapping(value = "/type", method = RequestMethod.PUT)
-    public Response editWeeklyTypePerson(@RequestBody OperateWeeklyTypePerson operateWeeklyTypePerson) {
-        return Response.ok(operateWeeklyPersonService.updateWeeklyTypePerson(operateWeeklyTypePerson));
-    }
-
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/dao/BimModelTargetDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.BimModelTarget;
-
-@Mapper
-public interface BimModelTargetDao {
-
-	void save(BimModelTarget bimModelTarget);
-
-	void update(BimModelTarget bimModelTarget);
-
-	BimModelTarget getByProjectItemTargetId(long projectItemTargetId);
-
-	List<BimModelTarget> getProjectItemTargetIds(List<Long> ids);
-
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/dao/BimTypeDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.BimType;
-
-@Mapper
-public interface BimTypeDao {
-	
-	void delete(int id);
-	
-	void save(BimType bimType);
-
-	void update(BimType bimType);
-	
-	List<BimType> getList();
-
-}

+ 0 - 18
virgo.api/src/main/java/com/bosshand/virgo/api/dao/CollaborativeDao.java

@@ -1,18 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.Collaborative;
-
-@Mapper
-public interface CollaborativeDao {
-	
-	public int insert(Collaborative collaborative);
-
-	public List<Collaborative> getList(long projectId);
-
-	public int isReceipt(int id);
-
-}

+ 0 - 17
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ConfigurationUrlDao.java

@@ -1,17 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.ConfigurationUrl;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface ConfigurationUrlDao {
-
-	public int insert(ConfigurationUrl configurationUrl);
-
-	public List<ConfigurationUrl> getList();
-
-	public int update(ConfigurationUrl configurationUrl);
-
-}

+ 0 - 15
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ConstructionLogDao.java

@@ -1,15 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.ConstructionLog;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface ConstructionLogDao {
-
-	public int insert(ConstructionLog constructionLog);
-
-	public List<ConstructionLog> getByProjectId(long projectId);
-	
-}

+ 0 - 23
virgo.api/src/main/java/com/bosshand/virgo/api/dao/DesignChangeDao.java

@@ -1,23 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.DesignChange;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface DesignChangeDao {
-
-    public void save(DesignChange designChange);
-
-    public void update(DesignChange designChange);
-
-    public DesignChange get(long id);
-
-    public List<DesignChange> query(DesignChange designChange);
-
-    public List<DesignChange> queryByList(DesignChange designChange);
-
-    public void delete(long id);
-
-}

+ 0 - 19
virgo.api/src/main/java/com/bosshand/virgo/api/dao/DrawingsMarkedDao.java

@@ -1,19 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.DrawingsMarked;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface DrawingsMarkedDao {
-
-    int save(DrawingsMarked drawingsMarked);
-
-    List<DrawingsMarked> getIds(String[] ids);
-
-    List<DrawingsMarked> getFileId(int fileId);
-
-    int update(DrawingsMarked drawingsMarked);
-
-}

+ 0 - 15
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ElementDao.java

@@ -1,15 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.Element;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface ElementDao {
-    Element get(long id);
-    int batchSave(List<Element> list);
-    List<Element> getList(Element element);
-    int update(Element element);
-    int delByIntegrateId(String integrateId);
-}

+ 0 - 21
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ElementStepDao.java

@@ -1,21 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.ElementStep;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface ElementStepDao {
-
-    int save(ElementStep ElementStep);
-
-    int saveList(List<ElementStep> list);
-
-    int delete(long id);
-
-    int update(ElementStep elementStep);
-
-    List<ElementStep> getList(String elementId);
-
-}

+ 0 - 19
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ElementStepModelDao.java

@@ -1,19 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.ElementStepModel;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface ElementStepModelDao {
-
-    int save(ElementStepModel elementStepModel);
-
-    int delete(long id);
-
-    int update(ElementStepModel elementStepModel);
-
-    List<ElementStepModel> getList();
-
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/dao/EnvironmentDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.Environment;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface EnvironmentDao {
-
-    public void save(Environment environment);
-
-    public void update(Environment environment);
-
-    public void delete(long id);
-
-    public List<Environment> getProjectId(long projectId);
-
-    public List<Environment> getEnvironmentQuery(Environment environment);
-}

+ 0 - 18
virgo.api/src/main/java/com/bosshand/virgo/api/dao/EnvironmentTypeDao.java

@@ -1,18 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.EnvironmentType;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface EnvironmentTypeDao {
-
-    void delete(long id);
-
-    void save(EnvironmentType environmentType);
-
-    void update(EnvironmentType environmentType);
-
-    List<EnvironmentType> getList();
-}

+ 0 - 22
virgo.api/src/main/java/com/bosshand/virgo/api/dao/EquipmentDao.java

@@ -1,22 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.Equipment;
-
-@Mapper
-public interface EquipmentDao {
-
-	public void save(Equipment equipment);
-
-	public void update(Equipment equipment);
-
-	public void delete(long id);
-
-	public List<Equipment> getProjectId(long projectId);
-
-	public List<Equipment> getEquipmentQuery(Equipment equipment);
-
-}

+ 0 - 18
virgo.api/src/main/java/com/bosshand/virgo/api/dao/EquipmentTypeDao.java

@@ -1,18 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.EquipmentType;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface EquipmentTypeDao {
-
-    void delete(long id);
-
-    void save(EquipmentType equipmentType);
-
-    void update(EquipmentType equipmentType);
-
-    List<EquipmentType> getList();
-}

+ 0 - 22
virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowInstanceDao.java

@@ -1,22 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.FlowInstance;
-
-@Mapper
-public interface FlowInstanceDao {
-	public FlowInstance get(long id);
-	public List<FlowInstance> listByProjectId(long projectId);
-	public List<FlowInstance> listByProjectItemId(long projectId, long projectItemId);
-	public List<FlowInstance> getFlowInstance(long projectId, long projectItemId, long flowType);
-	//TODO add the mapper
-	public int save(FlowInstance flowInstance);
-	public int update(FlowInstance flowInstance);
-	public int updateSubmitter(FlowInstance flowInstance);
-	public void delete(long flowInstanceId);
-	public List<FlowInstance> getProjectItemIds(List<Long> projectItemIds, long flowType);
-	public FlowInstance getProjectItemId(long projectItemId, long flowType);
-}

+ 0 - 22
virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowInstanceNodeDao.java

@@ -1,22 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.FlowInstanceNode;
-
-@Mapper
-public interface FlowInstanceNodeDao {
-	public FlowInstanceNode get(long id);
-	public List<FlowInstanceNode> listByFlowId(long flowId);
-	
-	
-	//TODO add the mpapper;
-	public int saveList(List<FlowInstanceNode> nodeList);
-	public int save(FlowInstanceNode node);
-	public int update(FlowInstanceNode node);
-	public void delete(long nodeId);
-	public int updateFlowUserList(long organizationType, String flowUserList, List<Long> flowInstanceIds);
-	public int updateStatus(long nodeId);
-}

+ 0 - 22
virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowModelDao.java

@@ -1,22 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.FlowModel;
-
-@Mapper
-public interface FlowModelDao {
-	
-	public FlowModel get(long id);
-	public List<FlowModel> getByIds(List<Long> list);
-	public List<FlowModel> list();
-	public int insert(FlowModel flowModel);
-	public int update(FlowModel flowModel);
-	public int delete(long id);
-	public List<FlowModel> getByOrganizationType(int organizationType);
-
-	public List<FlowModel> getByTag(String tag);
-	
-}

+ 0 - 17
virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowModelNodeDao.java

@@ -1,17 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.FlowModelNode;
-
-@Mapper
-public interface FlowModelNodeDao {
-	public FlowModelNode get(long id);
-	public List<FlowModelNode> getAll();
-	public int insert(FlowModelNode flowModelNode);
-	public int delete(long id);
-	public int update(FlowModelNode flowModelNode);
-	public int deleteByFlowModelId(long flowModelId);
-}

+ 0 - 46
virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowSynergyDataDao.java

@@ -1,46 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.FlowSynergyData;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface FlowSynergyDataDao {
-	
-	public List<FlowSynergyData> getList(FlowSynergyData flowSynergyData);
-	public List<FlowSynergyData> getListByProject(long projectId);
-	public List<FlowSynergyData> getStayByProject(long projectId);
-	public List<FlowSynergyData> getListLimit(@Param(value = "flowSynergyData") FlowSynergyData flowSynergyData,
-											  @Param(value = "currIndex")int currIndex,
-											  @Param(value = "pageSize")int pageSize);
-	public int insert(FlowSynergyData flowSynergyData);
-	public int update(FlowSynergyData flowSynergyData);
-	public int updateState(FlowSynergyData flowSynergyData);
-	public int delete(long id);
-	public List<FlowSynergyData> getListByFlowType(long projectId, String[] array);
-
-	public List<FlowSynergyData> censusPerson(@Param(value = "startDate") String startDate,
-											  @Param(value = "endDate")String endDate,
-											  @Param(value = "projectId")long projectId);
-
-	public List<FlowSynergyData> censusItemIds(@Param(value = "itemIds") List<Long> itemIds,
-											   @Param(value = "flowTypes") List<Long> flowTypes,
-											   @Param(value = "startDate") String startDate,
-											   @Param(value = "endDate")String endDate,
-											   @Param(value = "projectId")long projectId);
-	public List<FlowSynergyData> census(@Param(value = "startDate") String startDate,
-										@Param(value = "endDate")String endDate,
-										@Param(value = "projectId")long projectId,
-										@Param(value = "projectItemId")long projectItemId,
-										@Param(value = "flowType")int flowType);
-
-	public List<FlowSynergyData> censusByFlowTypes(@Param(value = "startDate") String startDate,
-										@Param(value = "endDate")String endDate,
-										@Param(value = "projectId")long projectId,
-										@Param(value = "flowTypes")String flowTypes);
-
-
-
-}

+ 0 - 17
virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowUserConfigDao.java

@@ -1,17 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.FlowUserConfig;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface FlowUserConfigDao {
-
-    int save(FlowUserConfig flowUserConfig);
-
-    int delete(long userId, long projectId);
-
-    List<FlowUserConfig> getUserProjectId(long userId, long projectId);
-
-}

+ 0 - 37
virgo.api/src/main/java/com/bosshand/virgo/api/dao/FlowYuiDataDao.java

@@ -1,37 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.FlowYuiData;
-
-@Mapper
-public interface FlowYuiDataDao {
-	
-	public int insert(FlowYuiData flowYuiData);
-
-	public FlowYuiData get(long id);
-	
-	public FlowYuiData getFlowYuiDataByFlowId(long flowId);
-
-	public List<FlowYuiData> getFlowYuiDataByYuiProjectItemIds(List<Long> list);
-
-	public int restoreStatus(long id);
-	
-	public int updateStatus(long id, long projectFlowId);
-
-	public int updateFlowYuiData(FlowYuiData flowYuiData);
-	
-	public List<FlowYuiData> getList(FlowYuiData flowYuiData);
-
-	public List<FlowYuiData> getFlowFinishDocumentIds(String[] ids);
-	
-	public List<FlowYuiData> getYuiFlowTypes(long yuiProjectId, String[] array);
-
-	public FlowYuiData getProjectFlowId(long youjiProjectFlowId);
-	
-	public FlowYuiData getByProjectFlowId(long projectFlowId);
-
-
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/dao/IdentifyTypeDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.IdentifyType;
-
-@Mapper
-public interface IdentifyTypeDao {
-	
-	void delete(int id);
-	
-	void save(IdentifyType identifyType);
-
-	void update(IdentifyType identifyType);
-	
-	List<IdentifyType> getList();
-
-}

+ 0 - 25
virgo.api/src/main/java/com/bosshand/virgo/api/dao/InspectDao.java

@@ -1,25 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.Inspect;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface InspectDao {
-
-	public int insert(Inspect inspect);
-
-	public int update(Inspect inspect);
-
-	public int delete(long id);
-
-	public Inspect get(long id);
-	
-	public List<Inspect> getByInspectType(int inspectType, long yuiProjectId);
-
-	public List<Inspect> getList(long yuiProjectId);
-
-	public List<Inspect> getByInspect(Inspect inspect);
-
-}

+ 0 - 27
virgo.api/src/main/java/com/bosshand/virgo/api/dao/MaterialBatchDao.java

@@ -1,27 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import com.bosshand.virgo.api.model.MaterialBatch;
-
-@Mapper
-public interface MaterialBatchDao {
-	
-	public void save(MaterialBatch materialBatch);
-	
-	public void update(MaterialBatch materialBatch);
-
-	public MaterialBatch get(long id);
-
-	public List<MaterialBatch> query(MaterialBatch materialBatch);
-
-	public List<MaterialBatch> queryLimit(@Param(value = "materialBatch")MaterialBatch materialBatch, @Param(value = "currIndex")int currIndex, @Param(value = "pageSize")int pageSize);
-
-	public List<MaterialBatch> queryByList(MaterialBatch materialBatch);
-
-	public void delete(long id);
-
-}

+ 0 - 22
virgo.api/src/main/java/com/bosshand/virgo/api/dao/MaterialCategoryDao.java

@@ -1,22 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.MaterialCategory;
-
-@Mapper
-public interface MaterialCategoryDao {
-	
-	public List<MaterialCategory> getList();
-	
-	public List<MaterialCategory> getPid(long pid);
-	
-	public void update(MaterialCategory materialCategory);
-	
-	public void save(MaterialCategory materialCategory);
-	
-	public void delete(long id);
-
-}

+ 0 - 19
virgo.api/src/main/java/com/bosshand/virgo/api/dao/MaterialCheckDao.java

@@ -1,19 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.MaterialCheck;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface MaterialCheckDao {
-
-    public void save(MaterialCheck materialCheck);
-
-    public void update(MaterialCheck materialCheck);
-
-    public void delete(long id);
-
-    public List<MaterialCheck> getList(MaterialCheck materialCheck);
-
-}

+ 0 - 14
virgo.api/src/main/java/com/bosshand/virgo/api/dao/NoticeDao.java

@@ -1,14 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-import com.bosshand.virgo.api.model.Notice;
-
-@Mapper
-public interface NoticeDao {
-
-	public int insert(Notice notice);
-	public List<Notice> getByYuiProjectId(long yuiProjectId);
-	public int delete(long id);
-}

+ 0 - 26
virgo.api/src/main/java/com/bosshand/virgo/api/dao/PointToPointDao.java

@@ -1,26 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.PointToPoint;
-
-@Mapper
-public interface PointToPointDao {
-	
-	public PointToPoint get(long id);
-	
-	public List<PointToPoint> getList(long projectId);
-	
-	public List<PointToPoint> organizationId(long organizationId);
-	
-	public int insert(PointToPoint pointToPoint);
-
-	public int update(PointToPoint pointToPoint);
-	
-	public int updateState(long id, int state);
-
-	public int delete(long id);
-
-}

+ 0 - 23
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectCityWeatherDao.java

@@ -1,23 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.ProjectCityWeather;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface ProjectCityWeatherDao {
-
-    void save (ProjectCityWeather projectCityWeather);
-
-    void delete (long id);
-
-    List<ProjectCityWeather> getList(long projectId);
-
-    ProjectCityWeather getMax(long projectId);
-
-    List<ProjectCityWeather> getProjectId(@Param(value = "startDate") String startDate,
-                                          @Param(value = "endDate")String endDate,
-                                          @Param(value = "projectId")long projectId);
-}

+ 7 - 15
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectDao.java

@@ -9,27 +9,19 @@ import java.util.Map;
 
 @Mapper
 public interface ProjectDao {
-	
-	public int insert(Project project);
 
-	public List<Project> listByOrganizationId(long organizationId);
+    int insert(Project project);
 
-	public List<Project> getOperateOrganizationId(long operateOrganizationId);
+    Project get(long id);
 
-	public Project get(long id);
+    int getTotalCount(Map<String, Object> data);
 
-	public int getTotalCount(Map<String, Object> data);
+    List<Project> getList(Map<String, Object> data);
 
-	public List<Project> getList(Map<String, Object> data);
+    int update(Project project);
 
-	public List<Project> getByList();
+    int delete(long id);
 
-	public int update(Project project);
-
-	public int delete(long id);
-	
-	public List<Project> getProjectIds(List<Long> ids);
-
-	public Project getByYuiProjectId(long yuiProjectId);
+    List<Project> getProjectIds(List<Long> ids);
 
 }

+ 0 - 14
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectFlowDao.java

@@ -1,14 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.ProjectFlow;
-
-@Mapper
-public interface ProjectFlowDao {
-	
-	public List<ProjectFlow> getIds(String[] ids);
-
-}

+ 23 - 16
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ProjectItemDao.java

@@ -2,25 +2,32 @@ package com.bosshand.virgo.api.dao;
 
 import com.bosshand.virgo.api.model.ProjectItem;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface ProjectItemDao {
-	
-	public ProjectItem get(long id);
-	public ProjectItem getByYuiProjectItemId(long projectItemIdFromYui);
-	public List<ProjectItem> getAll();
-	public List<ProjectItem> getDoneStatus();
-	public int insert(ProjectItem projectItem);
-	public int update(ProjectItem projectItem);
-	public int updateTargets(ProjectItem projectItem);
-	public int updateStatus(long id);
-	public int delete(long id);
-	public int deleteByProjectId(long projectId);
-	public int saveList(List<ProjectItem> list);
-	public List<ProjectItem> getByProjectIds(List<Long> ids);
-	public List<ProjectItem> getByProjectId(long projectId);
-	public ProjectItem getIntegrateId(@Param(value = "integrateId") String integrateId);
+
+    ProjectItem get(long id);
+
+    ProjectItem getByYuiProjectItemId(long projectItemIdFromYui);
+
+    List<ProjectItem> getDoneStatus();
+
+    int insert(ProjectItem projectItem);
+
+    int update(ProjectItem projectItem);
+
+    int updateTargets(ProjectItem projectItem);
+
+    int delete(long id);
+
+    int deleteByProjectId(long projectId);
+
+    int saveList(List<ProjectItem> list);
+
+    List<ProjectItem> getByProjectIds(List<Long> ids);
+
+    List<ProjectItem> getByProjectId(long projectId);
+
 }

+ 0 - 22
virgo.api/src/main/java/com/bosshand/virgo/api/dao/RectificationDao.java

@@ -1,22 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.Rectification;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-@Mapper
-public interface RectificationDao {
-
-    public int insert(Rectification rectification);
-
-    public int update(Rectification rectification);
-
-    public int delete(long id);
-
-    public List<Rectification> getList(Rectification rectification);
-
-    public List<Rectification> getListLimit(@Param(value = "r")Rectification rectification, @Param(value = "currIndex")int currIndex, @Param(value = "pageSize")int pageSize);
-
-}

+ 0 - 21
virgo.api/src/main/java/com/bosshand/virgo/api/dao/ScheduleClient.java

@@ -1,21 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.bosshand.virgo.core.response.Response;
-
-import io.swagger.annotations.ApiParam;
-
-@FeignClient("virgo-schedule")
-public interface ScheduleClient {
-
-    @RequestMapping(value = "plan/projectItem/{projectItemIds}/{startDate}/{endDate}", method = RequestMethod.GET)
-    public String getProjectItemIds(@PathVariable String projectItemIds, @PathVariable String startDate, @PathVariable String endDate);
-
-}

+ 0 - 17
virgo.api/src/main/java/com/bosshand/virgo/api/dao/SignOnBehalfDao.java

@@ -1,17 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.SignOnBehalf;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface SignOnBehalfDao {
-
-    public void save(SignOnBehalf signOnBehalf);
-
-    public void update(SignOnBehalf signOnBehalf);
-
-    public List<SignOnBehalf> getList(SignOnBehalf signOnBehalf);
-
-}

+ 0 - 23
virgo.api/src/main/java/com/bosshand/virgo/api/dao/TypeCascadeDao.java

@@ -1,23 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.TypeCascade;
-
-@Mapper
-public interface TypeCascadeDao {
-	
-	public void save(TypeCascade typeCascade);
-	
-	public void update(TypeCascade typeCascade);
-	
-	public void delete(long id);
-	
-	public List<TypeCascade> getList();
-	
-	public List<TypeCascade> getParentId(long parentId);
-
-
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/dao/WarehouseDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.Warehouse;
-
-@Mapper
-public interface WarehouseDao {
-	
-	public void save(Warehouse warehouse);
-	
-	public void update(Warehouse warehouse);
-	
-	public void delete(long id);
-	
-	public List<Warehouse> getProjectId(long projectId);
-
-}

+ 0 - 24
virgo.api/src/main/java/com/bosshand/virgo/api/dao/WeeklyDao.java

@@ -1,24 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.Weekly;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface WeeklyDao {
-
-    int save(Weekly weekly);
-
-    Weekly get(long id);
-
-    List<Weekly> getByProjectId(long projectId);
-
-    Weekly getMax(long projectId);
-
-    int updateState(Weekly weekly);
-
-    List<Weekly> getByProject(long projectId);
-
-    List<Weekly> getByOrganization(long organizationId, long projectId);
-}

+ 0 - 25
virgo.api/src/main/java/com/bosshand/virgo/api/dao/WeeklyPersonDao.java

@@ -1,25 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.WeeklyPerson;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface WeeklyPersonDao {
-
-    int save(WeeklyPerson weeklyPerson);
-
-    WeeklyPerson get(long id);
-
-    WeeklyPerson getByProjectIdUserId(long organizationId, long projectId, long userId);
-
-    int updateState(WeeklyPerson weeklyPerson);
-
-    List<WeeklyPerson> getByOrganization(long organizationId, long projectId, long userId);
-
-    List<WeeklyPerson> getByProjectState(long organizationId, long projectId, long userId, int state);
-
-    WeeklyPerson getNumber(long organizationId, long projectId, long userId, int number);
-
-}

+ 0 - 17
virgo.api/src/main/java/com/bosshand/virgo/api/dao/WeeklySetDao.java

@@ -1,17 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.WeeklySet;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface WeeklySetDao {
-
-    int save(WeeklySet weeklySet);
-
-    int update(WeeklySet weeklySet);
-
-    List<WeeklySet> get(WeeklySet weeklySet);
-
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/dao/WeeklyTypeDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.WeeklyType;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface WeeklyTypeDao {
-
-    int save(WeeklyType weeklyType);
-
-    int batchSave(List<WeeklyType> list);
-
-    int update(WeeklyType WeeklyType);
-
-    WeeklyType getWeeklyType(long id);
-
-    List<WeeklyType> getByWeeklyId(long weeklyId);
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/dao/WeeklyTypePersonDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import com.bosshand.virgo.api.model.WeeklyTypePerson;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface WeeklyTypePersonDao {
-
-    int save(WeeklyTypePerson weklyTypePerson);
-
-    int batchSave(List<WeeklyTypePerson> list);
-
-    int update(WeeklyTypePerson weklyTypePerson);
-
-    WeeklyTypePerson getWeeklyTypePerson(long id);
-
-    List<WeeklyTypePerson> getByWeeklyPersonId(long weeklyPersonId);
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/dao/WorkTypeDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.model.WorkType;
-
-@Mapper
-public interface WorkTypeDao {
-	
-	public void save(WorkType workType);
-	
-	public void update(WorkType workType);
-	
-	public void delete(long id);
-	
-	public List<WorkType> getProjectId(long projectId);
-
-}

+ 0 - 23
virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyCompanyDao.java

@@ -1,23 +0,0 @@
-package com.bosshand.virgo.api.dao.operate;
-
-import com.bosshand.virgo.api.model.operate.OperateWeeklyCompany;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface OperateWeeklyCompanyDao {
-
-    int save(OperateWeeklyCompany operateWeeklyCompany);
-
-    OperateWeeklyCompany get(long id);
-
-    List<OperateWeeklyCompany> getByProjectId(long projectId);
-
-    int updateState(OperateWeeklyCompany operateWeeklyCompany);
-
-    List<OperateWeeklyCompany> getByProject(long projectId);
-
-    List<OperateWeeklyCompany> getByOrganization(long organizationId, long projectId);
-
-}

+ 0 - 23
virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyDepartmentDao.java

@@ -1,23 +0,0 @@
-package com.bosshand.virgo.api.dao.operate;
-
-import com.bosshand.virgo.api.model.operate.OperateWeeklyDepartment;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface OperateWeeklyDepartmentDao {
-
-    int save(OperateWeeklyDepartment operateWeeklyDepartment);
-
-    OperateWeeklyDepartment get(long id);
-
-    List<OperateWeeklyDepartment> getByProjectId(long projectId);
-
-    int updateState(OperateWeeklyDepartment operateWeeklyDepartment);
-
-    List<OperateWeeklyDepartment> getByProject(long projectId);
-
-    List<OperateWeeklyDepartment> getByOrganization(long organizationId, long projectId);
-
-}

+ 0 - 25
virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyPersonDao.java

@@ -1,25 +0,0 @@
-package com.bosshand.virgo.api.dao.operate;
-
-import com.bosshand.virgo.api.model.operate.OperateWeeklyPerson;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface OperateWeeklyPersonDao {
-
-    int save(OperateWeeklyPerson operateWeeklyPerson);
-
-    OperateWeeklyPerson get(long id);
-
-    OperateWeeklyPerson getByProjectIdUserId(long organizationId, long projectId, long userId);
-
-    int updateState(OperateWeeklyPerson weeklyPerson);
-
-    List<OperateWeeklyPerson> getByOrganization(long organizationId, long projectId, long userId);
-
-    List<OperateWeeklyPerson> getByProjectState(long organizationId, long projectId, long userId, int state);
-
-    OperateWeeklyPerson getNumber(long organizationId, long projectId, long userId, int number);
-
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyTypeCompanyDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.dao.operate;
-
-import com.bosshand.virgo.api.model.operate.OperateWeeklyTypeCompany;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface OperateWeeklyTypeCompanyDao {
-
-    int save(OperateWeeklyTypeCompany operateWeeklyTypeCompany);
-
-    int batchSave(List<OperateWeeklyTypeCompany> list);
-
-    int update(OperateWeeklyTypeCompany operateWeeklyTypeCompany);
-
-    OperateWeeklyTypeCompany getWeeklyType(long id);
-
-    List<OperateWeeklyTypeCompany> getByWeeklyId(long weeklyId);
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyTypeDepartmentDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.dao.operate;
-
-import com.bosshand.virgo.api.model.operate.OperateWeeklyTypeDepartment;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface OperateWeeklyTypeDepartmentDao {
-
-    int save(OperateWeeklyTypeDepartment operateWeeklyTypeDepartment);
-
-    int batchSave(List<OperateWeeklyTypeDepartment> list);
-
-    int update(OperateWeeklyTypeDepartment operateWeeklyTypeDepartment);
-
-    OperateWeeklyTypeDepartment getWeeklyType(long id);
-
-    List<OperateWeeklyTypeDepartment> getByWeeklyId(long weeklyId);
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/dao/operate/OperateWeeklyTypePersonDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.dao.operate;
-
-import com.bosshand.virgo.api.model.operate.OperateWeeklyTypePerson;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-@Mapper
-public interface OperateWeeklyTypePersonDao {
-
-    int save(OperateWeeklyTypePerson operateWeeklyTypePerson);
-
-    int batchSave(List<OperateWeeklyTypePerson> list);
-
-    int update(OperateWeeklyTypePerson weklyTypePerson);
-
-    OperateWeeklyTypePerson getWeeklyTypePerson(long id);
-
-    List<OperateWeeklyTypePerson> getByWeeklyPersonId(long weeklyPersonId);
-}

+ 0 - 36
virgo.api/src/main/java/com/bosshand/virgo/api/job/JobCityWeatherQuartz.java

@@ -1,36 +0,0 @@
-package com.bosshand.virgo.api.job;
-
-import com.bosshand.virgo.api.dao.ProjectCityWeatherDao;
-import com.bosshand.virgo.api.model.ProjectCityWeather;
-import com.bosshand.virgo.core.utils.HttpsUtils;
-import org.quartz.JobDataMap;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-import java.util.Date;
-
-public class JobCityWeatherQuartz extends QuartzJobBean {
-
-    @Autowired
-    ProjectCityWeatherDao projectCityWeatherDao;
-
-    @Override
-    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-
-        JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap();
-
-        long projectId = mergedJobDataMap.getLong("projectId");
-        String city = mergedJobDataMap.getString("city");
-
-        ProjectCityWeather projectCityWeather = new ProjectCityWeather();
-        projectCityWeather.setDate(new Date());
-        projectCityWeather.setProjectId(projectId);
-        String url = "https://restapi.amap.com/v3/weather/weatherInfo?city="+city+"&extensions=all&key=8d6519155e085eb1b83d1de7953b2414";
-        projectCityWeather.setWeatherData(HttpsUtils.getResult(url));
-        projectCityWeatherDao.save(projectCityWeather);
-
-    }
-
-}

+ 0 - 44
virgo.api/src/main/java/com/bosshand/virgo/api/job/JobOperateCompanyQuartz.java

@@ -1,44 +0,0 @@
-package com.bosshand.virgo.api.job;
-
-import com.bosshand.virgo.api.dao.ProjectCityWeatherDao;
-import com.bosshand.virgo.api.dao.ProjectDao;
-import com.bosshand.virgo.api.dao.operate.OperateWeeklyCompanyDao;
-import com.bosshand.virgo.api.dao.operate.OperateWeeklyTypeCompanyDao;
-import com.bosshand.virgo.api.service.FlowClient;
-import com.bosshand.virgo.api.service.ManagerClient;
-import com.bosshand.virgo.api.service.OperateClient;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-public class JobOperateCompanyQuartz extends QuartzJobBean {
-
-    @Autowired
-    OperateWeeklyCompanyDao operateWeeklyCompanyDao;
-
-    @Autowired
-    OperateWeeklyTypeCompanyDao operateWeeklyTypeCompanyDao;
-
-    @Autowired
-    ProjectDao projectDao;
-
-    @Autowired
-    ProjectCityWeatherDao projectCityWeatherDao;
-
-    @Autowired
-    FlowClient flowClient;
-
-    @Autowired
-    ManagerClient managerClient;
-
-    @Autowired
-    OperateClient operateClient;
-
-    @Override
-    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-
-    }
-
-
-}

+ 0 - 42
virgo.api/src/main/java/com/bosshand/virgo/api/job/JobOperateDepartmentQuartz.java

@@ -1,42 +0,0 @@
-package com.bosshand.virgo.api.job;
-
-import com.bosshand.virgo.api.dao.ProjectCityWeatherDao;
-import com.bosshand.virgo.api.dao.ProjectDao;
-import com.bosshand.virgo.api.dao.operate.OperateWeeklyDepartmentDao;
-import com.bosshand.virgo.api.dao.operate.OperateWeeklyTypeDepartmentDao;
-import com.bosshand.virgo.api.service.FlowClient;
-import com.bosshand.virgo.api.service.ManagerClient;
-import com.bosshand.virgo.api.service.OperateClient;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-public class JobOperateDepartmentQuartz extends QuartzJobBean {
-
-    @Autowired
-    OperateWeeklyDepartmentDao operateWeeklyDepartmentDao;
-
-    @Autowired
-    OperateWeeklyTypeDepartmentDao operateWeeklyTypeDepartmentDao;
-
-    @Autowired
-    ProjectDao projectDao;
-
-    @Autowired
-    ProjectCityWeatherDao projectCityWeatherDao;
-
-    @Autowired
-    FlowClient flowClient;
-
-    @Autowired
-    ManagerClient managerClient;
-
-    @Autowired
-    OperateClient operateClient;
-
-    @Override
-    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-
-    }
-}

+ 0 - 180
virgo.api/src/main/java/com/bosshand/virgo/api/job/JobOperatePersonQuartz.java

@@ -1,180 +0,0 @@
-package com.bosshand.virgo.api.job;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.bosshand.virgo.api.dao.ProjectCityWeatherDao;
-import com.bosshand.virgo.api.dao.ProjectDao;
-import com.bosshand.virgo.api.dao.operate.*;
-import com.bosshand.virgo.api.model.Project;
-import com.bosshand.virgo.api.model.ProjectCityWeather;
-import com.bosshand.virgo.api.model.operate.OperateWeeklyPerson;
-import com.bosshand.virgo.api.model.operate.OperateWeeklyTypePerson;
-import com.bosshand.virgo.api.service.FlowClient;
-import com.bosshand.virgo.api.service.ManagerClient;
-import com.bosshand.virgo.api.service.OperateClient;
-import com.bosshand.virgo.exception.ServiceException;
-import org.apache.commons.lang.StringUtils;
-import org.quartz.JobDataMap;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class JobOperatePersonQuartz extends QuartzJobBean {
-
-    @Autowired
-    OperateWeeklyPersonDao operateWeeklyPersonDao;
-
-    @Autowired
-    OperateWeeklyTypePersonDao operateWeeklyTypePersonDao;
-
-    @Autowired
-    ProjectDao projectDao;
-
-    @Autowired
-    ProjectCityWeatherDao projectCityWeatherDao;
-
-    @Autowired
-    FlowClient flowClient;
-
-    @Autowired
-    ManagerClient managerClient;
-
-    @Autowired
-    OperateClient operateClient;
-
-    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-    SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
-
-    @Override
-    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap();
-        long projectId = mergedJobDataMap.getLong("projectId");
-        Project project = projectDao.get(projectId);
-        // 个人周报
-        String s = managerClient.operatePersonByProjectId(projectId);
-        if (StringUtils.isNotBlank(s)) {
-            JSONArray objects = JSONObject.parseArray(s);
-            for (int i = 0; i < objects.size(); i++) {
-                JSONObject jjo = objects.getJSONObject(i);
-                long organizationId = jjo.getLong("organizationId");
-                String organizationName = jjo.getString("organizationName");
-                String userIds = jjo.getString("userIds");
-                if(StringUtils.isNotBlank(userIds)){
-                    JSONArray jaa = JSONObject.parseArray(userIds);
-                    for(int h = 0; h<jaa.size(); h++){
-                        JSONObject jh = jaa.getJSONObject(h);
-                        OperateWeeklyPerson wk = operateWeeklyPersonDao.getByProjectIdUserId(organizationId, projectId, jh.getLong("userId"));
-                        OperateWeeklyPerson wp = new OperateWeeklyPerson();
-                        if (wk != null) {
-                            wp.setStartDate(wk.getEndDate());
-                            wp.setEndDate(sdf.format(new Date()));
-                            wp.setNumber(wk.getNumber() + 1);
-                            wp.setOrganizationId(organizationId);
-                            wp.setOrganizationName(organizationName);
-                            wp.setProjectName(project.getProjectName());
-                            wp.setProjectId(projectId);
-                            wp.setUserId(jh.getLong("userId"));
-                            wp.setName(jh.getString("userName") + "的周报");
-                            operateWeeklyPersonDao.save(wp);
-                            operateWeeklyTypePersonDao.batchSave(
-                                    initWorkTypePersonList(projectId, wp.getId(), wp.getStartDate(), wp.getEndDate(), jh.getLong("userId")));
-                        } else {
-                            wp.setStartDate(mergedJobDataMap.getString("startDate"));
-                            wp.setEndDate(mergedJobDataMap.getString("endDate"));
-                            wp.setNumber(1);
-                            wp.setOrganizationId(organizationId);
-                            wp.setOrganizationName(organizationName);
-                            wp.setProjectName(project.getProjectName());
-                            wp.setProjectId(projectId);
-                            wp.setUserId(jh.getLong("userId"));
-                            wp.setName(jh.getString("userName") + "的周报");
-                            operateWeeklyPersonDao.save(wp);
-                            operateWeeklyTypePersonDao.batchSave(
-                                    initWorkTypePersonList(projectId, wp.getId(), mergedJobDataMap.getString("startDate"), mergedJobDataMap.getString("endDate"), jh.getLong("userId")));
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private String getDataPerson(long projectId, String startDate, String endDate, long userId) {
-        String data = operateClient.census(projectId,startDate, endDate);
-        JSONArray jsonArray = JSONArray.parseArray(data);
-        if (jsonArray.size() > 0) {
-            List<JSONObject> ls = new ArrayList<>();
-            for (int i = 0; i < jsonArray.size(); i++) {
-                JSONObject jo = jsonArray.getJSONObject(i);
-                int person = flowClient.person(jo.getLongValue("projectFlowId"), userId);
-                if (person == 1) {
-                    ls.add(jo);
-                }
-            }
-            return ls.toString();
-        }
-        return null;
-    }
-
-    private List<OperateWeeklyTypePerson> initWorkTypePersonList(long projectId, long weeklyPersonId, String startDate, String endDate, long userId) {
-        List<OperateWeeklyTypePerson> list = new ArrayList<>();
-        String[] typeNameList = OperateWeeklyTypePerson.TYPENAMELIST;
-        for (int i = 0; i < typeNameList.length; i++) {
-            OperateWeeklyTypePerson wt = new OperateWeeklyTypePerson();
-            wt.setWeeklyPersonId(weeklyPersonId);
-            wt.setName(typeNameList[i]);
-            wt.setType(i);
-            switch (i) {
-                case 0: //基本信息
-                    wt.setData(null);
-                    break;
-                case 1: //天气情况
-                    String start = null;
-                    String end = null;
-                    try {
-                        start = sf.format(sf.parse(startDate));
-                        end = sf.format(sf.parse(endDate));
-                    } catch (ParseException e) {
-                        throw new ServiceException("Date conversion fail.", e);
-                    }
-                    List<ProjectCityWeather> weatherList = projectCityWeatherDao.getProjectId(start, end, projectId);
-                    if (weatherList.size() > 0) {
-                        List<JSONObject> ls = new ArrayList<>();
-                        for (ProjectCityWeather weather : weatherList) {
-                            JSONObject json = new JSONObject();
-                            json.put("date", sf.format(weather.getDate()));
-                            json.put("weather", weather.getWeatherData());
-                            ls.add(json);
-                        }
-                        wt.setData(ls.toString());
-                    }
-                    break;
-                case 2: //完成事项
-                    wt.setData(getDataPerson(projectId, startDate, endDate, userId));
-                    break;
-                case 3: //上周事项
-                    wt.setData(null);
-                    break;
-                case 4: //下周计划
-                    wt.setData(null);
-                    break;
-                case 5: //存在问题
-                    wt.setData(null);
-                    break;
-                case 6: //工作图像
-                    wt.setData(null);
-                    break;
-            }
-            list.add(wt);
-        }
-        return list;
-    }
-
-}

+ 0 - 385
virgo.api/src/main/java/com/bosshand/virgo/api/job/JobQuartz.java

@@ -1,385 +0,0 @@
-package com.bosshand.virgo.api.job;
-
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.bosshand.virgo.api.dao.*;
-import com.bosshand.virgo.api.model.*;
-import com.bosshand.virgo.api.service.FlowClient;
-import com.bosshand.virgo.api.service.ManagerClient;
-import com.bosshand.virgo.core.dao.MgrOrganizationDao;
-import com.bosshand.virgo.core.model.MgrOrganization;
-import com.bosshand.virgo.exception.ServiceException;
-import org.apache.commons.lang.StringUtils;
-import org.quartz.JobDataMap;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.quartz.QuartzJobBean;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-public class JobQuartz extends QuartzJobBean {
-
-    @Autowired
-    WeeklyDao weeklyDao;
-
-    @Autowired
-    WeeklyTypeDao weeklyTypeDao;
-
-    @Autowired
-    WeeklyPersonDao weeklyPersonDao;
-
-    @Autowired
-    WeeklyTypePersonDao weeklyTypePersonDao;
-
-    @Autowired
-    MgrOrganizationDao organizationDao;
-
-    @Autowired
-    ProjectDao projectDao;
-
-    @Autowired
-    ProjectItemDao projectItemDao;
-
-    @Autowired
-    FlowSynergyDataDao flowSynergyDataDao;
-
-    @Autowired
-    MaterialBatchDao materialBatchDao;
-
-    @Autowired
-    FlowModelDao flowModelDao;
-
-    @Autowired
-    ProjectCityWeatherDao projectCityWeatherDao;
-
-    @Autowired
-    ScheduleClient scheduleClient;
-
-    @Autowired
-    ManagerClient managerClient;
-
-    @Autowired
-    FlowClient flowClient;
-
-    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-    SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
-
-    private String getData(List<Long> projectItemIds, long projectId, String startDate, String endDate, String st) {
-        List<Long> flowTypes = new ArrayList<>();
-        flowModelDao.getByTag(st).forEach(ls -> flowTypes.add(ls.getId()));
-        List<FlowSynergyData> flowSynergyData = flowSynergyDataDao.censusItemIds(projectItemIds, flowTypes, startDate, endDate, projectId);
-        if (flowSynergyData.size() > 0) {
-            List<JSONObject> ls = new ArrayList<>();
-            for (FlowSynergyData fsd : flowSynergyData) {
-                JSONObject json = new JSONObject();
-                json.put("id", fsd.getId());
-                json.put("projectItemId", fsd.getProjectItemId());
-                json.put("projectItemName", fsd.getProjectItemName());
-                json.put("projectItemTargetId", fsd.getProjectItemTargetId());
-                json.put("projectItemTargetName", fsd.getProjectItemTargetName());
-                json.put("projectDivision", fsd.getProjectDivision());
-                json.put("projectDivisionName", fsd.getProjectDivisionName());
-                json.put("projectSubDivision", fsd.getProjectSubDivision());
-                json.put("projectSubDivisionName", fsd.getProjectSubDivisionName());
-                json.put("projectSubOption", fsd.getProjectSubOption());
-                json.put("projectSubOptionName", fsd.getProjectSubOptionName());
-                json.put("projectSubItem", fsd.getProjectSubItem());
-                json.put("projectSubItemName", fsd.getProjectSubItemName());
-                json.put("flowType", fsd.getFlowType());
-                json.put("flowTypeName", fsd.getFlowTypeName());
-                json.put("state", fsd.getState());
-                json.put("date", sdf.format(fsd.getDate()));
-                if ("材料管理".equals(st)) {
-                    json.put("batchData", materialBatchDao.get(fsd.getBatchId()));
-                }
-                ls.add(json);
-            }
-            return ls.toString();
-        }
-        return null;
-    }
-
-    private List<WeeklyType> initWorkTypeList(List<Long> projectItemIds, long projectId, long weeklyId, String startDate, String endDate) {
-        List<WeeklyType> list = new ArrayList<>();
-        String[] typeNameList = WeeklyType.TYPENAMELIST;
-        for (int i = 0; i < typeNameList.length; i++) {
-            WeeklyType wt = new WeeklyType();
-            wt.setWeeklyId(weeklyId);
-            wt.setName(typeNameList[i]);
-            wt.setType(i);
-            switch (i) {
-                case 0: //天气情况
-                    String start = null;
-                    String end = null;
-                    try {
-                        start = sf.format(sf.parse(startDate));
-                        end = sf.format(sf.parse(endDate));
-                    } catch (ParseException e) {
-                        throw new ServiceException("Date conversion fail.", e);
-                    }
-                    List<ProjectCityWeather> weatherList = projectCityWeatherDao.getProjectId(start, end, projectId);
-                    if (weatherList.size() > 0) {
-                        List<JSONObject> ls = new ArrayList<>();
-                        for (ProjectCityWeather weather : weatherList) {
-                            JSONObject json = new JSONObject();
-                            json.put("date", sf.format(weather.getDate()));
-                            json.put("weather", weather.getWeatherData());
-                            ls.add(json);
-                        }
-                        wt.setData(ls.toString());
-                    }
-                    break;
-                //进度情况
-                case 1:
-                    wt.setData(scheduleClient.getProjectItemIds(StringUtils.join(projectItemIds, ","), startDate, endDate));
-                    break;
-                //安全情况
-                case 2:
-                    wt.setData(getData(projectItemIds, projectId, startDate, endDate, "安全管理"));
-                    break;
-                //质量情况
-                case 3:
-                    wt.setData(getData(projectItemIds, projectId, startDate, endDate, "质量管理"));
-                    break;
-                //技术情况
-                case 4:
-                    wt.setData(getData(projectItemIds, projectId, startDate, endDate, "技术管理"));
-                    break;
-                //资源情况
-                case 5:
-                    wt.setData(getData(projectItemIds, projectId, startDate, endDate, "材料管理"));
-                    break;
-                //下周计划
-                case 6:
-                    wt.setData(null);
-                    break;
-                //问题协调
-                case 7:
-                    wt.setData(null);
-                    break;
-                //现场照片
-                case 8:
-                    wt.setData(null);
-                    break;
-                //周报文档
-                case 9:
-                    wt.setData(null);
-                    break;
-            }
-            list.add(wt);
-        }
-        return list;
-    }
-
-    @Override
-    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
-        JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap();
-        long projectId = mergedJobDataMap.getLong("projectId");
-        Project project = projectDao.get(projectId);
-        // 个人周报
-        String s = managerClient.personByProjectId(projectId);
-        if (StringUtils.isNotBlank(s)) {
-            JSONArray objects = JSONObject.parseArray(s);
-            for (int i = 0; i < objects.size(); i++) {
-                JSONObject jjo = objects.getJSONObject(i);
-                long organizationId = jjo.getLong("organizationId");
-                String organizationName = jjo.getString("organizationName");
-                String userIds = jjo.getString("userIds");
-                if(StringUtils.isNotBlank(userIds)){
-                    JSONArray jaa = JSONObject.parseArray(userIds);
-                    for(int h = 0; h<jaa.size(); h++){
-                        JSONObject jh = jaa.getJSONObject(h);
-                        WeeklyPerson wk = weeklyPersonDao.getByProjectIdUserId(organizationId, projectId, jh.getLong("userId"));
-                        WeeklyPerson wp = new WeeklyPerson();
-                        if (wk != null) {
-                            wp.setStartDate(wk.getEndDate());
-                            wp.setEndDate(sdf.format(new Date()));
-                            wp.setNumber(wk.getNumber() + 1);
-                            wp.setOrganizationId(organizationId);
-                            wp.setOrganizationName(organizationName);
-                            wp.setProjectName(project.getProjectName());
-                            wp.setProjectId(projectId);
-                            wp.setUserId(jh.getLong("userId"));
-                            wp.setName(jh.getString("userName") + "的周报");
-                            weeklyPersonDao.save(wp);
-                            weeklyTypePersonDao.batchSave(
-                                    initWorkTypePersonList(projectId, wp.getId(), wp.getStartDate(), wp.getEndDate(), jh.getLong("userId")));
-                        } else {
-                            wp.setStartDate(mergedJobDataMap.getString("startDate"));
-                            wp.setEndDate(mergedJobDataMap.getString("endDate"));
-                            wp.setNumber(1);
-                            wp.setOrganizationId(organizationId);
-                            wp.setOrganizationName(organizationName);
-                            wp.setProjectName(project.getProjectName());
-                            wp.setProjectId(projectId);
-                            wp.setUserId(jh.getLong("userId"));
-                            wp.setName(jh.getString("userName") + "的周报");
-                            weeklyPersonDao.save(wp);
-                            weeklyTypePersonDao.batchSave(
-                                    initWorkTypePersonList(projectId, wp.getId(), mergedJobDataMap.getString("startDate"), mergedJobDataMap.getString("endDate"), jh.getLong("userId")));
-                        }
-                    }
-                }
-            }
-        }
-
-        List<ProjectItem> projectItemList = projectItemDao.getByProjectId(projectId);
-        if (projectItemList.size() == 0) {
-            return;
-        }
-
-        Set<Long> organizationIds = new HashSet<>();
-        for (ProjectItem projectItem : projectItemList) {
-            Map<String, Object> organizationMap = projectItem.getOrganizationMap();
-            if (organizationMap.containsKey("10")) {
-                organizationIds.add(Long.valueOf(String.valueOf(organizationMap.get("10"))));
-            }
-        }
-
-        Map<Long, List<Long>> map = new HashMap<>();
-        for (Long id : organizationIds) {
-            List<Long> itemIds = new ArrayList<>();
-            for (ProjectItem projectItem : projectItemList) {
-                Map<String, Object> organizationMap = projectItem.getOrganizationMap();
-                if (organizationMap.containsKey("10")) {
-                    Long organizationId = Long.valueOf(String.valueOf(organizationMap.get("10")));
-                    if (id.equals(organizationId)) {
-                        itemIds.add(projectItem.getId());
-                    }
-                }
-            }
-            map.put(id, itemIds);
-        }
-
-        if (organizationIds.size() > 0) {
-            List<Weekly> list = weeklyDao.getByProjectId(projectId);
-            Weekly w = new Weekly();
-            int number = 0;
-            if (list.size() > 0) {
-                w = list.get(list.size() - 1);
-                number = w.getNumber() + 1;
-            }
-
-            for (Long id : organizationIds) {
-                MgrOrganization o = organizationDao.getById(id);
-                if (list.size() > 0) {
-                    Weekly weekly = new Weekly();
-                    weekly.setStartDate(w.getEndDate());
-                    weekly.setEndDate(sdf.format(new Date()));
-                    weekly.setOrganizationId(o.getId());
-                    weekly.setOrganizationName(o.getName());
-                    weekly.setProjectId(projectId);
-                    weekly.setProjectName(project.getProjectName());
-                    weekly.setName(project.getProjectName() + "项目周报");
-                    weekly.setNumber(number);
-                    weeklyDao.save(weekly);
-                    weeklyTypeDao.batchSave(initWorkTypeList(map.get(id), projectId, weekly.getId(), weekly.getStartDate(), weekly.getEndDate()));
-                } else {
-                    Weekly weekly = new Weekly();
-                    weekly.setStartDate(mergedJobDataMap.getString("startDate"));
-                    weekly.setEndDate(mergedJobDataMap.getString("endDate"));
-                    weekly.setOrganizationId(o.getId());
-                    weekly.setOrganizationName(o.getName());
-                    weekly.setProjectId(projectId);
-                    weekly.setProjectName(project.getProjectName());
-                    weekly.setName(project.getProjectName() + "项目周报");
-                    weekly.setNumber(1);
-                    weeklyDao.save(weekly);
-                    weeklyTypeDao.batchSave(initWorkTypeList(map.get(id), projectId, weekly.getId(), weekly.getStartDate(), weekly.getEndDate()));
-                }
-            }
-        }
-    }
-
-    private String getDataPerson(long projectId, String startDate, String endDate, long userId) {
-        List<FlowSynergyData> flowSynergyData = flowSynergyDataDao.censusPerson(startDate, endDate, projectId);
-        if (flowSynergyData.size() > 0) {
-            List<JSONObject> ls = new ArrayList<>();
-            for (FlowSynergyData fsd : flowSynergyData) {
-                int person = flowClient.person(fsd.getProjectFlowId(), userId);
-                if (person == 1) {
-                    JSONObject json = new JSONObject();
-                    json.put("id", fsd.getId());
-                    json.put("projectItemId", fsd.getProjectItemId());
-                    json.put("projectItemName", fsd.getProjectItemName());
-                    json.put("projectItemTargetId", fsd.getProjectItemTargetId());
-                    json.put("projectItemTargetName", fsd.getProjectItemTargetName());
-                    json.put("projectDivision", fsd.getProjectDivision());
-                    json.put("projectDivisionName", fsd.getProjectDivisionName());
-                    json.put("projectSubDivision", fsd.getProjectSubDivision());
-                    json.put("projectSubDivisionName", fsd.getProjectSubDivisionName());
-                    json.put("projectSubOption", fsd.getProjectSubOption());
-                    json.put("projectSubOptionName", fsd.getProjectSubOptionName());
-                    json.put("projectSubItem", fsd.getProjectSubItem());
-                    json.put("projectSubItemName", fsd.getProjectSubItemName());
-                    json.put("flowType", fsd.getFlowType());
-                    json.put("flowTypeName", fsd.getFlowTypeName());
-                    json.put("state", fsd.getState());
-                    json.put("date", sdf.format(fsd.getDate()));
-                    ls.add(json);
-                }
-            }
-            return ls.toString();
-        }
-        return null;
-    }
-
-    private List<WeeklyTypePerson> initWorkTypePersonList(long projectId, long weeklyPersonId, String startDate, String endDate, long userId) {
-        List<WeeklyTypePerson> list = new ArrayList<>();
-        String[] typeNameList = WeeklyTypePerson.TYPENAMELIST;
-        for (int i = 0; i < typeNameList.length; i++) {
-            WeeklyTypePerson wt = new WeeklyTypePerson();
-            wt.setWeeklyPersonId(weeklyPersonId);
-            wt.setName(typeNameList[i]);
-            wt.setType(i);
-            switch (i) {
-                case 0: //基本信息
-                    wt.setData(null);
-                    break;
-                case 1: //天气情况
-                    String start = null;
-                    String end = null;
-                    try {
-                        start = sf.format(sf.parse(startDate));
-                        end = sf.format(sf.parse(endDate));
-                    } catch (ParseException e) {
-                        throw new ServiceException("Date conversion fail.", e);
-                    }
-                    List<ProjectCityWeather> weatherList = projectCityWeatherDao.getProjectId(start, end, projectId);
-                    if (weatherList.size() > 0) {
-                        List<JSONObject> ls = new ArrayList<>();
-                        for (ProjectCityWeather weather : weatherList) {
-                            JSONObject json = new JSONObject();
-                            json.put("date", sf.format(weather.getDate()));
-                            json.put("weather", weather.getWeatherData());
-                            ls.add(json);
-                        }
-                        wt.setData(ls.toString());
-                    }
-                    break;
-                case 2: //完成事项
-                    wt.setData(getDataPerson(projectId, startDate, endDate, userId));
-                    break;
-                case 3: //上周事项
-                    wt.setData(null);
-                    break;
-                case 4: //下周计划
-                    wt.setData(null);
-                    break;
-                case 5: //存在问题
-                    wt.setData(null);
-                    break;
-                case 6: //工作图像
-                    wt.setData(null);
-                    break;
-            }
-            list.add(wt);
-        }
-        return list;
-    }
-
-}

+ 0 - 24
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/dao/PartItemMetaDataDao.java

@@ -1,24 +0,0 @@
-package com.bosshand.virgo.api.metadata.dao;
-
-import com.bosshand.virgo.api.metadata.model.PartItemMetaData;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-
-@Mapper
-public interface PartItemMetaDataDao {
-
-	public List<PartItemMetaData> getIds(List<Long> ids);
-
-	public List<PartItemMetaData> getList();
-
-	public List<PartItemMetaData> getParentId(long parentId);
-	
-	public void update(PartItemMetaData partItemMetaData);
-	
-	public void save(PartItemMetaData partItemMetaData);
-	
-	public void delete(long id);
-
-}

+ 0 - 22
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/dao/PartItemMetadataFlowNodeDao.java

@@ -1,22 +0,0 @@
-package com.bosshand.virgo.api.metadata.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.metadata.model.PartItemMetadataFlowNode;
-
-@Mapper
-public interface PartItemMetadataFlowNodeDao {
-	
-	public List<PartItemMetadataFlowNode> getPartItemId(long partItemId);
-	
-	public List<PartItemMetadataFlowNode> getPartItemIds(String[] ids);
-	
-	public void update(PartItemMetadataFlowNode partItemMetadataFlowNode);
-	
-	public void save(PartItemMetadataFlowNode partItemMetadataFlowNode);
-	
-	public void delete(long id);
-
-}

+ 0 - 14
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/dao/PartItemMetadataGenerateJsonDao.java

@@ -1,14 +0,0 @@
-package com.bosshand.virgo.api.metadata.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.metadata.model.PartItemMetadataGenerateJson;
-
-@Mapper
-public interface PartItemMetadataGenerateJsonDao {
-	
-	public List<PartItemMetadataGenerateJson> getPartItemId(long partItemId);
-
-}

+ 0 - 14
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/dao/ProjectFlowApproverMetaDataDao.java

@@ -1,14 +0,0 @@
-package com.bosshand.virgo.api.metadata.dao;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.metadata.model.ProjectFlowApproverMetaData;
-
-@Mapper
-public interface ProjectFlowApproverMetaDataDao {
-
-	void delete(long id);
-
-	void save(ProjectFlowApproverMetaData projectFlowApproverMetaData);
-
-}

+ 0 - 20
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/dao/ProjectFlowMetaDataDao.java

@@ -1,20 +0,0 @@
-package com.bosshand.virgo.api.metadata.dao;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Mapper;
-
-import com.bosshand.virgo.api.metadata.model.ProjectFlowMetaData;
-
-@Mapper
-public interface ProjectFlowMetaDataDao {
-	
-	List<ProjectFlowMetaData> getList();
-
-	void save(ProjectFlowMetaData projectFlowMetaData);
-
-	void update(ProjectFlowMetaData projectFlowMetaDat);
-
-	void delete(long id);
-
-}

+ 0 - 95
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/model/PartItemMetaData.java

@@ -1,95 +0,0 @@
-package com.bosshand.virgo.api.metadata.model;
-
-import java.util.List;
-
-public class PartItemMetaData {
-
-	public final static String MODEL_DATE = "[{ \"argumentName\":\"数量\", \"argumentDescption\":\"设置数量\", \"argumentType\":\"int\", \"argumentKey\":\"number\",\"headline\":\"描述:\",\"describe\":\"设置数量\",\"argumentWidget\":\"input\" }]";
-
-	private long id;
-
-	private long parentId;
-
-	private String name;
-
-	private long partId;
-
-	private String mark;
-
-	private String code;
-
-	private int sequence;
-
-	private List<PartItemMetaData> children;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public long getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(long parentId) {
-		this.parentId = parentId;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public long getPartId() {
-		return partId;
-	}
-
-	public void setPartId(long partId) {
-		this.partId = partId;
-	}
-
-	public String getMark() {
-		return mark;
-	}
-
-	public void setMark(String mark) {
-		this.mark = mark;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public int getSequence() {
-		return sequence;
-	}
-
-	public void setSequence(int sequence) {
-		this.sequence = sequence;
-	}
-
-	public List<PartItemMetaData> getChildren() {
-		return children;
-	}
-
-	public void setChildren(List<PartItemMetaData> children) {
-		this.children = children;
-	}
-
-	@Override
-	public String toString() {
-		return "PartItemMetaData [id=" + id + ", parentId=" + parentId + ", name=" + name + ", partId=" + partId
-				+ ", mark=" + mark + ", children=" + children + "]";
-	}
-
-}

+ 0 - 55
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/model/PartItemMetadataFlowNode.java

@@ -1,55 +0,0 @@
-package com.bosshand.virgo.api.metadata.model;
-
-public class PartItemMetadataFlowNode {
-	
-	private long id;
-	
-	private long partItemId;
-	
-	private int sequence;
-	
-	private String nodeName;
-	
-	private String comment;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public long getPartItemId() {
-		return partItemId;
-	}
-
-	public void setPartItemId(long partItemId) {
-		this.partItemId = partItemId;
-	}
-
-	public int getSequence() {
-		return sequence;
-	}
-
-	public void setSequence(int sequence) {
-		this.sequence = sequence;
-	}
-
-	public String getNodeName() {
-		return nodeName;
-	}
-
-	public void setNodeName(String nodeName) {
-		this.nodeName = nodeName;
-	}
-
-	public String getComment() {
-		return comment;
-	}
-
-	public void setComment(String comment) {
-		this.comment = comment;
-	}
-
-}

+ 0 - 55
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/model/PartItemMetadataGenerateJson.java

@@ -1,55 +0,0 @@
-package com.bosshand.virgo.api.metadata.model;
-
-public class PartItemMetadataGenerateJson {
-
-	private long id;
-	
-	private String name;
-	
-	private String code;
-	
-	private long partItemId;
-	
-	private int ist;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public long getPartItemId() {
-		return partItemId;
-	}
-
-	public void setPartItemId(long partItemId) {
-		this.partItemId = partItemId;
-	}
-
-	public int getIst() {
-		return ist;
-	}
-
-	public void setIst(int ist) {
-		this.ist = ist;
-	}
-
-}

+ 0 - 55
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/model/ProjectFlowApproverMetaData.java

@@ -1,55 +0,0 @@
-package com.bosshand.virgo.api.metadata.model;
-
-public class ProjectFlowApproverMetaData {
-	
-	private long id;
-	
-	private long projectFlowMetaDataId; 
-	
-	private long sequence; 
-	
-	private String flowRoleId;
-	
-	private String flowRoleName;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public long getProjectFlowMetaDataId() {
-		return projectFlowMetaDataId;
-	}
-
-	public void setProjectFlowMetaDataId(long projectFlowMetaDataId) {
-		this.projectFlowMetaDataId = projectFlowMetaDataId;
-	}
-
-	public long getSequence() {
-		return sequence;
-	}
-
-	public void setSequence(long sequence) {
-		this.sequence = sequence;
-	}
-
-	public String getFlowRoleId() {
-		return flowRoleId;
-	}
-
-	public void setFlowRoleId(String flowRoleId) {
-		this.flowRoleId = flowRoleId;
-	}
-
-	public String getFlowRoleName() {
-		return flowRoleName;
-	}
-
-	public void setFlowRoleName(String flowRoleName) {
-		this.flowRoleName = flowRoleName;
-	}
-
-}

+ 0 - 108
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/model/ProjectFlowMetaData.java

@@ -1,108 +0,0 @@
-package com.bosshand.virgo.api.metadata.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ProjectFlowMetaData {
-	
-	private long id;
-	
-	private int type; 
-	
-	private String name;
-	
-	private String submitRequiredRoles;
-	
-	private String requireRoles;
-	
-	private boolean enable;
-	
-	private String tag;
-	
-	private String files;
-	
-	private long typeCascadeId;
-	
-	private List<ProjectFlowApproverMetaData> approverList = new ArrayList<ProjectFlowApproverMetaData>();
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public int getType() {
-		return type;
-	}
-
-	public void setType(int type) {
-		this.type = type;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getSubmitRequiredRoles() {
-		return submitRequiredRoles;
-	}
-
-	public void setSubmitRequiredRoles(String submitRequiredRoles) {
-		this.submitRequiredRoles = submitRequiredRoles;
-	}
-
-	public String getRequireRoles() {
-		return requireRoles;
-	}
-
-	public void setRequireRoles(String requireRoles) {
-		this.requireRoles = requireRoles;
-	}
-
-	public boolean isEnable() {
-		return enable;
-	}
-
-	public void setEnable(boolean enable) {
-		this.enable = enable;
-	}
-
-	public String getTag() {
-		return tag;
-	}
-
-	public void setTag(String tag) {
-		this.tag = tag;
-	}
-
-	public String getFiles() {
-		return files;
-	}
-
-	public void setFiles(String files) {
-		this.files = files;
-	}
-
-	public List<ProjectFlowApproverMetaData> getApproverList() {
-		return approverList;
-	}
-
-	public void setApproverList(List<ProjectFlowApproverMetaData> approverList) {
-		this.approverList = approverList;
-	}
-
-	public long getTypeCascadeId() {
-		return typeCascadeId;
-	}
-
-	public void setTypeCascadeId(long typeCascadeId) {
-		this.typeCascadeId = typeCascadeId;
-	}
-	
-}

+ 0 - 297
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/service/PartItemMetaDataService.java

@@ -1,297 +0,0 @@
-package com.bosshand.virgo.api.metadata.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.bosshand.virgo.api.metadata.dao.PartItemMetaDataDao;
-import com.bosshand.virgo.api.metadata.dao.PartItemMetadataFlowNodeDao;
-import com.bosshand.virgo.api.metadata.dao.PartItemMetadataGenerateJsonDao;
-import com.bosshand.virgo.api.metadata.model.PartItemMetaData;
-import com.bosshand.virgo.api.metadata.model.PartItemMetadataFlowNode;
-import com.bosshand.virgo.api.metadata.model.PartItemMetadataGenerateJson;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-
-@Service
-public class PartItemMetaDataService {
-
-	@Autowired
-	PartItemMetaDataDao partItemMetaDataDao;
-	
-	@Autowired
-	PartItemMetadataFlowNodeDao partItemMetadataFlowNodeDao;
-	
-	@Autowired
-	PartItemMetadataGenerateJsonDao partItemMetadataGenerateJsonDao;
-	
-	public List<PartItemMetadataFlowNode> getPartItemIds(String partItemIds) {
-		String[] ids = partItemIds.split(",");
-		return partItemMetadataFlowNodeDao.getPartItemIds(ids);
-	}
-
-	public PartItemMetaData getRootPartItemMetaData(Long id) {
-		return getNodeTreeById(id);
-	}
-
-	private PartItemMetaData getNodeTreeById(Long id) {
-		PartItemMetaData node = null;
-		List<PartItemMetaData> partItemList = cache();
-		for (PartItemMetaData data : partItemList) {
-			if (data.getId() == id) {
-				node = data;
-				break;
-			}
-		}
-		if (node != null) {
-			List<PartItemMetaData> list = getChildNode(node.getId(), partItemList);
-			List<PartItemMetaData> newList = list.stream().
-					sorted(Comparator.comparing(PartItemMetaData::getSequence, Comparator.reverseOrder())).
-					collect(Collectors.toList());
-			node.setChildren(newList);
-		}
-		return node;
-	}
-
-	private List<PartItemMetaData> getChildNode(Long parentId, List<PartItemMetaData> list) {
-		List<PartItemMetaData> nodeList = new ArrayList<PartItemMetaData>();
-		nodeList.clear();
-		for (PartItemMetaData data : list) {
-			if (data.getParentId() == parentId) {
-				nodeList.add(data);
-			}
-		}
-		if (nodeList.size() > 0) {
-			for (PartItemMetaData data : nodeList) {
-				List<PartItemMetaData> childList = getChildNode(data.getId(), list);
-				List<PartItemMetaData> newList = childList.stream().
-						sorted(Comparator.comparing(PartItemMetaData::getSequence, Comparator.reverseOrder())).
-						collect(Collectors.toList());
-				data.setChildren(newList);
-			}
-		}
-		return nodeList;
-	}
-
-	public List<PartItemMetaData> getParentId(long parentId) {
-		return partItemMetaDataDao.getParentId(parentId);
-	}
-	
-	public List<PartItemMetaData> getList(String ids) {
-		List<PartItemMetaData> list = new ArrayList<>();
-		String[] is = ids.split(",");
-		for (int i = 0; i < is.length; i++) {
-			list.add(getRootPartItemMetaData(Long.valueOf(is[i])));
-		}
-		return list;
-	}
-	
-	private List<PartItemMetaData> removeDuplicate(List<PartItemMetaData> list) {
-		for (int i = 0; i < list.size() - 1; i++) {
-			for (int j = list.size() - 1; j > i; j--) {
-				if (list.get(j).getId() == list.get(i).getId()) {
-					list.remove(j);
-				}
-			}
-		}
-		return list;
-	}
-	
-	private PartItemMetaData getByPartItemId(long id) {
-		List<PartItemMetaData> cache = cache();
-		for (PartItemMetaData partItem : cache) {
-			if (partItem.getId() == id) {
-				return partItem;
-			}
-		}
-		return null;
-	}
-	
-	private PartItemMetaData getTreeById(Long id, List<PartItemMetaData> list) {
-		PartItemMetaData node = null;
-		List<PartItemMetaData> partItemList = list;
-		for (PartItemMetaData data : partItemList) {
-			if (data.getId() == id) {
-				node = data;
-				break;
-			}
-		}
-		if (node != null) {
-			node.setChildren(getChildNode(node.getId(), partItemList));
-		}
-		return node;
-	}
-	
-	public List<PartItemMetaData> checked(String ids) {
-		List<PartItemMetaData> list = new ArrayList<PartItemMetaData>();
-		
-		Set<Long> roots = new HashSet<>();
-		String[] split = ids.split(",");
-		for (int i = 0; i < split.length; i++) {
-			PartItemMetaData a = getByPartItemId(Long.parseLong(split[i]));
-			if (a == null) {
-				continue;
-			}
-			list.add(a);
-			
-			PartItemMetaData b = getByPartItemId(a.getParentId());
-			if (b == null) {
-				continue;
-			}
-			list.add(b);
-			
-			PartItemMetaData c = getByPartItemId(b.getParentId());
-			if (c == null) {
-				continue;
-			}
-			list.add(c);
-			
-			PartItemMetaData d = getByPartItemId(c.getParentId());
-			if (d == null) {
-				continue;
-			}
-			list.add(d);
-			
-			PartItemMetaData e = getByPartItemId(d.getParentId());
-			if (e == null) {
-				continue;
-			}
-			list.add(e);
-			
-			PartItemMetaData f = getByPartItemId(e.getParentId());
-			if (f == null) {
-				continue;
-			}
-			list.add(f);
-			
-		}
-		List<PartItemMetaData> pms = removeDuplicate(list);
-		
-		pms.forEach(ls->{
-			if(ls.getParentId() == -1) {
-				roots.add(ls.getId());
-			}
-		});
-		
-		List<PartItemMetaData> ls = new ArrayList<>();
-		for (long root : roots) {
-			ls.add(getTreeById(root, pms));
-		}
-		return ls;
-	}
-	
-	private Map<Integer, List<PartItemMetaData>> partItemListCache = new HashMap<Integer, List<PartItemMetaData>>();
-
-	private List<PartItemMetaData> cache() {
-		List<PartItemMetaData> partItemList = partItemListCache.get(-1);
-		if (partItemList == null) {
-			partItemList = partItemMetaDataDao.getList();
-			partItemListCache.put(-1, partItemList);
-		}
-		return partItemList;
-	}
-	
-	public JSONObject getTypeId(long typeId) {
-		PartItemMetaData partItemMetaData = getRootPartItemMetaData(typeId);
-		StringBuilder sb = new StringBuilder();
-		sb.append("{\"itemGroups\":[");
-		List<PartItemMetaData> children = partItemMetaData.getChildren();
-		for (int i = 0; i < children.size(); i++) {
-			sb.append("{");
-			sb.append("\"name\":");
-			sb.append("\"");
-			sb.append(children.get(i).getName());
-			sb.append("\"");
-			sb.append(",");
-			StringBuilder sbt = new StringBuilder();
-			int size = children.get(i).getChildren().size();
-			for (int j = 0; j < size; j++) {
-				if (j != size - 1) {
-					sbt.append(children.get(i).getChildren().get(j).getId() + ",");
-				} else {
-					sbt.append(children.get(i).getChildren().get(j).getId());
-				}
-			}
-			List<PartItemMetadataGenerateJson> list = partItemMetadataGenerateJsonDao.getPartItemId(children.get(i).getId());
-			sb.append("\"items\":");
-			sb.append("[");
-			for (int a = 0; a < list.size(); a++) {
-				if(list.get(a).getIst() == 1) {
-					if (a != list.size() - 1) {
-						sb.append("{\"code\":\""+list.get(a).getCode()+"\", \"ist\":\""+list.get(a).getIst()+"\", \"name\": \""+list.get(a).getName()+"\", \"pattern\": \""+list.get(a).getName()+"{number}\", \"partitems\": ["+sbt.toString()+"]},");
-					}else {
-						sb.append("{\"code\":\""+list.get(a).getCode()+"\", \"ist\":\""+list.get(a).getIst()+"\", \"name\": \""+list.get(a).getName()+"\", \"pattern\": \""+list.get(a).getName()+"{number}\", \"partitems\": ["+sbt.toString()+"]}");
-					}
-				}else {
-					if (a != list.size() - 1) {
-						sb.append("{\"code\":\""+list.get(a).getCode()+"\", \"ist\":\""+list.get(a).getIst()+"\", \"name\": \""+list.get(a).getName()+"\", \"pattern\": \""+list.get(a).getName()+"\",\"partitems\":["+sbt.toString()+"]},");
-					}else {
-						sb.append("{\"code\":\""+list.get(a).getCode()+"\", \"ist\":\""+list.get(a).getIst()+"\", \"name\": \""+list.get(a).getName()+"\", \"pattern\": \""+list.get(a).getName()+"\",\"partitems\":["+sbt.toString()+"]}");
-					}	
-				}
-			}
-			sb.append("]");
-			if (i != children.size() - 1) {
-				sb.append("},");
-			} else {
-				sb.append("}");
-			}
-		}
-		sb.append("]}");
-		
-		return JSONObject.parseObject(sb.toString());
-	}
-	
-	public PartItemMetaData updatePartItemMetaData(PartItemMetaData partItemMetaData) {
-		partItemMetaDataDao.update(partItemMetaData);
-		partItemListCache.clear();
-		return partItemMetaData;
-	}
-	
-	public void updatePartItemMetaDataByIdentifyType(long id) {
-		PartItemMetaData partItemMetaData = getNodeTreeById(id);
-		recursive(partItemMetaData, partItemMetaData.getMark());
-		partItemListCache.clear();
-	}
-
-	private PartItemMetaData recursive(PartItemMetaData partItemMetaData, String mark) {
-		List<PartItemMetaData> children = partItemMetaData.getChildren();
-		if (children != null && children.size() > 0) {
-			for (PartItemMetaData pim : children) {
-				pim.setMark(mark);
-				partItemMetaDataDao.update(pim);
-				recursive(pim, mark);
-			}
-		}
-		return partItemMetaData;
-	}
-	
-	public PartItemMetaData savePartItemMetaData(PartItemMetaData partItemMetaData) {
-		partItemMetaDataDao.save(partItemMetaData);
-		partItemListCache.clear();
-		return partItemMetaData;
-	}
-	
-	public void deletePartItemMetaData(long id) {
-		partItemMetaDataDao.delete(id);
-		partItemListCache.clear();
-	}
-	
-	//==================================================================================================
-	
-	public PartItemMetadataFlowNode updatePartItemMetadataFlowNode(PartItemMetadataFlowNode partItemMetadataFlowNode) {
-		partItemMetadataFlowNodeDao.update(partItemMetadataFlowNode);
-		return partItemMetadataFlowNode;
-	}
-	
-	public PartItemMetadataFlowNode savePartItemMetadataFlowNode(PartItemMetadataFlowNode partItemMetadataFlowNode){
-		partItemMetadataFlowNodeDao.save(partItemMetadataFlowNode);
-		return partItemMetadataFlowNode;
-	}
-	
-	public void deletePartItemMetadataFlowNode(long id) {
-		partItemMetadataFlowNodeDao.delete(id);
-	}
-
-}

+ 0 - 23
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/service/ProjectFlowApproverMetaDataService.java

@@ -1,23 +0,0 @@
-package com.bosshand.virgo.api.metadata.service;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.bosshand.virgo.api.metadata.dao.ProjectFlowApproverMetaDataDao;
-import com.bosshand.virgo.api.metadata.model.ProjectFlowApproverMetaData;
-
-@Service
-public class ProjectFlowApproverMetaDataService {
-	
-	@Autowired
-	ProjectFlowApproverMetaDataDao projectFlowApproverMetaDataDao;
-
-	public void delete(long id) {
-		projectFlowApproverMetaDataDao.delete(id);
-	}
-
-	public void save(ProjectFlowApproverMetaData projectFlowApproverMetaData) {
-		projectFlowApproverMetaDataDao.save(projectFlowApproverMetaData);
-	}
-
-}

+ 0 - 33
virgo.api/src/main/java/com/bosshand/virgo/api/metadata/service/ProjectFlowMetaDataService.java

@@ -1,33 +0,0 @@
-package com.bosshand.virgo.api.metadata.service;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.bosshand.virgo.api.metadata.dao.ProjectFlowMetaDataDao;
-import com.bosshand.virgo.api.metadata.model.ProjectFlowMetaData;
-
-@Service
-public class ProjectFlowMetaDataService {
-	
-	@Autowired
-	ProjectFlowMetaDataDao projectFlowMetaDataDao;
-
-	public List<ProjectFlowMetaData> getList() {
-		return projectFlowMetaDataDao.getList();
-	}
-
-	public void save(ProjectFlowMetaData projectFlowMetaData) {
-		projectFlowMetaDataDao.save(projectFlowMetaData);
-	}
-
-	public void update(ProjectFlowMetaData projectFlowMetaDat) {
-		projectFlowMetaDataDao.update(projectFlowMetaDat);
-	}
-
-	public void delete(long id) {
-		projectFlowMetaDataDao.delete(id);
-	}
-
-}

+ 0 - 35
virgo.api/src/main/java/com/bosshand/virgo/api/model/BimModelTarget.java

@@ -1,35 +0,0 @@
-package com.bosshand.virgo.api.model;
-
-public class BimModelTarget {
-	
-	private long id;
-	
-	private long projectItemTargetId;
-	
-	private String bims;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public long getProjectItemTargetId() {
-		return projectItemTargetId;
-	}
-
-	public void setProjectItemTargetId(long projectItemTargetId) {
-		this.projectItemTargetId = projectItemTargetId;
-	}
-
-	public String getBims() {
-		return bims;
-	}
-
-	public void setBims(String bims) {
-		this.bims = bims;
-	}
-	
-}

+ 0 - 25
virgo.api/src/main/java/com/bosshand/virgo/api/model/BimType.java

@@ -1,25 +0,0 @@
-package com.bosshand.virgo.api.model;
-
-public class BimType {
-	
-	private int id;
-	
-	private String typeName;
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public String getTypeName() {
-		return typeName;
-	}
-
-	public void setTypeName(String typeName) {
-		this.typeName = typeName;
-	}
-
-}

+ 0 - 0
virgo.api/src/main/java/com/bosshand/virgo/api/model/Collaborative.java


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels