Explorar el Código

单独抽离出前后端分离版本 后端代码

java110 hace 6 años
padre
commit
dfd860facd
Se han modificado 100 ficheros con 344 adiciones y 439 borrados
  1. 0 4
      AppFrontService/src/main/java/com/java110/app/smo/test.java
  2. 0 75
      AppFrontService/src/main/resources/dataSource.yml
  3. 0 0
      FrontService/docker/Dockerfile
  4. 0 0
      FrontService/docker/bin/start_appFront.sh
  5. 0 0
      FrontService/docker/docker-compose.yml
  6. 0 0
      FrontService/docker/onStart.sh
  7. 3 3
      AppFrontService/pom.xml
  8. 8 6
      AppFrontService/src/main/java/com/java110/app/AppFrontServiceApplicationStart.java
  9. 0 0
      FrontService/src/main/java/com/java110/front/aop/PageProcessAspect.java
  10. 9 8
      WebService/src/main/java/com/java110/web/components/AddPrivilegeGroupComponent.java
  11. 8 9
      WebService/src/main/java/com/java110/web/components/AddStaffComponent.java
  12. 22 17
      WebService/src/main/java/com/java110/web/components/CompanyComponent.java
  13. 0 0
      FrontService/src/main/java/com/java110/front/components/CoreComponent.java
  14. 9 7
      WebService/src/main/java/com/java110/web/components/DeletePrivilegeGroupComponent.java
  15. 8 7
      WebService/src/main/java/com/java110/web/components/DeleteStaffComponent.java
  16. 9 8
      WebService/src/main/java/com/java110/web/components/EditPrivilegeGroupComponent.java
  17. 9 7
      WebService/src/main/java/com/java110/web/components/EditStaffComponent.java
  18. 2 2
      WebService/src/main/java/com/java110/web/components/ItemOutBindingComponent.java
  19. 5 4
      WebService/src/main/java/com/java110/web/components/LoginComponent.java
  20. 2 2
      WebService/src/main/java/com/java110/web/components/MenuComponent.java
  21. 6 7
      WebService/src/main/java/com/java110/web/components/NavComponent.java
  22. 8 7
      WebService/src/main/java/com/java110/web/components/PrivilegeComponent.java
  23. 8 7
      WebService/src/main/java/com/java110/web/components/PrivilegeGroupComponent.java
  24. 3 3
      WebService/src/main/java/com/java110/web/components/RegisterComponent.java
  25. 10 12
      WebService/src/main/java/com/java110/web/components/StaffComponent.java
  26. 14 12
      WebService/src/main/java/com/java110/web/components/ValidateCodeComponent.java
  27. 15 12
      WebService/src/main/java/com/java110/web/components/ValidateTelComponent.java
  28. 1 1
      WebService/src/main/java/com/java110/web/components/VueTestComponent.java
  29. 5 10
      WebService/src/main/java/com/java110/web/components/activities/ActivitiesManageComponent.java
  30. 2 2
      WebService/src/main/java/com/java110/web/components/activities/AddActivitiesViewComponent.java
  31. 5 10
      WebService/src/main/java/com/java110/web/components/activities/ChooseActivitiesComponent.java
  32. 5 11
      WebService/src/main/java/com/java110/web/components/activities/DeleteActivitiesComponent.java
  33. 2 2
      WebService/src/main/java/com/java110/web/components/activities/EditActivitiesViewComponent.java
  34. 2 2
      WebService/src/main/java/com/java110/web/components/advert/AddAdvertComponent.java
  35. 2 2
      WebService/src/main/java/com/java110/web/components/advert/AdvertManageComponent.java
  36. 2 6
      WebService/src/main/java/com/java110/web/components/advert/AdvertVedioViewComponent.java
  37. 2 2
      WebService/src/main/java/com/java110/web/components/advert/ChooseAdvertComponent.java
  38. 2 2
      WebService/src/main/java/com/java110/web/components/advert/DeleteAdvertComponent.java
  39. 3 3
      WebService/src/main/java/com/java110/web/components/advert/EditAdvertComponent.java
  40. 2 2
      WebService/src/main/java/com/java110/web/components/app/AddAppComponent.java
  41. 2 2
      WebService/src/main/java/com/java110/web/components/app/AppManageComponent.java
  42. 2 2
      WebService/src/main/java/com/java110/web/components/app/ChooseAppComponent.java
  43. 2 2
      WebService/src/main/java/com/java110/web/components/app/DeleteAppComponent.java
  44. 2 2
      WebService/src/main/java/com/java110/web/components/app/EditAppComponent.java
  45. 2 2
      WebService/src/main/java/com/java110/web/components/applicationKey/AddApplicationKeyComponent.java
  46. 2 2
      WebService/src/main/java/com/java110/web/components/applicationKey/ApplicationKeyManageComponent.java
  47. 3 4
      WebService/src/main/java/com/java110/web/components/applicationKey/AuditApplicationKeyManageComponent.java
  48. 2 2
      WebService/src/main/java/com/java110/web/components/applicationKey/ChooseApplicationKeyComponent.java
  49. 2 2
      WebService/src/main/java/com/java110/web/components/applicationKey/DeleteApplicationKeyComponent.java
  50. 2 2
      WebService/src/main/java/com/java110/web/components/applicationKey/EditApplicationKeyComponent.java
  51. 3 3
      WebService/src/main/java/com/java110/web/components/assetImport/AssetImportComponent.java
  52. 2 2
      WebService/src/main/java/com/java110/web/components/auditUser/AddAuditUserStepBindingComponent.java
  53. 2 2
      WebService/src/main/java/com/java110/web/components/auditUser/AuditUserManageComponent.java
  54. 2 2
      WebService/src/main/java/com/java110/web/components/auditUser/ChooseAuditUserComponent.java
  55. 2 2
      WebService/src/main/java/com/java110/web/components/auditUser/DeleteAuditUserComponent.java
  56. 3 4
      WebService/src/main/java/com/java110/web/components/auditUser/MyAuditComplaintsComponent.java
  57. 2 4
      WebService/src/main/java/com/java110/web/components/auditUser/MyAuditHistoryComplaintsComponent.java
  58. 2 3
      WebService/src/main/java/com/java110/web/components/auditUser/MyAuditOrdersComponent.java
  59. 2 2
      WebService/src/main/java/com/java110/web/components/basePrivilege/AddBasePrivilegeComponent.java
  60. 2 2
      WebService/src/main/java/com/java110/web/components/basePrivilege/BasePrivilegeManageComponent.java
  61. 2 2
      WebService/src/main/java/com/java110/web/components/basePrivilege/ChooseBasePrivilegeComponent.java
  62. 2 2
      WebService/src/main/java/com/java110/web/components/basePrivilege/DeleteBasePrivilegeComponent.java
  63. 2 2
      WebService/src/main/java/com/java110/web/components/basePrivilege/EditBasePrivilegeComponent.java
  64. 2 4
      WebService/src/main/java/com/java110/web/components/businesstype/ListBusinessTypeComponent.java
  65. 2 3
      WebService/src/main/java/com/java110/web/components/cache/CacheManageComponent.java
  66. 4 4
      WebService/src/main/java/com/java110/web/components/car/SellParkingSpaceComponent.java
  67. 2 2
      WebService/src/main/java/com/java110/web/components/carBlackWhite/AddCarBlackWhiteComponent.java
  68. 2 2
      WebService/src/main/java/com/java110/web/components/carBlackWhite/CarBlackWhiteManageComponent.java
  69. 2 2
      WebService/src/main/java/com/java110/web/components/carBlackWhite/ChooseCarBlackWhiteComponent.java
  70. 2 2
      WebService/src/main/java/com/java110/web/components/carBlackWhite/DeleteCarBlackWhiteComponent.java
  71. 2 2
      WebService/src/main/java/com/java110/web/components/carBlackWhite/EditCarBlackWhiteComponent.java
  72. 2 2
      WebService/src/main/java/com/java110/web/components/carInout/CarInManageComponent.java
  73. 2 2
      WebService/src/main/java/com/java110/web/components/carInout/CarInoutManageComponent.java
  74. 11 9
      WebService/src/main/java/com/java110/web/components/community/AddCommunityComponent.java
  75. 2 3
      WebService/src/main/java/com/java110/web/components/community/AreaSelectComponent.java
  76. 3 3
      WebService/src/main/java/com/java110/web/components/community/AuditCommunityManageComponent.java
  77. 3 4
      WebService/src/main/java/com/java110/web/components/community/AuditEnterCommunityManageComponent.java
  78. 2 2
      WebService/src/main/java/com/java110/web/components/community/CommunityManageComponent.java
  79. 2 2
      WebService/src/main/java/com/java110/web/components/community/DeleteCommunityComponent.java
  80. 2 2
      WebService/src/main/java/com/java110/web/components/community/EditCommunityComponent.java
  81. 10 11
      WebService/src/main/java/com/java110/web/components/community/EnterCommunityComponent.java
  82. 2 5
      WebService/src/main/java/com/java110/web/components/community/RecallAuditEnterFinishCommunityComponent.java
  83. 2 6
      WebService/src/main/java/com/java110/web/components/community/RecallAuditFinishCommunityComponent.java
  84. 2 2
      WebService/src/main/java/com/java110/web/components/community/StoreEnterCommunityComponent.java
  85. 2 2
      WebService/src/main/java/com/java110/web/components/community/StoresCommunityComponent.java
  86. 8 7
      WebService/src/main/java/com/java110/web/components/community/storeExitCommunityComponent.java
  87. 2 2
      WebService/src/main/java/com/java110/web/components/complaint/AddComplaintStepBindingComponent.java
  88. 2 2
      WebService/src/main/java/com/java110/web/components/complaint/ChooseComplaintComponent.java
  89. 2 2
      WebService/src/main/java/com/java110/web/components/complaint/ComplaintManageComponent.java
  90. 2 2
      WebService/src/main/java/com/java110/web/components/complaint/DeleteComplaintComponent.java
  91. 2 2
      WebService/src/main/java/com/java110/web/components/complaint/EditComplaintComponent.java
  92. 2 2
      WebService/src/main/java/com/java110/web/components/configMenu/ConfigMenuBindingComponent.java
  93. 2 3
      WebService/src/main/java/com/java110/web/components/demo/AddDemoComponent.java
  94. 2 2
      WebService/src/main/java/com/java110/web/components/demo/ListDemoComponent.java
  95. 4 3
      WebService/src/main/java/com/java110/web/components/demo/ListDemoStudyComponent.java
  96. 2 2
      WebService/src/main/java/com/java110/web/components/devServiceProvide/DevServiceProvideBindingComponent.java
  97. 2 2
      WebService/src/main/java/com/java110/web/components/fee/AddFeeConfigComponent.java
  98. 2 2
      WebService/src/main/java/com/java110/web/components/fee/ChooseFeeConfigComponent.java
  99. 3 2
      WebService/src/main/java/com/java110/web/components/fee/ConfigParkingSpaceFeeComponent.java
  100. 0 0
      WebService/src/main/java/com/java110/web/components/fee/ConfigParkingSpaceTempFeeComponent.java

+ 0 - 4
AppFrontService/src/main/java/com/java110/app/smo/test.java

@@ -1,4 +0,0 @@
-package com.java110.app.smo;
-
-public class test {
-}

+ 0 - 75
AppFrontService/src/main/resources/dataSource.yml

@@ -1,75 +0,0 @@
-dataSources:
-  ds0: !!com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8
-    username: hc_community
-    password: hc_community@12345678
-    minIdle: 5
-    validationQuery: SELECT 1 FROM DUAL
-    initialSize: 5
-    maxWait: 60000
-    filters: stat,wall,log4j
-    poolPreparedStatements: true
-#  ds0_slave0: !!com.alibaba.druid.pool.DruidDataSource
-#    driverClassName: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-#    username: TT
-#    password: TT@12345678
-#    connectionTimeoutMilliseconds: 30000
-#    idleTimeoutMilliseconds: 60000
-#    maxPoolSize: 50
-#    minPoolSize: 1
-#    maintenanceIntervalMilliseconds: 30000
-  ds1: !!com.alibaba.druid.pool.DruidDataSource
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-    username: TT
-    password: TT@12345678
-    minIdle: 5
-    validationQuery: SELECT 1 FROM DUAL
-    initialSize: 5
-    maxWait: 60000
-    filters: stat,wall,log4j
-    poolPreparedStatements: true
-#  ds1_slave0: !!com.alibaba.druid.pool.DruidDataSource
-#    driverClassName: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-#    username: TT
-#    password: TT@12345678
-#    connectionTimeoutMilliseconds: 30000
-#    idleTimeoutMilliseconds: 60000
-#    maxPoolSize: 50
-#    minPoolSize: 1
-#    maintenanceIntervalMilliseconds: 30000
-
-shardingRule:
-  tables:
-    business_xxx:
-      actualDataNodes: ds${0..1}.business_community
-      databaseStrategy:
-        inline:
-          shardingColumn: community_id
-          algorithmExpression: ds${Long.parseLong(community_id) % 2}
-
-  bindingTables:
-    - business_xxx
-
-  defaultDataSourceName: ds1
-  defaultDatabaseStrategy:
-    none:
-  defaultTableStrategy:
-    none:
-
-#  masterSlaveRules:
-#    ms_ds0:
-#     masterDataSourceName: ds0
-#     slaveDataSourceNames:
-#       - ds0_slave0
-#     loadBalanceAlgorithmType: ROUND_ROBIN
-#   ms_ds1:
-#     masterDataSourceName: ds1
-#     slaveDataSourceNames:
-#       - ds1_slave0
-#     loadBalanceAlgorithmType: ROUND_ROBIN
-props:
-  sql.show: true

AppFrontService/docker/Dockerfile → FrontService/docker/Dockerfile


AppFrontService/docker/bin/start_appFront.sh → FrontService/docker/bin/start_appFront.sh


AppFrontService/docker/docker-compose.yml → FrontService/docker/docker-compose.yml


AppFrontService/docker/onStart.sh → FrontService/docker/onStart.sh


+ 3 - 3
AppFrontService/pom.xml

@@ -9,9 +9,9 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>AppFrontService</artifactId>
+    <artifactId>FrontService</artifactId>
 
-    <name>AppFrontService</name>
+    <name>FrontService</name>
     <!-- FIXME change it to the project's website -->
     <url>http://www.example.com</url>
 
@@ -84,7 +84,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.java110.app.AppFrontServiceApplicationStart</mainClass>
+                    <mainClass>com.java110.front.FrontServiceApplicationStart</mainClass>
                 </configuration>
             </plugin>
         </plugins>

+ 8 - 6
AppFrontService/src/main/java/com/java110/app/AppFrontServiceApplicationStart.java

@@ -1,4 +1,4 @@
-package com.java110.app;
+package com.java110.front;
 
 import com.java110.service.init.ServiceStartInit;
 import com.java110.front.core.VueComponentTemplate;
@@ -36,14 +36,16 @@ import java.nio.charset.Charset;
         "com.java110.app",
         "com.java110.core",
         "com.java110.config.properties.code",
-        "com.java110.cache"
+        "com.java110.cache",
+        "com.java110.report"
 })
+
 @EnableDiscoveryClient
 //@EnableConfigurationProperties(EventProperties.class)
 @EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class})
-public class AppFrontServiceApplicationStart {
+public class FrontServiceApplicationStart {
 
-    private static Logger logger = LoggerFactory.getLogger(AppFrontServiceApplicationStart.class);
+    private static Logger logger = LoggerFactory.getLogger(FrontServiceApplicationStart.class);
 
 
     /**
@@ -62,9 +64,9 @@ public class AppFrontServiceApplicationStart {
 
     public static void main(String[] args) throws Exception {
         try {
-            ApplicationContext context = SpringApplication.run(AppFrontServiceApplicationStart.class, args);
+            ApplicationContext context = SpringApplication.run(FrontServiceApplicationStart.class, args);
             ServiceStartInit.initSystemConfig(context);
-            VueComponentTemplate.initComponent(VueComponentTemplate.DEFAULT_COMPONENT_PACKAGE_PATH);
+            //VueComponentTemplate.initComponent(VueComponentTemplate.DEFAULT_COMPONENT_PACKAGE_PATH);
         }catch (Throwable e){
             logger.error("系统启动失败",e);
         }

java110-front/src/main/java/com/java110/front/aop/PageProcessAspect.java → FrontService/src/main/java/com/java110/front/aop/PageProcessAspect.java


+ 9 - 8
WebService/src/main/java/com/java110/web/components/AddPrivilegeGroupComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IPrivilegeServiceSMO;
+import com.java110.front.smo.IPrivilegeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 添加权限组组件
- *
+ * <p>
  * add by wuxw
  * 2019-04-08
  */
@@ -23,16 +23,17 @@ public class AddPrivilegeGroupComponent {
 
     /**
      * 保存权限组信息
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> savePrivilegeGroupInfo(IPageData pd){
+    public ResponseEntity<String> savePrivilegeGroupInfo(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  privilegeServiceSMOImpl.savePrivilegeGroup(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = privilegeServiceSMOImpl.savePrivilegeGroup(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 8 - 9
WebService/src/main/java/com/java110/web/components/AddStaffComponent.java

@@ -1,15 +1,13 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
-import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IStaffServiceSMO;
+import com.java110.front.smo.IStaffServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
 /**
- *
  * 添加员工 组件
  * Created by Administrator on 2019/4/2.
  */
@@ -21,17 +19,18 @@ public class AddStaffComponent {
 
     /**
      * 保存员工
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> saveStaff(IPageData pd){
+    public ResponseEntity<String> saveStaff(IPageData pd) {
 
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  staffServiceSMOImpl.saveStaff(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = staffServiceSMOImpl.saveStaff(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 22 - 17
WebService/src/main/java/com/java110/web/components/CompanyComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.ICompanyServiceSMO;
+import com.java110.front.smo.ICompanyServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -17,49 +17,54 @@ public class CompanyComponent {
 
     @Autowired
     ICompanyServiceSMO companyServiceSMOImpl;
+
     /**
      * 获取商户类型
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> getStoreType(IPageData pd){
+    public ResponseEntity<String> getStoreType(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  companyServiceSMOImpl.getStoreType(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = companyServiceSMOImpl.getStoreType(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }
 
     /**
      * 保存公司信息
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> saveCompanyInfo(IPageData pd){
+    public ResponseEntity<String> saveCompanyInfo(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  companyServiceSMOImpl.saveCompanyInfo(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = companyServiceSMOImpl.saveCompanyInfo(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }
+
     /**
      * 功能描述: 查询所有省市
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> getAreas(IPageData pd){
+    public ResponseEntity<String> getAreas(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  companyServiceSMOImpl.getAreas(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = companyServiceSMOImpl.getAreas(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

java110-front/src/main/java/com/java110/front/components/CoreComponent.java → FrontService/src/main/java/com/java110/front/components/CoreComponent.java


+ 9 - 7
WebService/src/main/java/com/java110/web/components/DeletePrivilegeGroupComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IPrivilegeServiceSMO;
+import com.java110.front.smo.IPrivilegeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -12,18 +12,20 @@ public class DeletePrivilegeGroupComponent {
 
     @Autowired
     private IPrivilegeServiceSMO privilegeServiceSMOImpl;
+
     /**
      * 删除权限组
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> delete(IPageData pd){
+    public ResponseEntity<String> delete(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  privilegeServiceSMOImpl.deletePrivilegeGroup(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = privilegeServiceSMOImpl.deletePrivilegeGroup(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 8 - 7
WebService/src/main/java/com/java110/web/components/DeleteStaffComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IStaffServiceSMO;
+import com.java110.front.smo.IStaffServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -16,14 +16,15 @@ public class DeleteStaffComponent {
 
     @Autowired
     IStaffServiceSMO staffServiceSMOImpl;
-    public ResponseEntity<String> delete(IPageData pd){
+
+    public ResponseEntity<String> delete(IPageData pd) {
 
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  staffServiceSMOImpl.delete(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = staffServiceSMOImpl.delete(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 9 - 8
WebService/src/main/java/com/java110/web/components/EditPrivilegeGroupComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IPrivilegeServiceSMO;
+import com.java110.front.smo.IPrivilegeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 添加权限组组件
- *
+ * <p>
  * add by wuxw
  * 2019-04-08
  */
@@ -23,16 +23,17 @@ public class EditPrivilegeGroupComponent {
 
     /**
      * 保存权限组信息
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> editPrivilegeGroupInfo(IPageData pd){
+    public ResponseEntity<String> editPrivilegeGroupInfo(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  privilegeServiceSMOImpl.editPrivilegeGroup(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = privilegeServiceSMOImpl.editPrivilegeGroup(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 9 - 7
WebService/src/main/java/com/java110/web/components/EditStaffComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IStaffServiceSMO;
+import com.java110.front.smo.IStaffServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -16,19 +16,21 @@ public class EditStaffComponent {
 
     @Autowired
     IStaffServiceSMO staffServiceSMOImpl;
+
     /**
      * 修改员工信息
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> modifyStaff(IPageData pd){
+    public ResponseEntity<String> modifyStaff(IPageData pd) {
 
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  staffServiceSMOImpl.modifyStaff(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = staffServiceSMOImpl.modifyStaff(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 2 - 2
WebService/src/main/java/com/java110/web/components/ItemOutBindingComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.itemOut.IItemOutBindingSMO;
+import com.java110.front.smo.itemOut.IItemOutBindingSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 5 - 4
WebService/src/main/java/com/java110/web/components/LoginComponent.java

@@ -1,11 +1,12 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.ILoginServiceSMO;
-import com.java110.web.smo.sys.ISysServiceSMO;
+import com.java110.front.smo.ILoginServiceSMO;
+import com.java110.front.smo.sys.ISysServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.*;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 
 @Component("login")

+ 2 - 2
WebService/src/main/java/com/java110/web/components/MenuComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IMenuServiceSMO;
+import com.java110.front.smo.IMenuServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

+ 6 - 7
WebService/src/main/java/com/java110/web/components/NavComponent.java

@@ -1,12 +1,11 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
-import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.INavServiceSMO;
-import com.java110.web.smo.community.IListMyEnteredCommunitysSMO;
-import com.java110.web.smo.msg.IListMsgSMO;
-import com.java110.web.smo.msg.IReadMsgSMO;
-import com.java110.web.smo.notice.IListNoticesSMO;
+import com.java110.front.smo.INavServiceSMO;
+import com.java110.front.smo.community.IListMyEnteredCommunitysSMO;
+import com.java110.front.smo.msg.IListMsgSMO;
+import com.java110.front.smo.msg.IReadMsgSMO;
+import com.java110.front.smo.notice.IListNoticesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

+ 8 - 7
WebService/src/main/java/com/java110/web/components/PrivilegeComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IPrivilegeServiceSMO;
+import com.java110.front.smo.IPrivilegeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -17,16 +17,17 @@ public class PrivilegeComponent {
 
     /**
      * 查询权限
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> listPrivilege(IPageData pd){
+    public ResponseEntity<String> listPrivilege(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  privilegeServiceSMOImpl.loadListPrivilege(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = privilegeServiceSMOImpl.loadListPrivilege(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
 

+ 8 - 7
WebService/src/main/java/com/java110/web/components/PrivilegeGroupComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IPrivilegeServiceSMO;
+import com.java110.front.smo.IPrivilegeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -19,17 +19,18 @@ public class PrivilegeGroupComponent {
 
     /**
      * 查询权限组
+     *
      * @param pd 页面
      * @return
      */
-    public ResponseEntity<String> listPrivilegeGroup(IPageData pd){
+    public ResponseEntity<String> listPrivilegeGroup(IPageData pd) {
 
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  privilegeServiceSMOImpl.listPrivilegeGroup(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = privilegeServiceSMOImpl.listPrivilegeGroup(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 3 - 3
WebService/src/main/java/com/java110/web/components/RegisterComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IRegisterServiceSMO;
-import com.java110.web.smo.sys.ISysServiceSMO;
+import com.java110.front.smo.IRegisterServiceSMO;
+import com.java110.front.smo.sys.ISysServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

+ 10 - 12
WebService/src/main/java/com/java110/web/components/StaffComponent.java

@@ -1,11 +1,8 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IStaffServiceSMO;
-import com.java110.web.smo.org.IListOrgsSMO;
-import com.java110.web.smo.org.IListParentOrgsSMO;
+import com.java110.front.smo.IStaffServiceSMO;
+import com.java110.front.smo.org.IListOrgsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -28,20 +25,21 @@ public class StaffComponent {
 
     /**
      * 查询组织管理列表
+     *
      * @param pd 页面数据封装
      * @return 返回 ResponseEntity 对象
      */
-    public ResponseEntity<String> list(IPageData pd){
+    public ResponseEntity<String> list(IPageData pd) {
         return listOrgsSMOImpl.listOrgs(pd);
     }
 
-    public ResponseEntity<String> loadData(IPageData pd){
+    public ResponseEntity<String> loadData(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  staffServiceSMOImpl.loadData(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = staffServiceSMOImpl.loadData(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 14 - 12
WebService/src/main/java/com/java110/web/components/ValidateCodeComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.ILoginServiceSMO;
+import com.java110.front.smo.ILoginServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -19,33 +19,35 @@ public class ValidateCodeComponent {
 
     /**
      * 生成 验证码
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> generateValidateCode(IPageData pd){
+    public ResponseEntity<String> generateValidateCode(IPageData pd) {
 
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  loginServiceSMOImpl.generateValidateCode(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = loginServiceSMOImpl.generateValidateCode(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }
 
     /**
      * 校验验证码
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> validate(IPageData pd){
+    public ResponseEntity<String> validate(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  loginServiceSMOImpl.validate(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = loginServiceSMOImpl.validate(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 15 - 12
WebService/src/main/java/com/java110/web/components/ValidateTelComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IRegisterServiceSMO;
+import com.java110.front.smo.IRegisterServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -17,35 +17,38 @@ public class ValidateTelComponent {
 
     @Autowired
     IRegisterServiceSMO registerServiceSMOImpl;
+
     /**
      * 手机发送验证码
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> sendTelMessageCode(IPageData pd){
+    public ResponseEntity<String> sendTelMessageCode(IPageData pd) {
 
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  registerServiceSMOImpl.sendTelMessageCode(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = registerServiceSMOImpl.sendTelMessageCode(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }
 
     /**
      * 校验验证码
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> validate(IPageData pd){
+    public ResponseEntity<String> validate(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  registerServiceSMOImpl.validate(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = registerServiceSMOImpl.validate(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 1 - 1
WebService/src/main/java/com/java110/web/components/VueTestComponent.java

@@ -1,4 +1,4 @@
-package com.java110.web.components;
+package com.java110.front.components;
 
 
 import com.java110.core.context.IPageData;

+ 5 - 10
WebService/src/main/java/com/java110/web/components/activities/ActivitiesManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.activities;
+package com.java110.front.components.activities;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.activities.IListActivitiessSMO;
+import com.java110.front.smo.common.ICommonGetSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 public class ActivitiesManageComponent {
 
     @Autowired
-    private IListActivitiessSMO listActivitiessSMOImpl;
+    private ICommonGetSMO commonGetSMOImpl;
 
     /**
      * 查询活动列表
@@ -28,14 +28,9 @@ public class ActivitiesManageComponent {
      * @return 返回 ResponseEntity 对象
      */
     public ResponseEntity<String> list(IPageData pd) {
-        return listActivitiessSMOImpl.listActivitiess(pd);
+        pd.setApiUrl("/api/activities.listActivitiess");
+        return commonGetSMOImpl.doService(pd);
     }
 
-    public IListActivitiessSMO getListActivitiessSMOImpl() {
-        return listActivitiessSMOImpl;
-    }
 
-    public void setListActivitiessSMOImpl(IListActivitiessSMO listActivitiessSMOImpl) {
-        this.listActivitiessSMOImpl = listActivitiessSMOImpl;
-    }
 }

+ 2 - 2
WebService/src/main/java/com/java110/web/components/activities/AddActivitiesViewComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.activities;
+package com.java110.front.components.activities;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.activities.IAddActivitiesSMO;
+import com.java110.front.smo.activities.IAddActivitiesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 5 - 10
WebService/src/main/java/com/java110/web/components/activities/ChooseActivitiesComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.activities;
+package com.java110.front.components.activities;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.activities.IListActivitiessSMO;
+import com.java110.front.smo.common.ICommonGetSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
 public class ChooseActivitiesComponent {
 
     @Autowired
-    private IListActivitiessSMO listActivitiessSMOImpl;
+    private ICommonGetSMO commonGetSMOImpl;
 
     /**
      * 查询应用列表
@@ -28,14 +28,9 @@ public class ChooseActivitiesComponent {
      * @return 返回 ResponseEntity 对象
      */
     public ResponseEntity<String> list(IPageData pd) {
-        return listActivitiessSMOImpl.listActivitiess(pd);
+        pd.setApiUrl("/api/activities.listActivitiess");
+        return commonGetSMOImpl.doService(pd);
     }
 
-    public IListActivitiessSMO getListActivitiessSMOImpl() {
-        return listActivitiessSMOImpl;
-    }
 
-    public void setListActivitiessSMOImpl(IListActivitiessSMO listActivitiessSMOImpl) {
-        this.listActivitiessSMOImpl = listActivitiessSMOImpl;
-    }
 }

+ 5 - 11
WebService/src/main/java/com/java110/web/components/activities/DeleteActivitiesComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.activities;
+package com.java110.front.components.activities;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.activities.IDeleteActivitiesSMO;
+import com.java110.front.smo.common.ICommonPostSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 public class DeleteActivitiesComponent {
 
     @Autowired
-    private IDeleteActivitiesSMO deleteActivitiesSMOImpl;
+    private ICommonPostSMO commonPostSMOImpl;
 
     /**
      * 添加活动数据
@@ -22,14 +22,8 @@ public class DeleteActivitiesComponent {
      * @return ResponseEntity 对象
      */
     public ResponseEntity<String> delete(IPageData pd) {
-        return deleteActivitiesSMOImpl.deleteActivities(pd);
+        pd.setApiUrl("/api/activities.deleteActivities");
+        return commonPostSMOImpl.doService(pd);
     }
 
-    public IDeleteActivitiesSMO getDeleteActivitiesSMOImpl() {
-        return deleteActivitiesSMOImpl;
-    }
-
-    public void setDeleteActivitiesSMOImpl(IDeleteActivitiesSMO deleteActivitiesSMOImpl) {
-        this.deleteActivitiesSMOImpl = deleteActivitiesSMOImpl;
-    }
 }

+ 2 - 2
WebService/src/main/java/com/java110/web/components/activities/EditActivitiesViewComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.activities;
+package com.java110.front.components.activities;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.activities.IEditActivitiesSMO;
+import com.java110.front.smo.activities.IEditActivitiesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/advert/AddAdvertComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.advert;
+package com.java110.front.components.advert;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.advert.IAddAdvertSMO;
+import com.java110.front.smo.advert.IAddAdvertSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/advert/AdvertManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.advert;
+package com.java110.front.components.advert;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.advert.IListAdvertsSMO;
+import com.java110.front.smo.advert.IListAdvertsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 6
WebService/src/main/java/com/java110/web/components/advert/AdvertVedioViewComponent.java

@@ -1,13 +1,9 @@
-package com.java110.web.components.advert;
+package com.java110.front.components.advert;
 
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.advert.IListAdvertPhotoAndVediosSMO;
-import com.java110.web.smo.advert.IListAdvertsSMO;
+import com.java110.front.smo.advert.IListAdvertPhotoAndVediosSMO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 

+ 2 - 2
WebService/src/main/java/com/java110/web/components/advert/ChooseAdvertComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.advert;
+package com.java110.front.components.advert;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.advert.IListAdvertsSMO;
+import com.java110.front.smo.advert.IListAdvertsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/advert/DeleteAdvertComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.advert;
+package com.java110.front.components.advert;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.advert.IDeleteAdvertSMO;
+import com.java110.front.smo.advert.IDeleteAdvertSMO;
 import org.springframework.beans.factory.annotation.Autowired;
         import org.springframework.http.ResponseEntity;
         import org.springframework.stereotype.Component;

+ 3 - 3
WebService/src/main/java/com/java110/web/components/advert/EditAdvertComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.advert;
+package com.java110.front.components.advert;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.advert.IEditAdvertSMO;
-import com.java110.web.smo.advert.IListAdvertItemSMO;
+import com.java110.front.smo.advert.IEditAdvertSMO;
+import com.java110.front.smo.advert.IListAdvertItemSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/app/AddAppComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.app;
+package com.java110.front.components.app;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.app.IAddAppSMO;
+import com.java110.front.smo.app.IAddAppSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/app/AppManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.app;
+package com.java110.front.components.app;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.app.IListAppsSMO;
+import com.java110.front.smo.app.IListAppsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/app/ChooseAppComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.app;
+package com.java110.front.components.app;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.app.IListAppsSMO;
+import com.java110.front.smo.app.IListAppsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/app/DeleteAppComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.app;
+package com.java110.front.components.app;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.app.IDeleteAppSMO;
+import com.java110.front.smo.app.IDeleteAppSMO;
 import org.springframework.beans.factory.annotation.Autowired;
         import org.springframework.http.ResponseEntity;
         import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/app/EditAppComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.app;
+package com.java110.front.components.app;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.app.IEditAppSMO;
+import com.java110.front.smo.app.IEditAppSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/applicationKey/AddApplicationKeyComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.applicationKey;
+package com.java110.front.components.applicationKey;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.applicationKey.IAddApplicationKeySMO;
+import com.java110.front.smo.applicationKey.IAddApplicationKeySMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/applicationKey/ApplicationKeyManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.applicationKey;
+package com.java110.front.components.applicationKey;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.applicationKey.IListApplicationKeysSMO;
+import com.java110.front.smo.applicationKey.IListApplicationKeysSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 3 - 4
WebService/src/main/java/com/java110/web/components/applicationKey/AuditApplicationKeyManageComponent.java

@@ -1,9 +1,8 @@
-package com.java110.web.components.applicationKey;
+package com.java110.front.components.applicationKey;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.applicationKey.IAuditApplicationKeySMO;
-import com.java110.web.smo.applicationKey.IEditApplicationKeySMO;
-import com.java110.web.smo.applicationKey.IListApplicationKeysSMO;
+import com.java110.front.smo.applicationKey.IAuditApplicationKeySMO;
+import com.java110.front.smo.applicationKey.IListApplicationKeysSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/applicationKey/ChooseApplicationKeyComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.applicationKey;
+package com.java110.front.components.applicationKey;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.applicationKey.IListApplicationKeysSMO;
+import com.java110.front.smo.applicationKey.IListApplicationKeysSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/applicationKey/DeleteApplicationKeyComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.applicationKey;
+package com.java110.front.components.applicationKey;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.applicationKey.IDeleteApplicationKeySMO;
+import com.java110.front.smo.applicationKey.IDeleteApplicationKeySMO;
 import org.springframework.beans.factory.annotation.Autowired;
         import org.springframework.http.ResponseEntity;
         import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/applicationKey/EditApplicationKeyComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.applicationKey;
+package com.java110.front.components.applicationKey;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.applicationKey.IEditApplicationKeySMO;
+import com.java110.front.smo.applicationKey.IEditApplicationKeySMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 3 - 3
WebService/src/main/java/com/java110/web/components/assetImport/AssetImportComponent.java

@@ -1,9 +1,9 @@
-package com.java110.web.components.assetImport;
+package com.java110.front.components.assetImport;
 
 import com.java110.core.context.IPageData;
 import com.java110.front.controller.CallComponentController;
-import com.java110.web.smo.assetExport.IAssetExportSMO;
-import com.java110.web.smo.assetImport.IAssetImportSMO;
+import com.java110.front.smo.assetExport.IAssetExportSMO;
+import com.java110.front.smo.assetImport.IAssetImportSMO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/auditUser/AddAuditUserStepBindingComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.auditUser;
+package com.java110.front.components.auditUser;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.auditUser.IAddAuditUserSMO;
+import com.java110.front.smo.auditUser.IAddAuditUserSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/auditUser/AuditUserManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.auditUser;
+package com.java110.front.components.auditUser;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.auditUser.IListAuditUsersSMO;
+import com.java110.front.smo.auditUser.IListAuditUsersSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/auditUser/ChooseAuditUserComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.auditUser;
+package com.java110.front.components.auditUser;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.auditUser.IListAuditUsersSMO;
+import com.java110.front.smo.auditUser.IListAuditUsersSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/auditUser/DeleteAuditUserComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.auditUser;
+package com.java110.front.components.auditUser;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.auditUser.IDeleteAuditUserSMO;
+import com.java110.front.smo.auditUser.IDeleteAuditUserSMO;
 import org.springframework.beans.factory.annotation.Autowired;
         import org.springframework.http.ResponseEntity;
         import org.springframework.stereotype.Component;

+ 3 - 4
WebService/src/main/java/com/java110/web/components/auditUser/MyAuditComplaintsComponent.java

@@ -1,10 +1,9 @@
-package com.java110.web.components.auditUser;
+package com.java110.front.components.auditUser;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.auditUser.IListAuditComplaintsSMO;
-import com.java110.web.smo.auditUser.IListAuditOrdersSMO;
-import com.java110.web.smo.complaint.IAuditComplaintSMO;
+import com.java110.front.smo.auditUser.IListAuditComplaintsSMO;
+import com.java110.front.smo.complaint.IAuditComplaintSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 4
WebService/src/main/java/com/java110/web/components/auditUser/MyAuditHistoryComplaintsComponent.java

@@ -1,10 +1,8 @@
-package com.java110.web.components.auditUser;
+package com.java110.front.components.auditUser;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.auditUser.IListAuditComplaintsSMO;
-import com.java110.web.smo.auditUser.IListAuditHistoryComplaintsSMO;
-import com.java110.web.smo.complaint.IAuditComplaintSMO;
+import com.java110.front.smo.auditUser.IListAuditHistoryComplaintsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 3
WebService/src/main/java/com/java110/web/components/auditUser/MyAuditOrdersComponent.java

@@ -1,9 +1,8 @@
-package com.java110.web.components.auditUser;
+package com.java110.front.components.auditUser;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.auditUser.IListAuditOrdersSMO;
-import com.java110.web.smo.auditUser.IListAuditUsersSMO;
+import com.java110.front.smo.auditUser.IListAuditOrdersSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/basePrivilege/AddBasePrivilegeComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.basePrivilege;
+package com.java110.front.components.basePrivilege;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.basePrivilege.IAddBasePrivilegeSMO;
+import com.java110.front.smo.basePrivilege.IAddBasePrivilegeSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/basePrivilege/BasePrivilegeManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.basePrivilege;
+package com.java110.front.components.basePrivilege;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.basePrivilege.IListBasePrivilegesSMO;
+import com.java110.front.smo.basePrivilege.IListBasePrivilegesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/basePrivilege/ChooseBasePrivilegeComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.basePrivilege;
+package com.java110.front.components.basePrivilege;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.basePrivilege.IListBasePrivilegesSMO;
+import com.java110.front.smo.basePrivilege.IListBasePrivilegesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/basePrivilege/DeleteBasePrivilegeComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.basePrivilege;
+package com.java110.front.components.basePrivilege;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.basePrivilege.IDeleteBasePrivilegeSMO;
+import com.java110.front.smo.basePrivilege.IDeleteBasePrivilegeSMO;
 import org.springframework.beans.factory.annotation.Autowired;
         import org.springframework.http.ResponseEntity;
         import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/basePrivilege/EditBasePrivilegeComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.basePrivilege;
+package com.java110.front.components.basePrivilege;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.basePrivilege.IEditBasePrivilegeSMO;
+import com.java110.front.smo.basePrivilege.IEditBasePrivilegeSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 4
WebService/src/main/java/com/java110/web/components/businesstype/ListBusinessTypeComponent.java

@@ -1,9 +1,7 @@
-package com.java110.web.components.businesstype;
+package com.java110.front.components.businesstype;
 
 import com.java110.core.context.IPageData;
-import com.java110.core.smo.businesstype.ICbusinesstypeInnerServiceSMO;
-import com.java110.web.smo.ICbusinessTypeServiceSMO;
-import com.java110.web.smo.IDemoServiceSMO;
+import com.java110.front.smo.ICbusinessTypeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 3
WebService/src/main/java/com/java110/web/components/cache/CacheManageComponent.java

@@ -1,9 +1,8 @@
-package com.java110.web.components.cache;
+package com.java110.front.components.cache;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.app.IListAppsSMO;
-import com.java110.web.smo.cache.IListCachesSMO;
+import com.java110.front.smo.cache.IListCachesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 4 - 4
WebService/src/main/java/com/java110/web/components/car/SellParkingSpaceComponent.java

@@ -1,10 +1,10 @@
-package com.java110.web.components.car;
+package com.java110.front.components.car;
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.FeeTypeConstant;
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.ICarServiceSMO;
-import com.java110.web.smo.IFeeServiceSMO;
+import com.java110.front.smo.ICarServiceSMO;
+import com.java110.front.smo.IFeeServiceSMO;
+import com.java110.utils.constant.FeeTypeConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/carBlackWhite/AddCarBlackWhiteComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.carBlackWhite;
+package com.java110.front.components.carBlackWhite;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.carBlackWhite.IAddCarBlackWhiteSMO;
+import com.java110.front.smo.carBlackWhite.IAddCarBlackWhiteSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/carBlackWhite/CarBlackWhiteManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.carBlackWhite;
+package com.java110.front.components.carBlackWhite;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.carBlackWhite.IListCarBlackWhitesSMO;
+import com.java110.front.smo.carBlackWhite.IListCarBlackWhitesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/carBlackWhite/ChooseCarBlackWhiteComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.carBlackWhite;
+package com.java110.front.components.carBlackWhite;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.carBlackWhite.IListCarBlackWhitesSMO;
+import com.java110.front.smo.carBlackWhite.IListCarBlackWhitesSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/carBlackWhite/DeleteCarBlackWhiteComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.carBlackWhite;
+package com.java110.front.components.carBlackWhite;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.carBlackWhite.IDeleteCarBlackWhiteSMO;
+import com.java110.front.smo.carBlackWhite.IDeleteCarBlackWhiteSMO;
 import org.springframework.beans.factory.annotation.Autowired;
         import org.springframework.http.ResponseEntity;
         import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/carBlackWhite/EditCarBlackWhiteComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.carBlackWhite;
+package com.java110.front.components.carBlackWhite;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.carBlackWhite.IEditCarBlackWhiteSMO;
+import com.java110.front.smo.carBlackWhite.IEditCarBlackWhiteSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/carInout/CarInManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.carInout;
+package com.java110.front.components.carInout;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.carInout.IListCarInoutsSMO;
+import com.java110.front.smo.carInout.IListCarInoutsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/carInout/CarInoutManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.carInout;
+package com.java110.front.components.carInout;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.carInout.IListCarInoutsSMO;
+import com.java110.front.smo.carInout.IListCarInoutsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 11 - 9
WebService/src/main/java/com/java110/web/components/community/AddCommunityComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.ICompanyServiceSMO;
-import com.java110.web.smo.community.IAddCommunitySMO;
+import com.java110.front.smo.ICompanyServiceSMO;
+import com.java110.front.smo.community.IAddCommunitySMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -22,25 +22,27 @@ public class AddCommunityComponent {
 
     /**
      * 添加小区数据
+     *
      * @param pd 页面数据封装
      * @return ResponseEntity 对象
      */
-    public ResponseEntity<String> save(IPageData pd){
+    public ResponseEntity<String> save(IPageData pd) {
         return addCommunitySMOImpl.saveCommunity(pd);
     }
 
     /**
      * 功能描述: 查询所有省市
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> getAreas(IPageData pd){
+    public ResponseEntity<String> getAreas(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  companyServiceSMOImpl.getAreas(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = companyServiceSMOImpl.getAreas(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 2 - 3
WebService/src/main/java/com/java110/web/components/community/AreaSelectComponent.java

@@ -1,8 +1,7 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.ICompanyServiceSMO;
-import com.java110.web.smo.community.IAddCommunitySMO;
+import com.java110.front.smo.ICompanyServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

+ 3 - 3
WebService/src/main/java/com/java110/web/components/community/AuditCommunityManageComponent.java

@@ -1,12 +1,12 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.utils.constant.StateConstant;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
-import com.java110.web.smo.community.IAuditCommunitySMO;
-import com.java110.web.smo.community.IListCommunitysSMO;
+import com.java110.front.smo.community.IAuditCommunitySMO;
+import com.java110.front.smo.community.IListCommunitysSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 3 - 4
WebService/src/main/java/com/java110/web/components/community/AuditEnterCommunityManageComponent.java

@@ -1,12 +1,11 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.java110.utils.constant.StateConstant;
 import com.java110.core.context.IPageData;
 import com.java110.core.context.PageData;
-import com.java110.web.smo.community.IAuditEnterCommunitySMO;
-import com.java110.web.smo.community.IListAuditEnterCommunitysSMO;
+import com.java110.front.smo.community.IAuditEnterCommunitySMO;
+import com.java110.front.smo.community.IListAuditEnterCommunitysSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/community/CommunityManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.community.IListCommunitysSMO;
+import com.java110.front.smo.community.IListCommunitysSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/community/DeleteCommunityComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.community.IDeleteCommunitySMO;
+import com.java110.front.smo.community.IDeleteCommunitySMO;
 import org.springframework.beans.factory.annotation.Autowired;
         import org.springframework.http.ResponseEntity;
         import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/community/EditCommunityComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.community.IEditCommunitySMO;
+import com.java110.front.smo.community.IEditCommunitySMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 10 - 11
WebService/src/main/java/com/java110/web/components/community/EnterCommunityComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.ICommunityServiceSMO;
+import com.java110.front.smo.ICommunityServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -9,11 +9,8 @@ import org.springframework.stereotype.Component;
 
 /**
  * 入驻小区组件处理类
- *
+ * <p>
  * add by wuxw 2019-04-15
- *
- *
- *
  */
 @Component("enterCommunity")
 public class EnterCommunityComponent {
@@ -21,18 +18,20 @@ public class EnterCommunityComponent {
 
     @Autowired
     private ICommunityServiceSMO communityServiceSMOImpl;
+
     /**
      * 查询我入驻的小区
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> listMyCommunity(IPageData pd){
+    public ResponseEntity<String> listMyCommunity(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  communityServiceSMOImpl.listMyCommunity(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = communityServiceSMOImpl.listMyCommunity(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
 

+ 2 - 5
WebService/src/main/java/com/java110/web/components/community/RecallAuditEnterFinishCommunityComponent.java

@@ -1,11 +1,8 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
-import com.java110.core.context.PageData;
-import com.java110.web.smo.community.IAuditEnterCommunitySMO;
-import com.java110.web.smo.community.IListAuditEnterCommunitysSMO;
+import com.java110.front.smo.community.IAuditEnterCommunitySMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 6
WebService/src/main/java/com/java110/web/components/community/RecallAuditFinishCommunityComponent.java

@@ -1,12 +1,8 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.java110.core.context.IPageData;
-import com.java110.core.context.PageData;
-import com.java110.utils.constant.StateConstant;
-import com.java110.web.smo.community.IAuditCommunitySMO;
-import com.java110.web.smo.community.IListCommunitysSMO;
+import com.java110.front.smo.community.IAuditCommunitySMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/community/StoreEnterCommunityComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.ICommunityServiceSMO;
+import com.java110.front.smo.ICommunityServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/community/StoresCommunityComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.community.IListCommunitysSMO;
+import com.java110.front.smo.community.IListCommunitysSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 8 - 7
WebService/src/main/java/com/java110/web/components/community/storeExitCommunityComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.community;
+package com.java110.front.components.community;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.ICommunityServiceSMO;
+import com.java110.front.smo.ICommunityServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -19,16 +19,17 @@ public class storeExitCommunityComponent {
 
     /**
      * 商户退出组件
+     *
      * @param pd
      * @return
      */
-    public ResponseEntity<String> exit(IPageData pd){
+    public ResponseEntity<String> exit(IPageData pd) {
         ResponseEntity<String> responseEntity = null;
-        try{
-            responseEntity =  communityServiceSMOImpl.exitCommunity(pd);
-        }catch (Exception e){
+        try {
+            responseEntity = communityServiceSMOImpl.exitCommunity(pd);
+        } catch (Exception e) {
             responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
-        }finally {
+        } finally {
             return responseEntity;
         }
     }

+ 2 - 2
WebService/src/main/java/com/java110/web/components/complaint/AddComplaintStepBindingComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.complaint;
+package com.java110.front.components.complaint;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.complaint.IAddComplaintSMO;
+import com.java110.front.smo.complaint.IAddComplaintSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/complaint/ChooseComplaintComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.complaint;
+package com.java110.front.components.complaint;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.complaint.IListComplaintsSMO;
+import com.java110.front.smo.complaint.IListComplaintsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/complaint/ComplaintManageComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.complaint;
+package com.java110.front.components.complaint;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.complaint.IListComplaintsSMO;
+import com.java110.front.smo.complaint.IListComplaintsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/complaint/DeleteComplaintComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.complaint;
+package com.java110.front.components.complaint;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.complaint.IDeleteComplaintSMO;
+import com.java110.front.smo.complaint.IDeleteComplaintSMO;
 import org.springframework.beans.factory.annotation.Autowired;
         import org.springframework.http.ResponseEntity;
         import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/complaint/EditComplaintComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.complaint;
+package com.java110.front.components.complaint;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.complaint.IEditComplaintSMO;
+import com.java110.front.smo.complaint.IEditComplaintSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/configMenu/ConfigMenuBindingComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.configMenu;
+package com.java110.front.components.configMenu;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.configMenu.IConfigMenuBindingSMO;
+import com.java110.front.smo.configMenu.IConfigMenuBindingSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 3
WebService/src/main/java/com/java110/web/components/demo/AddDemoComponent.java

@@ -1,8 +1,7 @@
-package com.java110.web.components.demo;
+package com.java110.front.components.demo;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IDemoServiceSMO;
-import com.java110.web.smo.IFloorServiceSMO;
+import com.java110.front.smo.IDemoServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/demo/ListDemoComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.demo;
+package com.java110.front.components.demo;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IDemoServiceSMO;
+import com.java110.front.smo.IDemoServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 4 - 3
WebService/src/main/java/com/java110/web/components/demo/ListDemoStudyComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.demo;
+package com.java110.front.components.demo;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IDemoServiceSMO;
+import com.java110.front.smo.IDemoServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -16,10 +16,11 @@ public class ListDemoStudyComponent {
 
     /**
      * 查询demo
+     *
      * @param pd 页面数据封装对象
      * @return ResponseEntity对象
      */
-    public ResponseEntity<String> list(IPageData pd){
+    public ResponseEntity<String> list(IPageData pd) {
 
         return demoServiceSMOImpl.listDemoStudy(pd);
 

+ 2 - 2
WebService/src/main/java/com/java110/web/components/devServiceProvide/DevServiceProvideBindingComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.devServiceProvide;
+package com.java110.front.components.devServiceProvide;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.devServiceProvide.IDevServiceProvideBindingSMO;
+import com.java110.front.smo.devServiceProvide.IDevServiceProvideBindingSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/fee/AddFeeConfigComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.fee;
+package com.java110.front.components.fee;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.feeConfig.IAddFeeConfigSMO;
+import com.java110.front.smo.feeConfig.IAddFeeConfigSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 2 - 2
WebService/src/main/java/com/java110/web/components/fee/ChooseFeeConfigComponent.java

@@ -1,8 +1,8 @@
-package com.java110.web.components.fee;
+package com.java110.front.components.fee;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.feeConfig.IListFeeConfigsSMO;
+import com.java110.front.smo.feeConfig.IListFeeConfigsSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;

+ 3 - 2
WebService/src/main/java/com/java110/web/components/fee/ConfigParkingSpaceFeeComponent.java

@@ -1,7 +1,7 @@
-package com.java110.web.components.fee;
+package com.java110.front.components.fee;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.IFeeServiceSMO;
+import com.java110.front.smo.IFeeServiceSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -22,6 +22,7 @@ public class ConfigParkingSpaceFeeComponent {
 
     /**
      * 修改费用
+     *
      * @param pd 页面上数据封装
      * @return ResponseEntity 对象
      */

+ 0 - 0
WebService/src/main/java/com/java110/web/components/fee/ConfigParkingSpaceTempFeeComponent.java


Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio