Przeglądaj źródła

web端代码生成完成

吴学文 6 lat temu
rodzic
commit
49ee4fd871
49 zmienionych plików z 1995 dodań i 216 usunięć
  1. 91 0
      Api/src/main/java/com/java110/api/listener/community/DeleteCommunityListener.java
  2. 1 0
      Api/src/main/java/com/java110/api/listener/community/ListCommunitysListener.java
  3. 13 8
      Api/src/main/java/com/java110/api/listener/community/SaveCommunityListener.java
  4. 93 0
      Api/src/main/java/com/java110/api/listener/community/UpdateCommunityListener.java
  5. 7 7
      WebService/src/main/java/com/java110/web/components/community/CommunityManageComponent.java
  6. 34 0
      WebService/src/main/java/com/java110/web/components/community/DeleteCommunityComponent.java
  7. 34 0
      WebService/src/main/java/com/java110/web/components/community/EditCommunityComponent.java
  8. 19 0
      WebService/src/main/java/com/java110/web/smo/community/IDeleteCommunitySMO.java
  9. 19 0
      WebService/src/main/java/com/java110/web/smo/community/IEditCommunitySMO.java
  10. 1 1
      WebService/src/main/java/com/java110/web/smo/community/IListCommunitysManageSMO.java
  11. 8 4
      WebService/src/main/java/com/java110/web/smo/community/impl/AddCommunitySMOImpl.java
  12. 63 0
      WebService/src/main/java/com/java110/web/smo/community/impl/DeleteCommunitySMOImpl.java
  13. 65 0
      WebService/src/main/java/com/java110/web/smo/community/impl/EditCommunitySMOImpl.java
  14. 4 4
      WebService/src/main/java/com/java110/web/smo/community/impl/ListCommunitysSMOImpl.java
  15. 40 40
      WebService/src/main/resources/components/add-community/addCommunity.html
  16. 125 25
      WebService/src/main/resources/components/add-community/addCommunity.js
  17. 26 35
      WebService/src/main/resources/components/community-manage/communityManage.html
  18. 6 14
      WebService/src/main/resources/components/community-manage/communityManage.js
  19. 19 0
      WebService/src/main/resources/components/delete-community/deleteCommunity.html
  20. 52 0
      WebService/src/main/resources/components/delete-community/deleteCommunity.js
  21. 38 0
      WebService/src/main/resources/components/edit-community/editCommunity.html
  22. 79 0
      WebService/src/main/resources/components/edit-community/editCommunity.js
  23. 4 4
      WebService/src/main/resources/views/communityManageFlow.html
  24. 23 54
      java110-bean/src/main/java/com/java110/vo/api/community/ApiCommunityDataVo.java
  25. 1 1
      java110-code-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java
  26. 167 0
      java110-code-generator/src/main/java/com/java110/code/web/GeneratorDeleteComponent.java
  27. 266 0
      java110-code-generator/src/main/java/com/java110/code/web/GeneratorEditComponent.java
  28. 46 0
      java110-code-generator/src/main/java/com/java110/code/web/GeneratorFlow.java
  29. 1 1
      java110-code-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java
  30. 14 0
      java110-code-generator/src/main/java/com/java110/code/web/GeneratorStart.java
  31. 11 12
      java110-code-generator/src/main/resources/web/add/AddComponent.java
  32. 8 1
      java110-code-generator/src/main/resources/web/add/SaveListener.java
  33. 34 0
      java110-code-generator/src/main/resources/web/delete/DeleteComponent.java
  34. 90 0
      java110-code-generator/src/main/resources/web/delete/DeleteListener.java
  35. 62 0
      java110-code-generator/src/main/resources/web/delete/DeleteSMOImpl.java
  36. 19 0
      java110-code-generator/src/main/resources/web/delete/IDeleteSMO.java
  37. 19 0
      java110-code-generator/src/main/resources/web/delete/delete.html
  38. 52 0
      java110-code-generator/src/main/resources/web/delete/delete.js
  39. 34 0
      java110-code-generator/src/main/resources/web/edit/EditComponent.java
  40. 61 0
      java110-code-generator/src/main/resources/web/edit/EditSMOImpl.java
  41. 19 0
      java110-code-generator/src/main/resources/web/edit/IEditSMO.java
  42. 89 0
      java110-code-generator/src/main/resources/web/edit/UpdateListener.java
  43. 20 0
      java110-code-generator/src/main/resources/web/edit/edit.html
  44. 65 0
      java110-code-generator/src/main/resources/web/edit/edit.js
  45. 33 0
      java110-code-generator/src/main/resources/web/flow.html
  46. 4 2
      java110-code-generator/src/main/resources/web/manage/ListListener.java
  47. 1 1
      java110-code-generator/src/main/resources/web/manage/ManageComponent.java
  48. 2 2
      java110-code-generator/src/main/resources/web/template_1.json
  49. 13 0
      java110-common/src/main/java/com/java110/common/constant/ServiceCodeConstant.java

+ 91 - 0
Api/src/main/java/com/java110/api/listener/community/DeleteCommunityListener.java

@@ -0,0 +1,91 @@
+package com.java110.api.listener.community;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.listener.AbstractServiceApiListener;
+import com.java110.common.constant.BusinessTypeConstant;
+import com.java110.common.util.Assert;
+import com.java110.core.context.DataFlowContext;
+import com.java110.entity.center.AppService;
+import com.java110.event.service.api.ServiceDataFlowEvent;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import com.java110.common.constant.CommonConstant;
+import com.java110.common.constant.ServiceCodeConstant;
+
+import com.java110.core.annotation.Java110Listener;
+/**
+ * 保存小区侦听
+ * add by wuxw 2019-06-30
+ */
+@Java110Listener("deleteCommunityListener")
+public class DeleteCommunityListener extends AbstractServiceApiListener {
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        HttpHeaders header = new HttpHeaders();
+        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
+        JSONArray businesses = new JSONArray();
+
+        AppService service = event.getAppService();
+
+        //添加单元信息
+        businesses.add(deleteCommunity(reqJson, context));
+
+        JSONObject paramInObj = super.restToCenterProtocol(businesses, context.getRequestCurrentHeaders());
+
+        //将 rest header 信息传递到下层服务中去
+        super.freshHttpHeader(header, context.getRequestCurrentHeaders());
+
+        ResponseEntity<String> responseEntity = this.callService(context, service.getServiceCode(), paramInObj);
+
+        context.setResponseEntity(responseEntity);
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.SERVICE_CODE_DELETE_COMMUNITY;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+    @Override
+    public int getOrder() {
+        return DEFAULT_ORDER;
+    }
+
+
+    /**
+     * 添加小区信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    private JSONObject deleteCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_COMMUNITY_INFO);
+        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+        JSONObject businessCommunity = new JSONObject();
+        businessCommunity.putAll(paramInJson);
+        //计算 应收金额
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunity", businessCommunity);
+        return business;
+    }
+
+}

+ 1 - 0
Api/src/main/java/com/java110/api/listener/community/ListCommunitysListener.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import com.java110.common.constant.CommonConstant;
 
 import java.util.ArrayList;
 import java.util.List;

+ 13 - 8
Api/src/main/java/com/java110/api/listener/community/SaveCommunityListener.java

@@ -3,29 +3,34 @@ package com.java110.api.listener.community;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.common.constant.*;
-import com.java110.common.exception.ListenerExecuteException;
+import com.java110.common.constant.BusinessTypeConstant;
 import com.java110.common.util.Assert;
 import com.java110.core.context.DataFlowContext;
-import com.java110.dto.FeeConfigDto;
-import com.java110.dto.FeeDto;
-import com.java110.dto.RoomDto;
 import com.java110.entity.center.AppService;
 import com.java110.event.service.api.ServiceDataFlowEvent;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
+import com.java110.common.constant.CommonConstant;
+import com.java110.common.constant.ServiceCodeConstant;
 
-import java.util.List;
 
+
+import com.java110.core.annotation.Java110Listener;
 /**
  * 保存小区侦听
  * add by wuxw 2019-06-30
  */
+@Java110Listener("saveCommunityListener")
 public class SaveCommunityListener extends AbstractServiceApiListener {
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+
+        Assert.hasKeyAndValue(reqJson, "name", "必填,请填写小区名称");
+Assert.hasKeyAndValue(reqJson, "address", "必填,请填写小区地址");
+Assert.hasKeyAndValue(reqJson, "nearbyLandmarks", "必填,请填写小区附近地标");
+
     }
 
     @Override
@@ -84,7 +89,7 @@ public class SaveCommunityListener extends AbstractServiceApiListener {
         businessCommunity.putAll(paramInJson);
         businessCommunity.put("communityId", "-1");
         //计算 应收金额
-        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessFeeDetail", businessCommunity);
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunity", businessCommunity);
         return business;
     }
 

+ 93 - 0
Api/src/main/java/com/java110/api/listener/community/UpdateCommunityListener.java

@@ -0,0 +1,93 @@
+package com.java110.api.listener.community;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.listener.AbstractServiceApiListener;
+import com.java110.common.constant.BusinessTypeConstant;
+import com.java110.common.constant.CommonConstant;
+import com.java110.common.constant.ServiceCodeConstant;
+import com.java110.common.util.Assert;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.entity.center.AppService;
+import com.java110.event.service.api.ServiceDataFlowEvent;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 保存小区侦听
+ * add by wuxw 2019-06-30
+ */
+@Java110Listener("updateCommunityListener")
+public class UpdateCommunityListener extends AbstractServiceApiListener {
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+
+        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");
+Assert.hasKeyAndValue(reqJson, "name", "必填,请填写小区名称");
+Assert.hasKeyAndValue(reqJson, "address", "必填,请填写小区地址");
+Assert.hasKeyAndValue(reqJson, "nearbyLandmarks", "必填,请填写小区附近地标");
+
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        HttpHeaders header = new HttpHeaders();
+        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
+        JSONArray businesses = new JSONArray();
+
+        AppService service = event.getAppService();
+
+        //添加单元信息
+        businesses.add(updateCommunity(reqJson, context));
+
+        JSONObject paramInObj = super.restToCenterProtocol(businesses, context.getRequestCurrentHeaders());
+
+        //将 rest header 信息传递到下层服务中去
+        super.freshHttpHeader(header, context.getRequestCurrentHeaders());
+
+        ResponseEntity<String> responseEntity = this.callService(context, service.getServiceCode(), paramInObj);
+
+        context.setResponseEntity(responseEntity);
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.SERVICE_CODE_UPDATE_COMMUNITY;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+    @Override
+    public int getOrder() {
+        return DEFAULT_ORDER;
+    }
+
+
+    /**
+     * 添加小区信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    private JSONObject updateCommunity(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);
+        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+        JSONObject businessCommunity = new JSONObject();
+        businessCommunity.putAll(paramInJson);
+        //计算 应收金额
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunity", businessCommunity);
+        return business;
+    }
+
+}

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

@@ -2,7 +2,7 @@ package com.java110.web.components.community;
 
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.community.IListCommunitysManageSMO;
+import com.java110.web.smo.community.IListCommunitysSMO;
 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 CommunityManageComponent {
 
     @Autowired
-    private IListCommunitysManageSMO communityManageSMOImpl;
+    private IListCommunitysSMO listCommunitysSMOImpl;
 
     /**
      * 查询小区列表
@@ -27,14 +27,14 @@ public class CommunityManageComponent {
      * @return 返回 ResponseEntity 对象
      */
     public ResponseEntity<String> list(IPageData pd){
-        return communityManageSMOImpl.listCommunitys(pd);
+        return listCommunitysSMOImpl.listCommunitys(pd);
     }
 
-    public IListCommunitysManageSMO getCommunityManageSMOImpl() {
-        return communityManageSMOImpl;
+    public IListCommunitysSMO getListCommunitysSMOImpl() {
+        return listCommunitysSMOImpl;
     }
 
-    public void setCommunityManageSMOImpl(IListCommunitysManageSMO communityManageSMOImpl) {
-        this.communityManageSMOImpl = communityManageSMOImpl;
+    public void setListCommunitysSMOImpl(IListCommunitysSMO listCommunitysSMOImpl) {
+        this.listCommunitysSMOImpl = listCommunitysSMOImpl;
     }
 }

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

@@ -0,0 +1,34 @@
+package com.java110.web.components.community;
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.community.IDeleteCommunitySMO;
+import org.springframework.beans.factory.annotation.Autowired;
+        import org.springframework.http.ResponseEntity;
+        import org.springframework.stereotype.Component;
+
+/**
+ * 添加小区组件
+ */
+@Component("deleteCommunity")
+public class DeleteCommunityComponent {
+
+@Autowired
+private IDeleteCommunitySMO deleteCommunitySMOImpl;
+
+/**
+ * 添加小区数据
+ * @param pd 页面数据封装
+ * @return ResponseEntity 对象
+ */
+public ResponseEntity<String> delete(IPageData pd){
+        return deleteCommunitySMOImpl.deleteCommunity(pd);
+    }
+
+public IDeleteCommunitySMO getDeleteCommunitySMOImpl() {
+        return deleteCommunitySMOImpl;
+    }
+
+public void setDeleteCommunitySMOImpl(IDeleteCommunitySMO deleteCommunitySMOImpl) {
+        this.deleteCommunitySMOImpl = deleteCommunitySMOImpl;
+    }
+            }

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

@@ -0,0 +1,34 @@
+package com.java110.web.components.community;
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.community.IEditCommunitySMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * 编辑小区组件
+ */
+@Component("editCommunity")
+public class EditCommunityComponent {
+
+    @Autowired
+    private IEditCommunitySMO editCommunitySMOImpl;
+
+    /**
+     * 添加小区数据
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
+     */
+    public ResponseEntity<String> update(IPageData pd){
+        return editCommunitySMOImpl.updateCommunity(pd);
+    }
+
+    public IEditCommunitySMO getEditCommunitySMOImpl() {
+        return editCommunitySMOImpl;
+    }
+
+    public void setEditCommunitySMOImpl(IEditCommunitySMO editCommunitySMOImpl) {
+        this.editCommunitySMOImpl = editCommunitySMOImpl;
+    }
+}

+ 19 - 0
WebService/src/main/java/com/java110/web/smo/community/IDeleteCommunitySMO.java

@@ -0,0 +1,19 @@
+package com.java110.web.smo.community;
+
+import com.java110.core.context.IPageData;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 添加小区接口
+ *
+ * add by wuxw 2019-06-30
+ */
+public interface IDeleteCommunitySMO {
+
+    /**
+     * 添加小区
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
+     */
+    ResponseEntity<String> deleteCommunity(IPageData pd);
+}

+ 19 - 0
WebService/src/main/java/com/java110/web/smo/community/IEditCommunitySMO.java

@@ -0,0 +1,19 @@
+package com.java110.web.smo.community;
+
+import com.java110.core.context.IPageData;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 修改小区接口
+ *
+ * add by wuxw 2019-06-30
+ */
+public interface IEditCommunitySMO {
+
+    /**
+     * 修改小区
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
+     */
+    ResponseEntity<String> updateCommunity(IPageData pd);
+}

+ 1 - 1
WebService/src/main/java/com/java110/web/smo/community/IListCommunitysManageSMO.java

@@ -9,7 +9,7 @@ import org.springframework.http.ResponseEntity;
  *
  * add by wuxw 2019-06-29
  */
-public interface IListCommunitysManageSMO {
+public interface IListCommunitysSMO {
 
     /**
      * 查询小区信息

+ 8 - 4
WebService/src/main/java/com/java110/web/smo/community/impl/AddCommunitySMOImpl.java

@@ -4,14 +4,14 @@ import com.alibaba.fastjson.JSONObject;
 import com.java110.common.constant.PrivilegeCodeConstant;
 import com.java110.common.constant.ServiceConstant;
 import com.java110.common.util.Assert;
+import com.java110.web.smo.community.IAddCommunitySMO;
+import org.springframework.web.client.RestTemplate;
 import com.java110.core.context.IPageData;
 import com.java110.web.core.AbstractComponentSMO;
-import com.java110.web.smo.community.IAddCommunitySMO;
+import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 /**
  * 添加小区服务实现类
@@ -28,7 +28,11 @@ public class AddCommunitySMOImpl extends AbstractComponentSMO implements IAddCom
 
         //super.validatePageInfo(pd);
 
-        Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
+        //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
+        Assert.hasKeyAndValue(paramIn, "name", "必填,请填写小区名称");
+Assert.hasKeyAndValue(paramIn, "address", "必填,请填写小区地址");
+Assert.hasKeyAndValue(paramIn, "nearbyLandmarks", "必填,请填写小区附近地标");
+
 
 
         super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_COMMUNITY);

+ 63 - 0
WebService/src/main/java/com/java110/web/smo/community/impl/DeleteCommunitySMOImpl.java

@@ -0,0 +1,63 @@
+package com.java110.web.smo.community.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.PrivilegeCodeConstant;
+import com.java110.common.constant.ServiceConstant;
+import com.java110.common.util.Assert;
+import com.java110.web.smo.community.IDeleteCommunitySMO;
+import org.springframework.web.client.RestTemplate;
+import com.java110.core.context.IPageData;
+import com.java110.web.core.AbstractComponentSMO;
+import org.springframework.stereotype.Service;;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 添加小区服务实现类
+ * delete by wuxw 2019-06-30
+ */
+@Service("deleteCommunitySMOImpl")
+public class DeleteCommunitySMOImpl extends AbstractComponentSMO implements IDeleteCommunitySMO {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    protected void validate(IPageData pd, JSONObject paramIn) {
+
+        //super.validatePageInfo(pd);
+
+        //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
+        Assert.hasKeyAndValue(paramIn, "communityId", "小区ID不能为空");
+
+
+
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_COMMUNITY);
+
+    }
+
+    @Override
+    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
+        ResponseEntity<String> responseEntity = null;
+        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+
+        responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/community.deleteCommunity",
+                HttpMethod.POST);
+        return responseEntity;
+    }
+
+    @Override
+    public ResponseEntity<String> deleteCommunity(IPageData pd) {
+        return super.businessProcess(pd);
+    }
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+}

+ 65 - 0
WebService/src/main/java/com/java110/web/smo/community/impl/EditCommunitySMOImpl.java

@@ -0,0 +1,65 @@
+package com.java110.web.smo.community.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.PrivilegeCodeConstant;
+import com.java110.common.constant.ServiceConstant;
+import com.java110.common.util.Assert;
+import com.java110.core.context.IPageData;
+import com.java110.web.core.AbstractComponentSMO;
+import com.java110.web.smo.community.IEditCommunitySMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * 添加小区服务实现类
+ * add by wuxw 2019-06-30
+ */
+@Service("eidtCommunitySMOImpl")
+public class EditCommunitySMOImpl extends AbstractComponentSMO implements IEditCommunitySMO {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    protected void validate(IPageData pd, JSONObject paramIn) {
+
+        //super.validatePageInfo(pd);
+
+        Assert.hasKeyAndValue(paramIn, "communityId", "小区ID不能为空");
+Assert.hasKeyAndValue(paramIn, "name", "必填,请填写小区名称");
+Assert.hasKeyAndValue(paramIn, "address", "必填,请填写小区地址");
+Assert.hasKeyAndValue(paramIn, "nearbyLandmarks", "必填,请填写小区附近地标");
+
+
+
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_COMMUNITY);
+
+    }
+
+    @Override
+    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
+        ResponseEntity<String> responseEntity = null;
+        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+
+        responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/community.updateCommunity",
+                HttpMethod.POST);
+        return responseEntity;
+    }
+
+    @Override
+    public ResponseEntity<String> updateCommunity(IPageData pd) {
+        return super.businessProcess(pd);
+    }
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+}

+ 4 - 4
WebService/src/main/java/com/java110/web/smo/community/impl/ListCommunitysSMOImpl.java

@@ -5,23 +5,23 @@ import com.java110.common.constant.PrivilegeCodeConstant;
 import com.java110.common.constant.ServiceConstant;
 import com.java110.common.exception.SMOException;
 import com.java110.common.util.BeanConvertUtil;
+import com.java110.web.smo.community.IListCommunitysSMO;
+import org.springframework.web.client.RestTemplate;
 import com.java110.core.context.IPageData;
 import com.java110.entity.component.ComponentValidateResult;
 import com.java110.web.core.AbstractComponentSMO;
-import com.java110.web.smo.community.IListCommunitysManageSMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.Map;
 
 /**
- * 查询小区服务类
+ * 查询community服务类
  */
 @Service("listCommunitysSMOImpl")
-public class ListCommunitysSMOImpl extends AbstractComponentSMO implements IListCommunitysManageSMO {
+public class ListCommunitysSMOImpl extends AbstractComponentSMO implements IListCommunitysSMO {
 
     @Autowired
     private RestTemplate restTemplate;

+ 40 - 40
WebService/src/main/resources/components/add-community/addCommunity.html

@@ -1,46 +1,46 @@
-<div class="row">
-    <div class="col-lg-12">
-        <div class="ibox ">
-            <div class="ibox-title">
-                <h5>小区信息</h5>
-            </div>
-            <div class="ibox-content">
-                <div>
+<div id = "addCommunityModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b ">添加小区</h3>
+                <div class="ibox-content">
                     <div>
-                        <div class="form-group row">
-                            <label class="col-sm-2 col-form-label">小区名称</label>
-                            <div class="col-sm-10">
-                                <input v-model="addCommunityInfo.name" type="text" placeholder="必填,请小区名称,如格兰小镇(西宁)" class="form-control">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-sm-2 col-form-label">车品牌</label>
-                            <div class="col-sm-10">
-                                <input v-model="addCommunityInfo.carBrand" type="text" placeholder="必填,请填写车品牌,如 宝马X6" class="form-control">
-                            </div>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-sm-2 col-form-label">车类型</label>
-                            <div class="col-sm-10">
-                                <select class="custom-select" v-model="addCommunityInfo.carType">
-                                    <option selected  disabled value="">必填,请选择类型</option>
-                                    <option value="9901">家用小汽车</option>
-                                    <option value="9902">客车</option>
-                                    <option value="9903">货车</option>
-                                </select>
+                        <div>
+                            <!--<div class="form-group row">
+                                <label class="col-sm-2 col-form-label">楼名称</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.name" type="text" placeholder="必填,请填写名称" class="form-control"></div>
                             </div>
-                        </div>
-                        <div class="form-group row">
-                            <label class="col-sm-2 col-form-label">颜色</label>
-                            <div class="col-sm-10">
-                                <input v-model="addCommunityInfo.carColor" type="text" placeholder="必填,请填写车颜色,如白色" class="form-control">
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">楼编号</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.floorNum" type="email" placeholder="必填,请填写编号" class="form-control"></div>
                             </div>
-                        </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">备注</label>
+                                <div class="col-sm-10"><input v-model="addFloorInfo.remark" type="tel" placeholder="可填,请填写备注" class="form-control"></div>
+                            </div>-->
+
+                            <div class="form-group row">
+         <label class="col-sm-2 col-form-label">小区名称</label>
+         <div class="col-sm-10">
+           <input v-model="addCommunityInfo.name"                   type="text" placeholder="必填,请填写小区名称" class="form-control">
+         </div>
+</div>
+<div class="form-group row">
+         <label class="col-sm-2 col-form-label">小区地址</label>
+         <div class="col-sm-10">
+           <input v-model="addCommunityInfo.address"                   type="text" placeholder="必填,请填写小区地址" class="form-control">
+         </div>
+</div>
+<div class="form-group row">
+         <label class="col-sm-2 col-form-label">附近地标</label>
+         <div class="col-sm-10">
+           <input v-model="addCommunityInfo.nearbyLandmarks"                   type="text" placeholder="必填,请填写附近地标" class="form-control">
+         </div>
+</div>
 
-                        <div class="form-group row">
-                            <label class="col-sm-2 col-form-label">备注</label>
-                            <div class="col-sm-10">
-                                <textarea v-model="addCommunityInfo.carRemark" type="text" placeholder="请填写备注信息" rows="3" class="form-control"></textarea>
+                            <div class="ibox-content">
+                                <button class="btn btn-primary float-right" type="button" v-on:click="saveCommunityInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
                             </div>
                         </div>
                     </div>
@@ -48,4 +48,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

+ 125 - 25
WebService/src/main/resources/components/add-community/addCommunity.js

@@ -1,41 +1,141 @@
-/**
-    权限组
-**/
 (function(vc){
 
     vc.extends({
-        propTypes: {
-            callBackComponent:vc.propTypes.string
-        },
         data:{
-            addCarInfo:{
-                carNum:'',
-                carBrand:'',
-                carType:'',
-                carColor:'',
-                carRemark:""
+            addCommunityInfo:{
+                name:'',
+address:'',
+nearbyLandmarks:'',
+cityCode:'0971',
+mapX:'101.33',
+mapY:'101.33',
+
             }
         },
-        watch:{
-            addCarInfo:{
-                deep: true,
-                handler:function(){
-                    vc.emit($props.callBackComponent,'notify',vc.component.addCarInfo);
+         _initMethod:function(){
 
-                }
-             }
+         },
+         _initEvent:function(){
+            vc.on('addCommunity','openAddCommunityModal',function(){
+                $('#addCommunityModel').modal('show');
+            });
         },
-        _initMethod:function(){
+        methods:{
+            addCommunityValidate(){
+                return vc.validate.validate({
+                    addCommunityInfo:vc.component.addCommunityInfo
+                },{
+                    'addCommunityInfo.name':[
+{
+                            limit:"required",
+                            param:"",
+                            errInfo:"小区名称不能为空"
+                        },
+ {
+                            limit:"maxin",
+                            param:"10,20",
+                            errInfo:"小区名称必须在10至20字符之间"
+                        },
+                    ],
+'addCommunityInfo.address':[
+{
+                            limit:"required",
+                            param:"",
+                            errInfo:"小区地址不能为空"
+                        },
+ {
+                            limit:"maxin",
+                            param:"200",
+                            errInfo:"小区地址不能大于200个字符"
+                        },
+                    ],
+'addCommunityInfo.nearbyLandmarks':[
+{
+                            limit:"required",
+                            param:"",
+                            errInfo:"附近地标不能为空"
+                        },
+ {
+                            limit:"maxin",
+                            param:"50",
+                            errInfo:"小区附近地标不能大于50个字符"
+                        },
+                    ],
+'addCommunityInfo.cityCode':[
+ {
+                            limit:"maxin",
+                            param:"12",
+                            errInfo:"小区城市编码不能大于4个字符"
+                        },
+                    ],
+'addCommunityInfo.mapX':[
+ {
+                            limit:"maxin",
+                            param:"20",
+                            errInfo:"小区城市编码不能大于4个字符"
+                        },
+                    ],
+'addCommunityInfo.mapY':[
+ {
+                            limit:"maxin",
+                            param:"20",
+                            errInfo:"小区城市编码不能大于4个字符"
+                        },
+                    ],
 
-        },
-        _initEvent:function(){
 
 
-        },
-        methods:{
 
+                });
+            },
+            saveCommunityInfo:function(){
+                if(!vc.component.addCommunityValidate()){
+                    vc.message(vc.validate.errInfo);
+
+                    return ;
+                }
+
+                vc.component.addCommunityInfo.communityId = vc.getCurrentCommunity().communityId;
+
+                vc.http.post(
+                    'addCommunity',
+                    'save',
+                    JSON.stringify(vc.component.addCommunityInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#addCommunityModel').modal('hide');
+                            vc.component.clearAddCommunityInfo();
+                            vc.emit('communityManage','listCommunity',{});
+
+                            return ;
+                        }
+                        vc.message(json);
 
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+
+                        vc.message(errInfo);
+
+                     });
+            },
+            clearAddCommunityInfo:function(){
+                vc.component.addCommunityInfo = {
+                                            name:'',
+address:'',
+nearbyLandmarks:'',
+cityCode:'0971',
+mapX:'101.33',
+mapY:'101.33',
+
+                                        };
+            }
         }
     });
 
-})(window.vc);
+})(window.vc);

+ 26 - 35
WebService/src/main/resources/components/community-manage/communityManage.html

@@ -16,46 +16,35 @@
                     <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
                         <thead>
                         <tr>
-                            <th>小区ID</th>
-                            <th data-hide="phone">名称</th>
-                            <th data-hide="phone">联系方式</th>
-                            <th data-hide="phone">地址</th>
-                            <th data-hide="phone">地标</th>
-                            <th data-hide="phone,tablet" >城市编码</th>
-                            <th data-hide="phone">状态</th>
+                                                        <th>小区ID</th>
+                            <th>小区名称</th>
+                            <th>小区地址</th>
+                            <th>附近地标</th>
+                            <th>城市编码</th>
+                            <th>小区维度</th>
+                            <th>小区经度</th>
                             <th class="text-right">操作</th>
 
+
                         </tr>
                         </thead>
                         <tbody>
-                        <tr v-for="community in communityManageInfo.communitys">
-                            <td>
-                                {{community.communityId}}
-                            </td>
-                            <td>
-                                {{community.name}}
-                            </td>
-                            <td>
-                                {{community.tel}}
-                            </td>
-                            <td>
-                                {{community.address}}
-                            </td>
-                            <td>
-                                {{community.nearbyLandmarks}}
-                            </td>
-                            <td>
-                                {{community.cityCode}}
-                            </td>
-                            <td>
-                                {{_showCommunityStatus(community.auditStatusCd)}}
-                            </td>
-                            <td class="text-right">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditCommunityModel(floor)">修改</button>
+                            <tr v-for="community in communityManageInfo.communitys">
+                                                            <td>{{community.communityId}}</td>
+                            <td>{{community.name}}</td>
+                            <td>{{community.address}}</td>
+                            <td>{{community.nearbyLandmarks}}</td>
+                            <td>{{community.cityCode}}</td>
+                            <td>{{community.mapX}}</td>
+                            <td>{{community.mapY}}</td>
+                            <td><div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openEditCommunityModel(community)">修改</button>
                                 </div>
-                            </td>
-                        </tr>
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs" v-on:click="_openDelCommunityModel(community)">删除</button>
+                                </div></td>
+
+                            </tr>
                         </tbody>
                         <tfoot>
                         <tr>
@@ -73,5 +62,7 @@
     </div>
 
     <vc:create name="addCommunity"></vc:create>
+    <vc:create name="editCommunity"></vc:create>
+    <vc:create name="deleteCommunity"></vc:create>
 
-</div>
+</div>

+ 6 - 14
WebService/src/main/resources/components/community-manage/communityManage.js

@@ -13,11 +13,11 @@
             }
         },
         _initMethod:function(){
-            vc.component.listMyCommunity(DEFAULT_PAGE, DEFAULT_ROWS);
+            vc.component.listCommunity(DEFAULT_PAGE, DEFAULT_ROWS);
         },
         _initEvent:function(){
-            vc.on('communityManage','listMyCommunity',function(_param){
-                  vc.component._listCommunitys();
+            vc.on('communityManage','listCommunity',function(_param){
+                  vc.component._listCommunitys(DEFAULT_PAGE, DEFAULT_ROWS);
             });
              vc.on('pagination','page_event',function(_currentPage){
                 vc.component._listCommunitys(_currentPage,DEFAULT_ROWS);
@@ -52,17 +52,9 @@
             _openEditCommunityModel:function(_community){
                 vc.emit('editCommunity','openEditCommunityModal',_community);
             },
-            _showCommunityStatus(_statusCd){
-                if(_statusCd == '1000'){
-                    return "入驻审核";
-                }else if(_statusCd == '1001'){
-                    return "退出审核";
-                }else if(_statusCd == '0000'){
-                    return "入驻成功";
-                }
-
-                return "未知";
+            _openDeleteCommunityModel:function(_community){
+                vc.emit('deleteCommunity','openDeleteCommunityModal',_community);
             }
         }
     });
-})(window.vc);
+})(window.vc);

+ 19 - 0
WebService/src/main/resources/components/delete-community/deleteCommunity.html

@@ -0,0 +1,19 @@
+<div class="modal fade" id="deleteCommunityModel" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="exampleModalLabel">请确认您的操作!</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <tr align="center"><th>确定删除小区</th></tr>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeDeleteCommunityModel()">点错了</button>
+                <button type="button" class="btn btn-primary" v-on:click="deleteCommunity()">确认删除</button>
+            </div>
+        </div>
+    </div>
+</div>

+ 52 - 0
WebService/src/main/resources/components/delete-community/deleteCommunity.js

@@ -0,0 +1,52 @@
+(function(vc,vm){
+
+    vc.extends({
+        data:{
+            deleteCommunityInfo:{
+
+            }
+        },
+         _initMethod:function(){
+
+         },
+         _initEvent:function(){
+             vc.on('deleteCommunity','openCommunityModel',function(_params){
+
+                vc.component.deleteCommunityInfo = _params;
+                $('#deleteCommunityModel').modal('show');
+
+            });
+        },
+        methods:{
+            deleteCommunity:function(){
+                vc.component.deleteCommunityInfo.communityId=vc.getCurrentCommunity().communityId;
+                vc.http.post(
+                    'deleteCommunity',
+                    'delete',
+                    JSON.stringify(vc.component.deleteCommunityInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#deleteCommunityModel').modal('hide');
+                            vc.emit('communityManage','listCommunity',{});
+                            return ;
+                        }
+                        vc.message(json);
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+                        vc.message(json);
+
+                     });
+            },
+            closeDeleteCommunityModel:function(){
+                $('#deleteCommunityModel').modal('hide');
+            }
+        }
+    });
+
+})(window.vc,window.vc.component);

+ 38 - 0
WebService/src/main/resources/components/edit-community/editCommunity.html

@@ -0,0 +1,38 @@
+<div id = "editCommunityModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b ">修改小区</h3>
+                <div class="ibox-content">
+                    <div>
+                        <div>
+                            <div class="form-group row">
+         <label class="col-sm-2 col-form-label">小区名称</label>
+         <div class="col-sm-10">
+           <input v-model="editCommunityInfo.name"                   type="text" placeholder="必填,请填写小区名称" class="form-control">
+         </div>
+</div>
+<div class="form-group row">
+         <label class="col-sm-2 col-form-label">小区地址</label>
+         <div class="col-sm-10">
+           <input v-model="editCommunityInfo.address"                   type="text" placeholder="必填,请填写小区地址" class="form-control">
+         </div>
+</div>
+<div class="form-group row">
+         <label class="col-sm-2 col-form-label">附近地标</label>
+         <div class="col-sm-10">
+           <input v-model="editCommunityInfo.nearbyLandmarks"                   type="text" placeholder="必填,请填写附近地标" class="form-control">
+         </div>
+</div>
+
+                            <div class="ibox-content">
+                                <button class="btn btn-primary float-right" type="button" v-on:click="editCommunity()" ><i class="fa fa-check"></i>&nbsp;保存</button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

+ 79 - 0
WebService/src/main/resources/components/edit-community/editCommunity.js

@@ -0,0 +1,79 @@
+(function(vc,vm){
+
+    vc.extends({
+        data:{
+            editCommunityInfo:{
+                communityId:'',
+name:'',
+address:'',
+nearbyLandmarks:'',
+cityCode:'0971',
+mapX:'101.33',
+mapY:'101.33',
+
+            }
+        },
+         _initMethod:function(){
+
+         },
+         _initEvent:function(){
+             vc.on('editCommunity','openCommunityModel',function(_params){
+                vc.component.refreshEditCommunityInfo();
+                $('#editCommunityModel').modal('show');
+                vc.component.editCommunityInfo = _params;
+                vc.component.editCommunityInfo.communityId = vc.getCurrentCommunity().communityId;
+            });
+        },
+        methods:{
+            editCommunityValidate:function(){
+                        return vc.validate.validate({
+                            editCommunityInfo:vc.component.editCommunityInfo
+                        },{
+                            @@addTemplateCodeValidate@@
+                        });
+             },
+            editCommunity:function(){
+                if(!vc.component.editCommunityValidate()){
+                    vc.message(vc.validate.errInfo);
+                    return ;
+                }
+
+                vc.http.post(
+                    'editCommunity',
+                    'update',
+                    JSON.stringify(vc.component.editCommunityInfo),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#editCommunityModel').modal('hide');
+                             vc.emit('communityManage','listCommunity',{});
+                            return ;
+                        }
+                        vc.message(json);
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+
+                        vc.message(errInfo);
+                     });
+            },
+            refreshEditCommunityInfo:function(){
+                vc.component.editCommunityInfo= {
+                  communityId:'',
+name:'',
+address:'',
+nearbyLandmarks:'',
+cityCode:'0971',
+mapX:'101.33',
+mapY:'101.33',
+
+                }
+            }
+        }
+    });
+
+})(window.vc,window.vc.component);

+ 4 - 4
WebService/src/main/resources/views/communityManageFlow.html

@@ -5,11 +5,11 @@
       xmlns:vc="http://www.thymeleaf.org">
 <head>
     <meta charset="UTF-8"/>
-    <title>添加小区|java110</title>
+    <title>小区初始化|java110</title>
     <vc:create name="commonTop"></vc:create>
 </head>
 <body>
-<vc:create name="loading"></vc:create>
+<vc:create name="bodyTop"></vc:create>
 <div id="wrapper">
     <vc:create name="menu"></vc:create>
 
@@ -19,7 +19,7 @@
             <vc:create name="nav"></vc:create>
         </div>
         <!-- id="component" -->
-        <div id="component" class="wrapper wrapper-content animated fadeInRight">
+        <div class="wrapper wrapper-content animated fadeInRight">
             <vc:create name="communityManage"></vc:create>
         </div>
 
@@ -30,4 +30,4 @@
 
 <vc:create name="commonBottom"></vc:create>
 </body>
-</html>
+</html>

+ 23 - 54
java110-bean/src/main/java/com/java110/vo/api/community/ApiCommunityDataVo.java

@@ -1,84 +1,53 @@
 package com.java110.vo.api.community;
 
-import com.java110.vo.MorePageVo;
-
 import java.io.Serializable;
 import java.util.Date;
 
 public class ApiCommunityDataVo implements Serializable {
 
-    private String address;
-    private String nearbyLandmarks;
-    private String cityCode;
     private String name;
-    private String communityId;
-    private String mapY;
-    private String mapX;
-
-
-    private Date createTime;
-
-    public String getAddress() {
+private String address;
+private String nearbyLandmarks;
+private String cityCode;
+private String mapX;
+private String mapY;
+public String getName() {
+        return name;
+    }
+public void setName(String name) {
+        this.name = name;
+    }
+public String getAddress() {
         return address;
     }
-
-    public void setAddress(String address) {
+public void setAddress(String address) {
         this.address = address;
     }
-
-    public String getNearbyLandmarks() {
+public String getNearbyLandmarks() {
         return nearbyLandmarks;
     }
-
-    public void setNearbyLandmarks(String nearbyLandmarks) {
+public void setNearbyLandmarks(String nearbyLandmarks) {
         this.nearbyLandmarks = nearbyLandmarks;
     }
-
-    public String getCityCode() {
+public String getCityCode() {
         return cityCode;
     }
-
-    public void setCityCode(String cityCode) {
+public void setCityCode(String cityCode) {
         this.cityCode = cityCode;
     }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getCommunityId() {
-        return communityId;
+public String getMapX() {
+        return mapX;
     }
-
-    public void setCommunityId(String communityId) {
-        this.communityId = communityId;
+public void setMapX(String mapX) {
+        this.mapX = mapX;
     }
-
-    public String getMapY() {
+public String getMapY() {
         return mapY;
     }
-
-    public void setMapY(String mapY) {
+public void setMapY(String mapY) {
         this.mapY = mapY;
     }
 
-    public String getMapX() {
-        return mapX;
-    }
-
-    public void setMapX(String mapX) {
-        this.mapX = mapX;
-    }
 
-    public Date getCreateTime() {
-        return createTime;
-    }
 
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 }

+ 1 - 1
java110-code-generator/src/main/java/com/java110/code/web/GeneratorAddComponent.java

@@ -213,7 +213,7 @@ public class GeneratorAddComponent extends BaseGenerator {
 
 
         String writePath = this.getClass().getResource("/").getPath()
-                + "out/web/smo/" + data.getString("templateCode") + "/Add" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMOImpl.java";
+                + "out/web/smo/" + data.getString("templateCode") + "/impl/Add" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMOImpl.java";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);

+ 167 - 0
java110-code-generator/src/main/java/com/java110/code/web/GeneratorDeleteComponent.java

@@ -0,0 +1,167 @@
+package com.java110.code.web;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.code.BaseGenerator;
+import org.springframework.util.StringUtils;
+
+public class GeneratorDeleteComponent extends BaseGenerator {
+
+    public void generator(JSONObject data) {
+
+        //处理组件
+        generatorComponentHtml(data);
+        generatorComponentJs(data);
+        generatorComponentJava(data);
+        genneratorIListSmo(data);
+        genneratorListSmoImpl(data);
+        genneratorListListener(data);
+
+
+
+    }
+
+    /**
+     * 生成 html js java 类
+     *
+     * @param data
+     */
+    private void generatorComponentHtml(JSONObject data) {
+
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/delete/delete.html").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+        
+
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/web/component/delete-" + data.getString("templateCode") + "/delete" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+
+
+    }
+
+    /**
+     * 生成 html js java 类
+     *
+     * @param data
+     */
+    private void generatorComponentJs(JSONObject data) {
+
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/delete/delete.js").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+        
+
+        // 替换 数据校验部分代码
+
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/web/component/delete-" + data.getString("templateCode") + "/delete" + toUpperCaseFirstOne(data.getString("templateCode")) + ".js";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+
+
+    }
+
+    /**
+     * 生成 html js java 类
+     *
+     * @param data
+     */
+    private void generatorComponentJava(JSONObject data) {
+
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/delete/DeleteComponent.java").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/web/component/java/" + data.getString("templateCode") + "/Delete" + toUpperCaseFirstOne(data.getString("templateCode")) + "Component.java";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+
+
+    }
+
+    /**
+     * 生成接口类
+     *
+     * @param data
+     */
+    private void genneratorIListSmo(JSONObject data) {
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/delete/IDeleteSMO.java").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/web/smo/" + data.getString("templateCode") + "/IDelete" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMO.java";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+    }
+
+    /**
+     * 生成接口类
+     *
+     * @param data
+     */
+    private void genneratorListSmoImpl(JSONObject data) {
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/delete/DeleteSMOImpl.java").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+
+        //替换校验部分代码 @@validateTemplateColumns@@
+        JSONArray columns = data.getJSONArray("columns");
+        StringBuffer validateStr = new StringBuffer();
+        validateStr.append("Assert.hasKeyAndValue(paramIn, \""+data.getString("templateKey")+"\", \""+data.getString("templateKeyName")+"不能为空\");\n");
+
+
+        fileContext = fileContext.replace("@@validateTemplateColumns@@", validateStr.toString());
+
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/web/smo/" + data.getString("templateCode") + "/impl/Delete" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMOImpl.java";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+    }
+
+    /**
+     * 生成API 侦听处理类
+     *
+     * @param data
+     */
+    private void genneratorListListener(JSONObject data) {
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/delete/DeleteListener.java").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+
+        //替换校验部分代码 @@validateTemplateColumns@@
+        JSONArray columns = data.getJSONArray("columns");
+        StringBuffer validateStr = new StringBuffer();
+        validateStr.append("Assert.hasKeyAndValue(reqJson, \""+data.getString("templateKey")+"\", \""+data.getString("templateKeyName")+"不能为空\");\n");
+
+        fileContext = fileContext.replace("@@validateTemplateColumns@@", validateStr.toString());
+
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/api/listener/" + data.getString("templateCode") + "/Delete" + toUpperCaseFirstOne(data.getString("templateCode")) + "Listener.java";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+    }
+
+
+
+}

+ 266 - 0
java110-code-generator/src/main/java/com/java110/code/web/GeneratorEditComponent.java

@@ -0,0 +1,266 @@
+package com.java110.code.web;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.code.BaseGenerator;
+import org.springframework.util.StringUtils;
+
+public class GeneratorEditComponent extends BaseGenerator {
+
+    public void generator(JSONObject data) {
+
+        //处理组件
+        generatorComponentHtml(data);
+        generatorComponentJs(data);
+        generatorComponentJava(data);
+        genneratorIListSmo(data);
+        genneratorListSmoImpl(data);
+        genneratorListListener(data);
+
+
+
+    }
+
+    /**
+     * 生成 html js java 类
+     *
+     * @param data
+     */
+    private void generatorComponentHtml(JSONObject data) {
+
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/edit/edit.html").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+
+        // 处理 th 信息
+
+        StringBuffer thSb = new StringBuffer();
+
+        JSONArray columns = data.getJSONArray("columns");
+        for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
+            JSONObject column = columns.getJSONObject(columnIndex);
+            if (column.getBoolean("hasDefaultValue")) {
+                continue;
+            }
+            String required = column.getBoolean("required") ? "必填" : "选填";
+            String inputStr = "";
+            if ("select".equals(column.getString("inputType"))) {
+
+                String[] selectValues = column.getString("selectValue").split(",");
+                String[] selectValueNames = column.getString("selectValueName").split(",");
+
+
+                String option = "";
+                for (int valueIndex = 0; valueIndex <= selectValues.length; valueIndex++) {
+
+                    String value = selectValues[valueIndex];
+
+                    option += "<option  value=\"" + value + "\">" + selectValueNames[valueIndex] + "</option>\n";
+
+                }
+
+                inputStr = "<select class=\"custom-select\" v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info."+column.getString("code")+"\">\n" +
+                        "         <option selected  disabled value=\"\">"+ required + ",请选择" + column.getString("cnCode") + "</option>\n" +
+                        "         " +option+
+                        "  </select>";
+            } else {
+                inputStr = "           <input v-model=\"edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Info."+column.getString("code")+"\" " +
+                        "                  type=\"text\" placeholder=\"" + required + ",请填写" + column.getString("cnCode") + "\" class=\"form-control\">\n";
+            }
+            thSb.append("<div class=\"form-group row\">\n" +
+                    "         <label class=\"col-sm-2 col-form-label\">" + column.getString("cnCode") + "</label>\n" +
+                    "         <div class=\"col-sm-10\">\n" +
+                    inputStr+
+                    "         </div>\n" +
+                    "</div>\n");
+
+        }
+
+        fileContext = fileContext.replace("@@editTemplateColumns@@", thSb.toString());
+
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/web/component/edit-" + data.getString("templateCode") + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + ".html";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+
+
+    }
+
+    /**
+     * 生成 html js java 类
+     *
+     * @param data
+     */
+    private void generatorComponentJs(JSONObject data) {
+
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/edit/edit.js").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+
+        //替换 变量@@templateCodeColumns@@
+        JSONArray columns = data.getJSONArray("columns");
+
+        StringBuffer variable = new StringBuffer();
+        variable.append(data.getString("templateKey")+":'',\n");
+        String defaultValue = "";
+
+
+        String validateInfo = "";
+        for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
+            JSONObject column = columns.getJSONObject(columnIndex);
+            defaultValue = column.getBoolean("hasDefaultValue") ? column.getString("defaultValue") : "";
+            defaultValue = "'" + defaultValue + "'";
+            variable.append(column.getString("code") + ":" + defaultValue + ",\n");
+
+            validateInfo += "'edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"Info."+column.getString("code")+"':[\n" ;
+            if(column.getBoolean("required")) {
+                validateInfo +="{\n" +
+                        "                            limit:\"required\",\n" +
+                        "                            param:\"\",\n" +
+                        "                            errInfo:\""+column.getString("cnCode")+"不能为空\"\n" +
+                        "                        },\n";
+            }
+
+            if(column.containsKey("limit") && !StringUtils.isEmpty(column.getString("limit"))) {
+                validateInfo +=" {\n" +
+                        "                            limit:\""+column.getString("limit")+"\",\n" +
+                        "                            param:\""+column.getString("limitParam")+"\",\n" +
+                        "                            errInfo:\""+column.getString("limitErrInfo")+"\"\n" +
+                        "                        },\n" +
+                        "                    ],\n";
+            }
+
+        }
+        validateInfo += "'edit"+toUpperCaseFirstOne(data.getString("templateCode"))+"Info."+data.getString("templateKey")+"':[\n" ;
+        validateInfo +="{\n" +
+                "                            limit:\"required\",\n" +
+                "                            param:\"\",\n" +
+                "                            errInfo:\""+data.getString("templateKeyName")+"不能为空\"\n" +
+                "                        }]\n";
+        fileContext =  fileContext.replace("@@templateCodeColumns@@", variable.toString());
+        fileContext = fileContext.replace("@@editTemplateCodeValidate@@", validateInfo);
+
+        // 替换 数据校验部分代码
+
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/web/component/edit-" + data.getString("templateCode") + "/edit" + toUpperCaseFirstOne(data.getString("templateCode")) + ".js";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+
+
+    }
+
+    /**
+     * 生成 html js java 类
+     *
+     * @param data
+     */
+    private void generatorComponentJava(JSONObject data) {
+
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/edit/EditComponent.java").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/web/component/java/" + data.getString("templateCode") + "/Edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "Component.java";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+
+
+    }
+
+    /**
+     * 生成接口类
+     *
+     * @param data
+     */
+    private void genneratorIListSmo(JSONObject data) {
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/edit/IEditSMO.java").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/web/smo/" + data.getString("templateCode") + "/IEdit" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMO.java";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+    }
+
+    /**
+     * 生成接口类
+     *
+     * @param data
+     */
+    private void genneratorListSmoImpl(JSONObject data) {
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/edit/EditSMOImpl.java").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+
+        //替换校验部分代码 @@validateTemplateColumns@@
+        JSONArray columns = data.getJSONArray("columns");
+        StringBuffer validateStr = new StringBuffer();
+
+        validateStr.append("Assert.hasKeyAndValue(paramIn, \""+data.getString("templateKey")+"\", \""+data.getString("templateKeyName")+"不能为空\");\n");
+        for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
+            JSONObject column = columns.getJSONObject(columnIndex);
+            if(column.getBoolean("required")) {
+                validateStr.append("Assert.hasKeyAndValue(paramIn, \""+column.getString("code")+"\", \""+column.getString("desc")+"\");\n");
+            }
+        }
+
+        fileContext = fileContext.replace("@@validateTemplateColumns@@", validateStr.toString());
+
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/web/smo/" + data.getString("templateCode") + "/impl/Edit" + toUpperCaseFirstOne(data.getString("templateCode")) + "SMOImpl.java";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+    }
+
+    /**
+     * 生成API 侦听处理类
+     *
+     * @param data
+     */
+    private void genneratorListListener(JSONObject data) {
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/edit/UpdateListener.java").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+
+        //替换校验部分代码 @@validateTemplateColumns@@
+        JSONArray columns = data.getJSONArray("columns");
+        StringBuffer validateStr = new StringBuffer();
+        validateStr.append("Assert.hasKeyAndValue(reqJson, \""+data.getString("templateKey")+"\", \""+data.getString("templateKeyName")+"不能为空\");\n");
+        for (int columnIndex = 0; columnIndex < columns.size(); columnIndex++) {
+            JSONObject column = columns.getJSONObject(columnIndex);
+            if(column.getBoolean("required")) {
+                validateStr.append("Assert.hasKeyAndValue(reqJson, \""+column.getString("code")+"\", \""+column.getString("desc")+"\");\n");
+            }
+        }
+
+        fileContext = fileContext.replace("@@validateTemplateColumns@@", validateStr.toString());
+
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/api/listener/" + data.getString("templateCode") + "/Update" + toUpperCaseFirstOne(data.getString("templateCode")) + "Listener.java";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+    }
+
+
+
+}

+ 46 - 0
java110-code-generator/src/main/java/com/java110/code/web/GeneratorFlow.java

@@ -0,0 +1,46 @@
+package com.java110.code.web;
+
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.code.BaseGenerator;
+import org.springframework.util.StringUtils;
+
+public class GeneratorFlow extends BaseGenerator {
+
+    public void generator(JSONObject data) {
+
+        //处理组件
+        generatorComponentHtml(data);
+
+
+
+
+    }
+
+    /**
+     * 生成 html js java 类
+     *
+     * @param data
+     */
+    private void generatorComponentHtml(JSONObject data) {
+
+        StringBuffer sb = readFile(GeneratorStart.class.getResource("/web/flow.html").getFile());
+        String fileContext = sb.toString();
+
+        fileContext = super.replaceTemplateContext(fileContext, data);
+
+
+        String writePath = this.getClass().getResource("/").getPath()
+                + "out/web/" + data.getString("templateCode") + "/" + data.getString("templateCode") + "Flow.html";
+        System.out.printf("writePath: " + writePath);
+        writeFile(writePath,
+                fileContext);
+
+
+    }
+
+
+
+
+}

+ 1 - 1
java110-code-generator/src/main/java/com/java110/code/web/GeneratorManagerComponent.java

@@ -142,7 +142,7 @@ public class GeneratorManagerComponent extends BaseGenerator {
         fileContext = super.replaceTemplateContext(fileContext, data);
 
         String writePath = this.getClass().getResource("/").getPath()
-                +"out/web/smo/"+data.getString("templateCode")+"/List"+toUpperCaseFirstOne(data.getString("templateCode"))+"sSMOImpl.java";
+                +"out/web/smo/"+data.getString("templateCode")+"/impl/List"+toUpperCaseFirstOne(data.getString("templateCode"))+"sSMOImpl.java";
         System.out.printf("writePath: " + writePath);
         writeFile(writePath,
                 fileContext);

+ 14 - 0
java110-code-generator/src/main/java/com/java110/code/web/GeneratorStart.java

@@ -11,6 +11,11 @@ public class GeneratorStart extends BaseGenerator {
 
         JSONObject data = JSONObject.parseObject(sb.toString());
 
+
+        GeneratorFlow flow = new GeneratorFlow();
+        flow.generator(data);
+
+
         GeneratorManagerComponent managerComponent = new GeneratorManagerComponent();
         managerComponent.generator(data);
 
@@ -19,5 +24,14 @@ public class GeneratorStart extends BaseGenerator {
 
         GeneratorAddComponent addComponent = new GeneratorAddComponent();
         addComponent.generator(data);
+
+        //编辑功能开发完成
+        GeneratorEditComponent editComponent = new GeneratorEditComponent();
+        editComponent.generator(data);
+
+        //删除功能开发完成
+
+        GeneratorDeleteComponent deleteComponent = new GeneratorDeleteComponent();
+        deleteComponent.generator(data);
     }
 }

+ 11 - 12
java110-code-generator/src/main/resources/web/add/AddComponent.java

@@ -1,7 +1,7 @@
 package com.java110.web.components.@@templateCode@@;
 
 import com.java110.core.context.IPageData;
-import com.java110.web.smo.I@@TemplateCode@@ServiceSMO;
+import com.java110.web.smo.@@templateCode@@.IAdd@@TemplateCode@@SMO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -13,23 +13,22 @@ import org.springframework.stereotype.Component;
 public class Add@@TemplateCode@@Component {
 
     @Autowired
-    private I@@TemplateCode@@ServiceSMO @@templateCode@@ServiceSMOImpl;
+    private IAdd@@TemplateCode@@SMO add@@TemplateCode@@SMOImpl;
 
     /**
-     * 查询@@templateName@@信息
-     * @param pd 页面封装对象 包含页面请求数据
-     * @return ResponseEntity对象返回给页面
+     * 添加@@templateName@@数据
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
      */
-    public ResponseEntity<String> save(IPageData pd) {
-
-        return @@templateCode@@ServiceSMOImpl.save@@TemplateCode@@(pd);
+    public ResponseEntity<String> save(IPageData pd){
+        return add@@TemplateCode@@SMOImpl.save@@TemplateCode@@(pd);
     }
 
-    public I@@TemplateCode@@ServiceSMO get@@TemplateCode@@ServiceSMOImpl() {
-        return @@templateCode@@ServiceSMOImpl;
+    public IAdd@@TemplateCode@@SMO getAdd@@TemplateCode@@SMOImpl() {
+        return add@@TemplateCode@@SMOImpl;
     }
 
-    public void set@@TemplateCode@@ServiceSMOImpl(I@@TemplateCode@@ServiceSMO @@templateCode@@ServiceSMOImpl) {
-        this.@@templateCode@@ServiceSMOImpl = @@templateCode@@ServiceSMOImpl;
+    public void setAdd@@TemplateCode@@SMOImpl(IAdd@@TemplateCode@@SMO add@@TemplateCode@@SMOImpl) {
+        this.add@@TemplateCode@@SMOImpl = add@@TemplateCode@@SMOImpl;
     }
 }

+ 8 - 1
java110-code-generator/src/main/resources/web/add/SaveListener.java

@@ -10,12 +10,19 @@ import com.java110.event.service.api.ServiceDataFlowEvent;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
+import com.java110.common.constant.CommonConstant;
+import com.java110.common.constant.ServiceCodeConstant;
+import com.java110.common.constant.BusinessTypeConstant;
 
+
+
+import com.java110.core.annotation.Java110Listener;
 /**
  * 保存小区侦听
  * add by wuxw 2019-06-30
  */
-public class SaveListener extends AbstractServiceApiListener {
+@Java110Listener("save@@TemplateCode@@Listener")
+public class Save@@TemplateCode@@Listener extends AbstractServiceApiListener {
     @Override
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
         //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");

+ 34 - 0
java110-code-generator/src/main/resources/web/delete/DeleteComponent.java

@@ -0,0 +1,34 @@
+package com.java110.web.components.@@templateCode@@;
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.@@templateCode@@.IDelete@@TemplateCode@@SMO;
+import org.springframework.beans.factory.annotation.Autowired;
+        import org.springframework.http.ResponseEntity;
+        import org.springframework.stereotype.Component;
+
+/**
+ * 添加@@templateName@@组件
+ */
+@Component("delete@@TemplateCode@@")
+public class Delete@@TemplateCode@@Component {
+
+@Autowired
+private IDelete@@TemplateCode@@SMO delete@@TemplateCode@@SMOImpl;
+
+/**
+ * 添加@@templateName@@数据
+ * @param pd 页面数据封装
+ * @return ResponseEntity 对象
+ */
+public ResponseEntity<String> delete(IPageData pd){
+        return delete@@TemplateCode@@SMOImpl.delete@@TemplateCode@@(pd);
+    }
+
+public IDelete@@TemplateCode@@SMO getDelete@@TemplateCode@@SMOImpl() {
+        return delete@@TemplateCode@@SMOImpl;
+    }
+
+public void setDelete@@TemplateCode@@SMOImpl(IDelete@@TemplateCode@@SMO delete@@TemplateCode@@SMOImpl) {
+        this.delete@@TemplateCode@@SMOImpl = delete@@TemplateCode@@SMOImpl;
+    }
+            }

+ 90 - 0
java110-code-generator/src/main/resources/web/delete/DeleteListener.java

@@ -0,0 +1,90 @@
+package com.java110.api.listener.@@templateCode@@;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.listener.AbstractServiceApiListener;
+import com.java110.common.util.Assert;
+import com.java110.core.context.DataFlowContext;
+import com.java110.entity.center.AppService;
+import com.java110.event.service.api.ServiceDataFlowEvent;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import com.java110.common.constant.CommonConstant;
+import com.java110.common.constant.ServiceCodeConstant;
+import com.java110.common.constant.BusinessTypeConstant;
+
+import com.java110.core.annotation.Java110Listener;
+/**
+ * 保存小区侦听
+ * add by wuxw 2019-06-30
+ */
+@Java110Listener("delete@@TemplateCode@@Listener")
+public class Delete@@TemplateCode@@Listener extends AbstractServiceApiListener {
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+        //Assert.hasKeyAndValue(reqJson, "xxx", "xxx");
+
+        @@validateTemplateColumns@@
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        HttpHeaders header = new HttpHeaders();
+        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
+        JSONArray businesses = new JSONArray();
+
+        AppService service = event.getAppService();
+
+        //添加单元信息
+        businesses.add(delete@@TemplateCode@@(reqJson, context));
+
+        JSONObject paramInObj = super.restToCenterProtocol(businesses, context.getRequestCurrentHeaders());
+
+        //将 rest header 信息传递到下层服务中去
+        super.freshHttpHeader(header, context.getRequestCurrentHeaders());
+
+        ResponseEntity<String> responseEntity = this.callService(context, service.getServiceCode(), paramInObj);
+
+        context.setResponseEntity(responseEntity);
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.SERVICE_CODE_DELETE_@@TEMPLATECODE@@;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+    @Override
+    public int getOrder() {
+        return DEFAULT_ORDER;
+    }
+
+
+    /**
+     * 添加小区信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    private JSONObject delete@@TemplateCode@@(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_DELETE_@@TEMPLATECODE@@_INFO);
+        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+        JSONObject business@@TemplateCode@@ = new JSONObject();
+        business@@TemplateCode@@.putAll(paramInJson);
+        //计算 应收金额
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("business@@TemplateCode@@", business@@TemplateCode@@);
+        return business;
+    }
+
+}

+ 62 - 0
java110-code-generator/src/main/resources/web/delete/DeleteSMOImpl.java

@@ -0,0 +1,62 @@
+package com.java110.web.smo.@@templateCode@@.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.PrivilegeCodeConstant;
+import com.java110.common.constant.ServiceConstant;
+import com.java110.common.util.Assert;
+import org.springframework.web.client.RestTemplate;
+import com.java110.core.context.IPageData;
+import com.java110.web.core.AbstractComponentSMO;
+import com.java110.web.smo.@@templateCode@@
+import org.springframework.stereotype.Service;.IDelete@@TemplateCode@@SMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 添加小区服务实现类
+ * delete by wuxw 2019-06-30
+ */
+@Service("delete@@TemplateCode@@SMOImpl")
+public class Delete@@TemplateCode@@SMOImpl extends AbstractComponentSMO implements IDelete@@TemplateCode@@SMO {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    protected void validate(IPageData pd, JSONObject paramIn) {
+
+        //super.validatePageInfo(pd);
+
+        //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
+        @@validateTemplateColumns@@
+
+
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_@@TEMPLATECODE@@);
+
+    }
+
+    @Override
+    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
+        ResponseEntity<String> responseEntity = null;
+        super.validateStoreStaffCommunityRelationship(pd, restTemplate);
+
+        responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/@@templateCode@@.delete@@TemplateCode@@",
+                HttpMethod.POST);
+        return responseEntity;
+    }
+
+    @Override
+    public ResponseEntity<String> delete@@TemplateCode@@(IPageData pd) {
+        return super.businessProcess(pd);
+    }
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+}

+ 19 - 0
java110-code-generator/src/main/resources/web/delete/IDeleteSMO.java

@@ -0,0 +1,19 @@
+package com.java110.web.smo.community;
+
+import com.java110.core.context.IPageData;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 添加@@templateName@@接口
+ *
+ * add by wuxw 2019-06-30
+ */
+public interface IDelete@@TemplateCode@@SMO {
+
+    /**
+     * 添加@@templateName@@
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
+     */
+    ResponseEntity<String> delete@@TemplateCode@@(IPageData pd);
+}

+ 19 - 0
java110-code-generator/src/main/resources/web/delete/delete.html

@@ -0,0 +1,19 @@
+<div class="modal fade" id="delete@@TemplateCode@@Model" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="exampleModalLabel">请确认您的操作!</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <tr align="center"><th>确定删除@@templateName@@</th></tr>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal" v-on:click="closeDelete@@TemplateCode@@Model()">点错了</button>
+                <button type="button" class="btn btn-primary" v-on:click="delete@@TemplateCode@@()">确认删除</button>
+            </div>
+        </div>
+    </div>
+</div>

+ 52 - 0
java110-code-generator/src/main/resources/web/delete/delete.js

@@ -0,0 +1,52 @@
+(function(vc,vm){
+
+    vc.extends({
+        data:{
+            delete@@TemplateCode@@Info:{
+
+            }
+        },
+         _initMethod:function(){
+
+         },
+         _initEvent:function(){
+             vc.on('delete@@TemplateCode@@','open@@TemplateCode@@Model',function(_params){
+
+                vc.component.delete@@TemplateCode@@Info = _params;
+                $('#delete@@TemplateCode@@Model').modal('show');
+
+            });
+        },
+        methods:{
+            delete@@TemplateCode@@:function(){
+                vc.component.delete@@TemplateCode@@Info.communityId=vc.getCurrentCommunity().communityId;
+                vc.http.post(
+                    'delete@@TemplateCode@@',
+                    'delete',
+                    JSON.stringify(vc.component.delete@@TemplateCode@@Info),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#delete@@TemplateCode@@Model').modal('hide');
+                            vc.emit('@@templateCode@@Manage','list@@TemplateCode@@',{});
+                            return ;
+                        }
+                        vc.message(json);
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+                        vc.message(json);
+
+                     });
+            },
+            closeDelete@@TemplateCode@@Model:function(){
+                $('#delete@@TemplateCode@@Model').modal('hide');
+            }
+        }
+    });
+
+})(window.vc,window.vc.component);

+ 34 - 0
java110-code-generator/src/main/resources/web/edit/EditComponent.java

@@ -0,0 +1,34 @@
+package com.java110.web.components.@@templateCode@@;
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.@@templateCode@@.IEdit@@TemplateCode@@SMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+/**
+ * 编辑小区组件
+ */
+@Component("edit@@TemplateCode@@")
+public class Edit@@TemplateCode@@Component {
+
+    @Autowired
+    private IEdit@@TemplateCode@@SMO edit@@TemplateCode@@SMOImpl;
+
+    /**
+     * 添加小区数据
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
+     */
+    public ResponseEntity<String> update(IPageData pd){
+        return edit@@TemplateCode@@SMOImpl.update@@TemplateCode@@(pd);
+    }
+
+    public IEdit@@TemplateCode@@SMO getEdit@@TemplateCode@@SMOImpl() {
+        return edit@@TemplateCode@@SMOImpl;
+    }
+
+    public void setEdit@@TemplateCode@@SMOImpl(IEdit@@TemplateCode@@SMO edit@@TemplateCode@@SMOImpl) {
+        this.edit@@TemplateCode@@SMOImpl = edit@@TemplateCode@@SMOImpl;
+    }
+}

+ 61 - 0
java110-code-generator/src/main/resources/web/edit/EditSMOImpl.java

@@ -0,0 +1,61 @@
+package com.java110.web.smo.@@templateCode@@.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.common.constant.PrivilegeCodeConstant;
+import com.java110.common.constant.ServiceConstant;
+import com.java110.common.util.Assert;
+import com.java110.core.context.IPageData;
+import com.java110.web.core.AbstractComponentSMO;
+import com.java110.web.smo.@@templateCode@@.IEdit@@TemplateCode@@SMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * 添加@@templateName@@服务实现类
+ * add by wuxw 2019-06-30
+ */
+@Service("eidt@@TemplateCode@@SMOImpl")
+public class Edit@@TemplateCode@@SMOImpl extends AbstractComponentSMO implements IEdit@@TemplateCode@@SMO {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    @Override
+    protected void validate(IPageData pd, JSONObject paramIn) {
+
+        //super.validatePageInfo(pd);
+
+        @@validateTemplateColumns@@
+
+
+        super.checkUserHasPrivilege(pd, restTemplate, PrivilegeCodeConstant.AGENT_HAS_LIST_COMMUNITY);
+
+    }
+
+    @Override
+    protected ResponseEntity<String> doBusinessProcess(IPageData pd, JSONObject paramIn) {
+        ResponseEntity<String> responseEntity = null;
+        super.validateStoreStaff@@TemplateCode@@Relationship(pd, restTemplate);
+
+        responseEntity = this.callCenterService(restTemplate, pd, paramIn.toJSONString(),
+                ServiceConstant.SERVICE_API_URL + "/api/@@templateCode@@.update@@TemplateCode@@",
+                HttpMethod.POST);
+        return responseEntity;
+    }
+
+    @Override
+    public ResponseEntity<String> update@@TemplateCode@@(IPageData pd) {
+        return super.businessProcess(pd);
+    }
+
+    public RestTemplate getRestTemplate() {
+        return restTemplate;
+    }
+
+    public void setRestTemplate(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+}

+ 19 - 0
java110-code-generator/src/main/resources/web/edit/IEditSMO.java

@@ -0,0 +1,19 @@
+package com.java110.web.smo.@@templateCode@@;
+
+import com.java110.core.context.IPageData;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 修改@@templateName@@接口
+ *
+ * add by wuxw 2019-06-30
+ */
+public interface IEdit@@TemplateCode@@SMO {
+
+    /**
+     * 修改小区
+     * @param pd 页面数据封装
+     * @return ResponseEntity 对象
+     */
+    ResponseEntity<String> update@@TemplateCode@@(IPageData pd);
+}

+ 89 - 0
java110-code-generator/src/main/resources/web/edit/UpdateListener.java

@@ -0,0 +1,89 @@
+package com.java110.api.listener.@@templateCode@@;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.java110.api.listener.AbstractServiceApiListener;
+import com.java110.common.constant.BusinessTypeConstant;
+import com.java110.common.constant.CommonConstant;
+import com.java110.common.constant.ServiceCodeConstant;
+import com.java110.common.util.Assert;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.entity.center.AppService;
+import com.java110.event.service.api.ServiceDataFlowEvent;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+
+/**
+ * 保存@@templateName@@侦听
+ * add by wuxw 2019-06-30
+ */
+@Java110Listener("update@@TemplateCode@@Listener")
+public class Update@@TemplateCode@@Listener extends AbstractServiceApiListener {
+    @Override
+    protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
+
+        @@validateTemplateColumns@@
+    }
+
+    @Override
+    protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
+
+        HttpHeaders header = new HttpHeaders();
+        context.getRequestCurrentHeaders().put(CommonConstant.HTTP_ORDER_TYPE_CD, "D");
+        JSONArray businesses = new JSONArray();
+
+        AppService service = event.getAppService();
+
+        //添加单元信息
+        businesses.add(update@@TemplateCode@@(reqJson, context));
+
+        JSONObject paramInObj = super.restToCenterProtocol(businesses, context.getRequestCurrentHeaders());
+
+        //将 rest header 信息传递到下层服务中去
+        super.freshHttpHeader(header, context.getRequestCurrentHeaders());
+
+        ResponseEntity<String> responseEntity = this.callService(context, service.getServiceCode(), paramInObj);
+
+        context.setResponseEntity(responseEntity);
+    }
+
+    @Override
+    public String getServiceCode() {
+        return ServiceCodeConstant.SERVICE_CODE_UPDATE_COMMUNITY;
+    }
+
+    @Override
+    public HttpMethod getHttpMethod() {
+        return HttpMethod.POST;
+    }
+
+    @Override
+    public int getOrder() {
+        return DEFAULT_ORDER;
+    }
+
+
+    /**
+     * 添加@@templateName@@信息
+     *
+     * @param paramInJson     接口调用放传入入参
+     * @param dataFlowContext 数据上下文
+     * @return 订单服务能够接受的报文
+     */
+    private JSONObject update@@TemplateCode@@(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+
+
+        JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+        business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_COMMUNITY_INFO);
+        business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ);
+        business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+        JSONObject business@@TemplateCode@@ = new JSONObject();
+        business@@TemplateCode@@.putAll(paramInJson);
+        //计算 应收金额
+        business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("business@@TemplateCode@@", business@@TemplateCode@@);
+        return business;
+    }
+
+}

+ 20 - 0
java110-code-generator/src/main/resources/web/edit/edit.html

@@ -0,0 +1,20 @@
+<div id = "edit@@TemplateCode@@Model" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-body">
+                <h3 class="m-t-none m-b ">修改@@templateName@@</h3>
+                <div class="ibox-content">
+                    <div>
+                        <div>
+                            @@editTemplateColumns@@
+                            <div class="ibox-content">
+                                <button class="btn btn-primary float-right" type="button" v-on:click="edit@@TemplateCode@@()" ><i class="fa fa-check"></i>&nbsp;保存</button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

+ 65 - 0
java110-code-generator/src/main/resources/web/edit/edit.js

@@ -0,0 +1,65 @@
+(function(vc,vm){
+
+    vc.extends({
+        data:{
+            edit@@TemplateCode@@Info:{
+                @@templateCodeColumns@@
+            }
+        },
+         _initMethod:function(){
+
+         },
+         _initEvent:function(){
+             vc.on('edit@@TemplateCode@@','open@@TemplateCode@@Model',function(_params){
+                vc.component.refreshEdit@@TemplateCode@@Info();
+                $('#edit@@TemplateCode@@Model').modal('show');
+                vc.component.edit@@TemplateCode@@Info = _params;
+                vc.component.edit@@TemplateCode@@Info.communityId = vc.getCurrentCommunity().communityId;
+            });
+        },
+        methods:{
+            edit@@TemplateCode@@Validate:function(){
+                        return vc.validate.validate({
+                            edit@@TemplateCode@@Info:vc.component.edit@@TemplateCode@@Info
+                        },{
+                            @@addTemplateCodeValidate@@
+                        });
+             },
+            edit@@TemplateCode@@:function(){
+                if(!vc.component.edit@@TemplateCode@@Validate()){
+                    vc.message(vc.validate.errInfo);
+                    return ;
+                }
+
+                vc.http.post(
+                    'edit@@TemplateCode@@',
+                    'update',
+                    JSON.stringify(vc.component.edit@@TemplateCode@@Info),
+                    {
+                        emulateJSON:true
+                     },
+                     function(json,res){
+                        //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                        if(res.status == 200){
+                            //关闭model
+                            $('#edit@@TemplateCode@@Model').modal('hide');
+                             vc.emit('@@templateCode@@Manage','list@@TemplateCode@@',{});
+                            return ;
+                        }
+                        vc.message(json);
+                     },
+                     function(errInfo,error){
+                        console.log('请求失败处理');
+
+                        vc.message(errInfo);
+                     });
+            },
+            refreshEdit@@TemplateCode@@Info:function(){
+                vc.component.edit@@TemplateCode@@Info= {
+                  @@templateCodeColumns@@
+                }
+            }
+        }
+    });
+
+})(window.vc,window.vc.component);

+ 33 - 0
java110-code-generator/src/main/resources/web/flow.html

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en"
+      xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:th="http://www.thymeleaf.org"
+      xmlns:vc="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8"/>
+    <title>@@templateName@@初始化|java110</title>
+    <vc:create name="commonTop"></vc:create>
+</head>
+<body>
+<vc:create name="bodyTop"></vc:create>
+<div id="wrapper">
+    <vc:create name="menu"></vc:create>
+
+
+    <div id="page-wrapper" class="gray-bg dashbard-1">
+        <div class="row border-bottom">
+            <vc:create name="nav"></vc:create>
+        </div>
+        <!-- id="component" -->
+        <div class="wrapper wrapper-content animated fadeInRight">
+            <vc:create name="@@templateCode@@Manage"></vc:create>
+        </div>
+
+        <vc:create name="copyright"></vc:create>
+
+    </div>
+</div>
+
+<vc:create name="commonBottom"></vc:create>
+</body>
+</html>

+ 4 - 2
java110-code-generator/src/main/resources/web/manage/ListListener.java

@@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import com.java110.common.constant.CommonConstant;
+import com.java110.common.constant.BusinessTypeConstant;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,14 +26,14 @@ import java.util.List;
  * 查询小区侦听类
  */
 @Java110Listener("list@@TemplateCode@@sListener")
-public class List@@TemplateCode@@Listener extends AbstractServiceApiListener {
+public class List@@TemplateCode@@sListener extends AbstractServiceApiListener {
 
     @Autowired
     private I@@TemplateCode@@InnerServiceSMO @@templateCode@@InnerServiceSMOImpl;
 
     @Override
     public String getServiceCode() {
-        return ServiceCodeConstant.SERVICE_CODE_LIST_@@@@TEMPLATECODE@@@@S;
+        return ServiceCodeConstant.SERVICE_CODE_LIST_@@TEMPLATECODE@@S;
     }
 
     @Override

+ 1 - 1
java110-code-generator/src/main/resources/web/manage/ManageComponent.java

@@ -30,7 +30,7 @@ public class @@TemplateCode@@ManageComponent {
         return list@@TemplateCode@@sSMOImpl.list@@TemplateCode@@s(pd);
     }
 
-    public I@@TemplateCode@@ManageSMO getList@@TemplateCode@@sSMOImpl() {
+    public IList@@TemplateCode@@sSMO getList@@TemplateCode@@sSMOImpl() {
         return list@@TemplateCode@@sSMOImpl;
     }
 

+ 2 - 2
java110-code-generator/src/main/resources/web/template_1.json

@@ -23,8 +23,8 @@
       "hasDefaultValue":false,
       "inputType":"input",
       "limit":"maxin",
-      "limitParam":"50",
-      "limitErrInfo":"小区地址不能大于50个字符"
+      "limitParam":"200",
+      "limitErrInfo":"小区地址不能大于200个字符"
     },
     {
       "code":"nearbyLandmarks",

+ 13 - 0
java110-common/src/main/java/com/java110/common/constant/ServiceCodeConstant.java

@@ -491,4 +491,17 @@ public class ServiceCodeConstant {
      */
     public static final String SERVICE_CODE_SAVE_COMMUNITY = "community.saveCommunity";
 
+
+    /**
+     * 修改小区
+     */
+    public static final String SERVICE_CODE_UPDATE_COMMUNITY = "community.updateCommunity";
+/**
+     * 删除小区
+     */
+    public static final String SERVICE_CODE_DELETE_COMMUNITY = "community.deleteCommunity";
+
+
+
+
 }