Merge branch 'master' of https://github.com/java110/MicroCommunity

Api/src/main/java/com/java110/api/listener/visit/UpdateVisitListener.java

@@ -26,10 +26,10 @@ public class UpdateVisitListener extends AbstractServiceApiListener {
     protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
 
         Assert.hasKeyAndValue(reqJson, "vId", "访客记录ID不能为空");
-Assert.hasKeyAndValue(reqJson, "name", "必填，请填写访客姓名");
-Assert.hasKeyAndValue(reqJson, "visitGender", "必填，请填写访客姓名");
-Assert.hasKeyAndValue(reqJson, "phoneNumber", "必填，请填写访客联系方式");
-Assert.hasKeyAndValue(reqJson, "visitTime", "必填，请填写访客拜访时间");
+        Assert.hasKeyAndValue(reqJson, "name", "必填，请填写访客姓名");
+        Assert.hasKeyAndValue(reqJson, "visitGender", "必填，请填写访客姓名");
+        Assert.hasKeyAndValue(reqJson, "phoneNumber", "必填，请填写访客联系方式");
+        Assert.hasKeyAndValue(reqJson, "visitTime", "必填，请填写访客拜访时间");
 
     }
 

CommunityService/src/main/java/com/java110/community/dao/impl/VisitServiceDaoImpl.java

@@ -9,7 +9,6 @@ import com.java110.core.base.dao.BaseServiceDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;

CommunityService/src/main/java/com/java110/community/listener/visit/AbstractVisitBusinessServiceDataFlowListener.java

@@ -15,16 +15,16 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *
  * 访客信息 服务侦听 父类
  * Created by wuxw on 2018/7/4.
  */
-public abstract class AbstractVisitBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener{
+public abstract class AbstractVisitBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
     private static Logger logger = LoggerFactory.getLogger(AbstractVisitBusinessServiceDataFlowListener.class);
 
 
     /**
      * 获取 DAO工具类
+     *
      * @return
      */
     public abstract IVisitServiceDao getVisitServiceDaoImpl();
@@ -32,61 +32,62 @@ public abstract class AbstractVisitBusinessServiceDataFlowListener extends Abstr
     /**
      * 刷新 businessVisitInfo 数据
      * 主要将 数据库 中字段和 接口传递字段建立关系
+     *
      * @param businessVisitInfo
      */
-    protected void flushBusinessVisitInfo(Map businessVisitInfo,String statusCd){
+    protected void flushBusinessVisitInfo(Map businessVisitInfo, String statusCd) {
         businessVisitInfo.put("newBId", businessVisitInfo.get("b_id"));
-        businessVisitInfo.put("vId",businessVisitInfo.get("v_id"));
-businessVisitInfo.put("departureTime",businessVisitInfo.get("departure_time"));
-businessVisitInfo.put("visitTime",businessVisitInfo.get("visit_time"));
-businessVisitInfo.put("phoneNumber",businessVisitInfo.get("phoneNumber"));
-businessVisitInfo.put("operate",businessVisitInfo.get("operate"));
-businessVisitInfo.put("name",businessVisitInfo.get("name"));
-businessVisitInfo.put("visitCase",businessVisitInfo.get("visit_case"));
-businessVisitInfo.put("visitGender",businessVisitInfo.get("visit_gender"));
-businessVisitInfo.put("ownerId",businessVisitInfo.get("owner_id"));
-businessVisitInfo.put("userId",businessVisitInfo.get("userId"));
-businessVisitInfo.remove("bId");
+        businessVisitInfo.put("vId", businessVisitInfo.get("v_id"));
+        businessVisitInfo.put("departureTime", businessVisitInfo.get("departure_time"));
+        businessVisitInfo.put("visitTime", businessVisitInfo.get("visit_time"));
+        businessVisitInfo.put("phoneNumber", businessVisitInfo.get("phoneNumber"));
+        businessVisitInfo.put("operate", businessVisitInfo.get("operate"));
+        businessVisitInfo.put("name", businessVisitInfo.get("name"));
+        businessVisitInfo.put("visitCase", businessVisitInfo.get("visit_case"));
+        businessVisitInfo.put("communityId", businessVisitInfo.get("community_id"));
+        businessVisitInfo.put("visitGender", businessVisitInfo.get("visit_gender"));
+        businessVisitInfo.put("ownerId", businessVisitInfo.get("owner_id"));
+        businessVisitInfo.put("userId", businessVisitInfo.get("userId"));
+        businessVisitInfo.remove("bId");
         businessVisitInfo.put("statusCd", statusCd);
     }
 
 
     /**
      * 当修改数据时，查询instance表中的数据 自动保存删除数据到business中
+     *
      * @param businessVisit 访客信息信息
      */
-    protected void autoSaveDelBusinessVisit(Business business, JSONObject businessVisit){
+    protected void autoSaveDelBusinessVisit(Business business, JSONObject businessVisit) {
 //自动插入DEL
         Map info = new HashMap();
-        info.put("vId",businessVisit.getString("vId"));
-        info.put("statusCd",StatusConstant.STATUS_CD_VALID);
+        info.put("vId", businessVisit.getString("vId"));
+        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
         List<Map> currentVisitInfos = getVisitServiceDaoImpl().getVisitInfo(info);
-        if(currentVisitInfos == null || currentVisitInfos.size() != 1){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"未找到需要修改数据信息，入参错误或数据有问题，请检查"+info);
+        if (currentVisitInfos == null || currentVisitInfos.size() != 1) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "未找到需要修改数据信息，入参错误或数据有问题，请检查" + info);
         }
 
         Map currentVisitInfo = currentVisitInfos.get(0);
 
-        currentVisitInfo.put("bId",business.getbId());
+        currentVisitInfo.put("bId", business.getbId());
 
-        currentVisitInfo.put("vId",currentVisitInfo.get("v_id"));
-currentVisitInfo.put("departureTime",currentVisitInfo.get("departure_time"));
-currentVisitInfo.put("visitTime",currentVisitInfo.get("visit_time"));
-currentVisitInfo.put("phoneNumber",currentVisitInfo.get("phoneNumber"));
-currentVisitInfo.put("operate",currentVisitInfo.get("operate"));
-currentVisitInfo.put("name",currentVisitInfo.get("name"));
-currentVisitInfo.put("visitCase",currentVisitInfo.get("visit_case"));
-currentVisitInfo.put("visitGender",currentVisitInfo.get("visit_gender"));
-currentVisitInfo.put("ownerId",currentVisitInfo.get("owner_id"));
-currentVisitInfo.put("userId",currentVisitInfo.get("userId"));
+        currentVisitInfo.put("vId", currentVisitInfo.get("v_id"));
+        currentVisitInfo.put("departureTime", currentVisitInfo.get("departure_time"));
+        currentVisitInfo.put("visitTime", currentVisitInfo.get("visit_time"));
+        currentVisitInfo.put("phoneNumber", currentVisitInfo.get("phoneNumber"));
+        currentVisitInfo.put("operate", currentVisitInfo.get("operate"));
+        currentVisitInfo.put("name", currentVisitInfo.get("name"));
+        currentVisitInfo.put("visitCase", currentVisitInfo.get("visit_case"));
+        currentVisitInfo.put("communityId", currentVisitInfo.get("community_id"));
+        currentVisitInfo.put("visitGender", currentVisitInfo.get("visit_gender"));
+        currentVisitInfo.put("ownerId", currentVisitInfo.get("owner_id"));
+        currentVisitInfo.put("userId", currentVisitInfo.get("userId"));
 
 
-        currentVisitInfo.put("operate",StatusConstant.OPERATE_DEL);
+        currentVisitInfo.put("operate", StatusConstant.OPERATE_DEL);
         getVisitServiceDaoImpl().saveBusinessVisitInfo(currentVisitInfo);
     }
 
 
-
-
-
 }

CommunityService/src/main/java/com/java110/community/smo/impl/VisitInnerServiceSMOImpl.java

@@ -4,8 +4,8 @@ package com.java110.community.smo.impl;
 import com.java110.common.util.BeanConvertUtil;
 import com.java110.community.dao.IVisitServiceDao;
 import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.core.smo.visit.IVisitInnerServiceSMO;
 import com.java110.core.smo.user.IUserInnerServiceSMO;
+import com.java110.core.smo.visit.IVisitInnerServiceSMO;
 import com.java110.dto.PageDto;
 import com.java110.dto.UserDto;
 import com.java110.dto.visit.VisitDto;

WebService/src/main/java/com/java110/web/controller/FlowController.java

@@ -34,13 +34,15 @@ public class FlowController extends BaseController {
                        HttpServletRequest request) {
         logger.debug("请求流程 {},{}", flowCode, new Date());
         try {
+            System.out.println("开始寻找组件数据");
             IPageData pd = (IPageData) request.getAttribute(CommonConstant.CONTEXT_PAGE_DATA);
+            System.out.println("数据获取成功");
             validateFlowData(flowCode, pd);
 
         } catch (Throwable e) {
             flowCode = "error";
         }
-
+        System.out.println("传入的路径为  "+flowCode);
 
         return flowCode;
     }

WebService/src/main/resources/components/visitInfoPackage/add-visit-space/addVisitSpace.html

@@ -0,0 +1,48 @@
+<div id="component">
+
+    <div class="java110_step">
+        <div id="step"></div>
+    </div>
+
+    <!-- 选择 应用信息 -->
+    <div v-if="hireParkingSpaceInfo.index == 0">
+
+        <!-- 选择停车位 -->
+        <vc:create name="viewSelectParkingSpace"
+                   callBackComponent="addVisitSpace"
+                   callBackFunction="notify"
+        ></vc:create>
+    </div>
+    <div v-if="hireParkingSpaceInfo.index == 1">
+        <vc:create name="viewOwnerInfo"
+                   callBackListener="addVisitSpace"
+                   callBackFunction="notify"
+        ></vc:create>
+    </div>
+    <div v-if="hireParkingSpaceInfo.index == 2">
+        <vc:create name="addCar"
+                   callBackComponent="addVisitSpace"
+                   callBackFunction="notify"
+        >
+
+        </vc:create>
+    </div>
+
+
+
+    <div class="row">
+        <div class="col-md-10"></div>
+        <div class="col-md-2 " style="margin-bottom:10px; text-align:right">
+            <button type="button" class="btn btn-secondary" v-on:click="_prevStep()">上一步</button>
+            <button v-if="hireParkingSpaceInfo.index != 3" type="button" class="btn btn-primary"
+                    style="margin-left:10px;"
+                    v-on:click="_nextStep()">下一步
+            </button>
+            <button v-if="hireParkingSpaceInfo.index == 3" type="button" class="btn btn-primary"
+                    style="margin-left:10px;"
+                    v-on:click="_addVisitFinish()">出租
+            </button>
+        </div>
+    </div>
+
+</div>

WebService/src/main/resources/components/visitInfoPackage/add-visit-space/addVisitSpace.js

@@ -0,0 +1,102 @@
+/**
+    入驻小区
+**/
+(function(vc){
+    vc.extends({
+        data:{
+            newVisitInfo:{
+                $step:{},
+                index:0,
+                infos:[],
+            }
+        },
+        _initMethod:function(){
+            vc.component._initStep();
+        },
+
+        _initEvent:function(){
+
+           vc.on("addVisitSpace", "notify", function(_info){
+                vc.component.newVisitInfo.infos[vc.component.newVisitInfo.index] = _info;
+            });
+
+        },
+        methods:{
+            _initStep:function(){
+                vc.component.newVisitInfo.$step = $("#step");
+                vc.component.newVisitInfo.$step.step({
+                    index: 0,
+                    time: 500,
+                    title: ["新增访客","选择目标业主","填写拜访事由"]
+                });
+                vc.component.newVisitInfo.index = vc.component.newVisitInfo.$step.getIndex();
+            },
+            _prevStep:function(){
+                vc.component.newVisitInfo.$step.prevStep();
+                vc.component.newVisitInfo.index = vc.component.newVisitInfo.$step.getIndex();
+
+                vc.emit('viewSelectParkingSpace', 'onIndex', vc.component.newVisitInfo.index);
+                vc.emit('viewOwnerInfo', 'onIndex', vc.component.newVisitInfo.index);
+                vc.emit('addCar', 'onIndex', vc.component.newVisitInfo.index);
+
+                if(vc.component.newVisitInfo.index == 1){
+                    vc.emit('viewOwnerInfo','callBackOwnerInfo',{});
+                }
+
+            },
+            _nextStep:function(){
+                var _currentData = vc.component.newVisitInfo.infos[vc.component.newVisitInfo.index];
+                if( _currentData == null || _currentData == undefined){
+                    vc.message("请选择或填写必选信息");
+                    return ;
+                }
+                vc.component.newVisitInfo.$step.nextStep();
+                vc.component.newVisitInfo.index = vc.component.newVisitInfo.$step.getIndex();
+
+                vc.emit('viewSelectParkingSpace', 'onIndex', vc.component.newVisitInfo.index);
+                vc.emit('viewOwnerInfo', 'onIndex', vc.component.newVisitInfo.index);
+                vc.emit('addCar', 'onIndex', vc.component.newVisitInfo.index);
+                if(vc.component.newVisitInfo.index == 1){
+                    vc.emit('viewOwnerInfo','callBackOwnerInfo',{});
+                }
+
+            },
+            _addVisitFinish:function(){
+
+
+                var _currentData = vc.component.newVisitInfo.infos[vc.component.newVisitInfo.index];
+                if( _currentData == null || _currentData == undefined){
+                    vc.message("请选择或填写必选信息");
+                    return ;
+                }
+
+                var param = {
+                    communityId:vc.getCurrentCommunity().communityId,
+                    data:vc.component.newVisitInfo.infos
+                }
+
+               vc.http.post(
+                   'hireParkingSpace',
+                   'sell',
+                   JSON.stringify(param),
+                   {
+                       emulateJSON:true
+                    },
+                    function(json,res){
+                       //vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
+                       if(res.status == 200){
+                           //关闭model
+                           vc.jumpToPage("/flow/ownerFlow?" + vc.objToGetParam(JSON.parse(json)));
+                           return ;
+                       }
+                       vc.message(json);
+                    },
+                    function(errInfo,error){
+                       console.log('请求失败处理');
+
+                       vc.message(errInfo);
+                    });
+            }
+        }
+    });
+})(window.vc);

WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.html

@@ -3,9 +3,9 @@
         <div class="col-lg-12">
             <div class="ibox">
                 <div class="ibox-title">
-                    <h5>应用信息</h5>
+                    <h5>访客信息</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddAppModal()">
+                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddVisitModal()">
                             <i class="glyphicon glyphicon-plus"></i>
                             添加访客
                         </button>
@@ -38,9 +38,9 @@
                             <td>{{visit.visitTime}}</td>
                             <td>{{visit.departureTime}}</td>
                             <td>
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditVisitModel(visit)">修改</button>
-                                </div>
+<!--                                <div class="btn-group">-->
+<!--                                    <button class="btn-white btn btn-xs" v-on:click="_openEditVisitModel(visit)">修改</button>-->
+<!--                                </div>-->
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openDeleteAppModel(visit)">删除
                                     </button>

WebService/src/main/resources/components/visitInfoPackage/visit-manage/visitManage.js

@@ -1,68 +1,91 @@
 /**
-    入驻小区
-**/
-(function(vc){
+ 入驻小区
+ **/
+(function (vc) {
     var DEFAULT_PAGE = 1;
     var DEFAULT_ROWS = 10;
     vc.extends({
-        data:{
-            appManageInfo:{
-                apps:[],
-                total:0,
-                records:1
+        data: {
+            appManageInfo: {
+                apps: [],
+                total: 0,
+                records: 1
             }
         },
-        _initMethod:function(){
+        _initMethod: function () {
             vc.component._listApps(DEFAULT_PAGE, DEFAULT_ROWS);
         },
-        _initEvent:function(){
-            vc.on('appManage','listApp',function(_param){
-                  vc.component._listApps(DEFAULT_PAGE, DEFAULT_ROWS);
+        _initEvent: function () {
+            vc.on('appManage', 'listApp', function (_param) {
+                vc.component._listApps(DEFAULT_PAGE, DEFAULT_ROWS);
             });
-             vc.on('pagination','page_event',function(_currentPage){
-                vc.component._listApps(_currentPage,DEFAULT_ROWS);
+            vc.on('pagination', 'page_event', function (_currentPage) {
+                vc.component._listApps(_currentPage, DEFAULT_ROWS);
             });
         },
-        methods:{
-            _listApps:function(_page, _rows){
+        methods: {
+            _listApps: function (_page, _rows) {
                 var param = {
-                    params:{
-                        page:_page,
-                        row:_rows
+                        params: {
+                            page: _page,
+                            row: _rows
+                        }
+
                     }
 
-               }
-               //发送get请求
-               vc.http.get('visitManage',
-                            'list',
-                             param,
-                             function(json,res){
-                                var _visitManageInfo=JSON.parse(json);
-                                console.log(_visitManageInfo);
-                                vc.component.appManageInfo.total = _visitManageInfo.total;
-                                vc.component.appManageInfo.records = _visitManageInfo.records;
-                                vc.component.appManageInfo.visits = _visitManageInfo.visits;
-                                vc.emit('pagination','init',{
-                                     total:vc.component.appManageInfo.records,
-                                     currentPage:_page
-                                 });
-                             },function(errInfo,error){
-                                console.log('请求失败处理');
-                             }
-                           );
+                //发送get请求
+                vc.http.get('visitManage',
+                    'list',
+                    param,
+                    function (json, res) {
+                        var _visitManageInfo = JSON.parse(json);
+                        for (var k in _visitManageInfo.visits){
+                            _visitManageInfo.visits[k].visitTime=new Date(_visitManageInfo.visits[k].visitTime).format('yyyy-MM-dd');
+                            _visitManageInfo.visits[k].departureTime=new Date(_visitManageInfo.visits[k].departureTime).format('yyyy-MM-dd');
+                        }
+                        vc.component.appManageInfo.total = _visitManageInfo.total;
+                        vc.component.appManageInfo.records = _visitManageInfo.records;
+                        vc.component.appManageInfo.visits = _visitManageInfo.visits;
+                        vc.emit('pagination', 'init', {
+                            total: vc.component.appManageInfo.records,
+                            currentPage: _page
+                        });
+                    }, function (errInfo, error) {
+                        console.log('请求失败处理');
+                    }
+                );
             },
-            _openAddAppModal:function(){
-                vc.jumpToPage("/flow/visitAddFlow")
+            _openAddVisitModal: function () {
+                vc.jumpToPage("/flow/viewVisitInfo")
                 // vc.emit('addApp','openAddAppModal',{});
             },
-            _openEditVisitModel:function(_app){
-                vc.emit('editVisit','openEditVisitModel',_app);
+            _openEditVisitModel: function (_app) {
+                vc.emit('editVisit', 'openEditVisitModel', _app);
                 // vc.emit('deleteApp','openDeleteAppModal',_app);
 
             },
-            _openDeleteAppModel:function(_app){
-                vc.emit('deleteApp','openDeleteAppModal',_app);
+            _openDeleteAppModel: function (_app) {
+                vc.emit('deleteApp', 'openDeleteAppModal', _app);
             }
         }
     });
 })(window.vc);
+
+Date.prototype.format =function(format){
+    var o = {
+        "M+" : this.getMonth()+1, //month
+        "d+" : this.getDate(), //day
+        "h+" : this.getHours(), //hour
+        "m+" : this.getMinutes(), //minute
+        "s+" : this.getSeconds(), //second
+        "q+" : Math.floor((this.getMonth()+3)/3), //quarter
+        "S" : this.getMilliseconds() //millisecond
+    }
+    if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
+        (this.getFullYear()+"").substr(4- RegExp.$1.length));
+    for(var k in o)if(new RegExp("("+ k +")").test(format))
+        format = format.replace(RegExp.$1,
+            RegExp.$1.length==1? o[k] :
+                ("00"+ o[k]).substr((""+ o[k]).length));
+    return format;
+}

java110-bean/src/main/java/com/java110/dto/app/AppDto.java

@@ -16,12 +16,12 @@ import java.util.Date;
 public class AppDto extends PageDto implements Serializable {
 
     private String appId;
-private String blackListIp;
-private String name;
-private String securityCode;
-private String remark;
-private String userId;
-private String whileListIp;
+    private String blackListIp;
+    private String name;
+    private String securityCode;
+    private String remark;
+    private String userId;
+    private String whileListIp;
 
 
     private Date createTime;
@@ -32,43 +32,56 @@ private String whileListIp;
     public String getAppId() {
         return appId;
     }
-public void setAppId(String appId) {
+
+    public void setAppId(String appId) {
         this.appId = appId;
     }
-public String getBlackListIp() {
+
+    public String getBlackListIp() {
         return blackListIp;
     }
-public void setBlackListIp(String blackListIp) {
+
+    public void setBlackListIp(String blackListIp) {
         this.blackListIp = blackListIp;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getSecurityCode() {
+
+    public String getSecurityCode() {
         return securityCode;
     }
-public void setSecurityCode(String securityCode) {
+
+    public void setSecurityCode(String securityCode) {
         this.securityCode = securityCode;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getWhileListIp() {
+
+    public String getWhileListIp() {
         return whileListIp;
     }
-public void setWhileListIp(String whileListIp) {
+
+    public void setWhileListIp(String whileListIp) {
         this.whileListIp = whileListIp;
     }
 

java110-bean/src/main/java/com/java110/dto/visit/VisitDto.java

@@ -16,44 +16,40 @@ import java.util.Date;
 public class VisitDto extends PageDto implements Serializable {
 
     private String vId;
-    private String departureTime;
-    private String visitTime;
-    private String phoneNumber;
     private String name;
-    private String visitCase;
     private String visitGender;
-    private String visitGenderName;
-    private String ownerId;
+    private String phoneNumber;
     private String userId;
-
-
+    private String communityId;
+    private String ownerId;
+    private String visitCase;
+    private Date visitTime;
+    private Date departureTime;
     private Date createTime;
-
     private String statusCd = "0";
 
-
-    public String getVId() {
+    public String getvId() {
         return vId;
     }
 
-    public void setVId(String vId) {
+    public void setvId(String vId) {
         this.vId = vId;
     }
 
-    public String getDepartureTime() {
-        return departureTime;
+    public String getName() {
+        return name;
     }
 
-    public void setDepartureTime(String departureTime) {
-        this.departureTime = departureTime;
+    public void setName(String name) {
+        this.name = name;
     }
 
-    public String getVisitTime() {
-        return visitTime;
+    public String getVisitGender() {
+        return visitGender;
     }
 
-    public void setVisitTime(String visitTime) {
-        this.visitTime = visitTime;
+    public void setVisitGender(String visitGender) {
+        this.visitGender = visitGender;
     }
 
     public String getPhoneNumber() {
@@ -64,28 +60,20 @@ public class VisitDto extends PageDto implements Serializable {
         this.phoneNumber = phoneNumber;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getVisitCase() {
-        return visitCase;
+    public String getUserId() {
+        return userId;
     }
 
-    public void setVisitCase(String visitCase) {
-        this.visitCase = visitCase;
+    public void setUserId(String userId) {
+        this.userId = userId;
     }
 
-    public String getVisitGender() {
-        return visitGender;
+    public String getCommunityId() {
+        return communityId;
     }
 
-    public void setVisitGender(String visitGender) {
-        this.visitGender = visitGender;
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
     }
 
     public String getOwnerId() {
@@ -96,14 +84,29 @@ public class VisitDto extends PageDto implements Serializable {
         this.ownerId = ownerId;
     }
 
-    public String getUserId() {
-        return userId;
+    public String getVisitCase() {
+        return visitCase;
     }
 
-    public void setUserId(String userId) {
-        this.userId = userId;
+    public void setVisitCase(String visitCase) {
+        this.visitCase = visitCase;
     }
 
+    public Date getVisitTime() {
+        return visitTime;
+    }
+
+    public void setVisitTime(Date visitTime) {
+        this.visitTime = visitTime;
+    }
+
+    public Date getDepartureTime() {
+        return departureTime;
+    }
+
+    public void setDepartureTime(Date departureTime) {
+        this.departureTime = departureTime;
+    }
 
     public Date getCreateTime() {
         return createTime;
@@ -120,20 +123,4 @@ public class VisitDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-
-    public String getvId() {
-        return vId;
-    }
-
-    public void setvId(String vId) {
-        this.vId = vId;
-    }
-
-    public String getVisitGenderName() {
-        return visitGenderName;
-    }
-
-    public void setVisitGenderName(String visitGenderName) {
-        this.visitGenderName = visitGenderName;
-    }
 }

java110-bean/src/main/java/com/java110/vo/api/app/ApiAppDataVo.java

@@ -6,48 +6,59 @@ import java.util.Date;
 public class ApiAppDataVo implements Serializable {
 
     private String appId;
-private String name;
-private String securityCode;
-private String whileListIp;
-private String blackListIp;
-private String remark;
-public String getAppId() {
+    private String name;
+    private String securityCode;
+    private String whileListIp;
+    private String blackListIp;
+    private String remark;
+
+    public String getAppId() {
         return appId;
     }
-public void setAppId(String appId) {
+
+    public void setAppId(String appId) {
         this.appId = appId;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getSecurityCode() {
+
+    public String getSecurityCode() {
         return securityCode;
     }
-public void setSecurityCode(String securityCode) {
+
+    public void setSecurityCode(String securityCode) {
         this.securityCode = securityCode;
     }
-public String getWhileListIp() {
+
+    public String getWhileListIp() {
         return whileListIp;
     }
-public void setWhileListIp(String whileListIp) {
+
+    public void setWhileListIp(String whileListIp) {
         this.whileListIp = whileListIp;
     }
-public String getBlackListIp() {
+
+    public String getBlackListIp() {
         return blackListIp;
     }
-public void setBlackListIp(String blackListIp) {
+
+    public void setBlackListIp(String blackListIp) {
         this.blackListIp = blackListIp;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
 
 
-
 }

java110-bean/src/main/java/com/java110/vo/api/visit/ApiVisitDataVo.java

@@ -10,15 +10,15 @@ public class ApiVisitDataVo implements Serializable {
     private String visitGender;
     private String visitGenderName;
     private String phoneNumber;
-    private String visitTime;
-    private String departureTime;
+    private Date visitTime;
+    private Date departureTime;
     private String visitCase;
 
-    public String getVId() {
+    public String getvId() {
         return vId;
     }
 
-    public void setVId(String vId) {
+    public void setvId(String vId) {
         this.vId = vId;
     }
 
@@ -38,6 +38,14 @@ public class ApiVisitDataVo implements Serializable {
         this.visitGender = visitGender;
     }
 
+    public String getVisitGenderName() {
+        return visitGenderName;
+    }
+
+    public void setVisitGenderName(String visitGenderName) {
+        this.visitGenderName = visitGenderName;
+    }
+
     public String getPhoneNumber() {
         return phoneNumber;
     }
@@ -46,19 +54,19 @@ public class ApiVisitDataVo implements Serializable {
         this.phoneNumber = phoneNumber;
     }
 
-    public String getVisitTime() {
+    public Date getVisitTime() {
         return visitTime;
     }
 
-    public void setVisitTime(String visitTime) {
+    public void setVisitTime(Date visitTime) {
         this.visitTime = visitTime;
     }
 
-    public String getDepartureTime() {
+    public Date getDepartureTime() {
         return departureTime;
     }
 
-    public void setDepartureTime(String departureTime) {
+    public void setDepartureTime(Date departureTime) {
         this.departureTime = departureTime;
     }
 
@@ -69,20 +77,4 @@ public class ApiVisitDataVo implements Serializable {
     public void setVisitCase(String visitCase) {
         this.visitCase = visitCase;
     }
-
-    public String getvId() {
-        return vId;
-    }
-
-    public void setvId(String vId) {
-        this.vId = vId;
-    }
-
-    public String getVisitGenderName() {
-        return visitGenderName;
-    }
-
-    public void setVisitGenderName(String visitGenderName) {
-        this.visitGenderName = visitGenderName;
-    }
 }

java110-code-generator/src/main/java/com/java110/VisitGeneratorApplication.java

@@ -36,13 +36,14 @@ public class VisitGeneratorApplication {
         data.setUpdateBusinessTypeCdValue("110100040001");
         data.setDeleteBusinessTypeCdValue("110100050001");
         data.setBusinessTableName("business_visit_info");
-        data.setTableName("visit_info");
+        data.setTableName("s_visit_info");
         Map<String, String> param = new HashMap<String, String>();
         param.put("vId", "v_id");       //map的key为你自定义的字段名就是驼峰命名法的那个，value为数据库表的字段名
         param.put("name", "name");
+        param.put("communityId", "community_id");
         param.put("visitGender", "visit_gender");
-        param.put("phoneNumber", "phoneNumber");
-        param.put("userId", "userId");
+        param.put("phoneNumber", "phone_number");
+        param.put("userId", "user_id");
         param.put("ownerId", "owner_id");
         param.put("visitCase", "visit_case");
         param.put("visitTime", "visit_time");

java110-code-generator/src/main/resources/web/template_visit.json

@@ -32,7 +32,7 @@
       "desc":"必填，请填写访客姓名",
       "required":true,
       "hasDefaultValue":false,
-      "inputType":"input",
+      "inputType":"select",
       "limit":"maxin",
       "limitParam":"2,10",
       "limitErrInfo":"访客姓名必须在2至10字符之间",

java110-core/src/main/java/com/java110/core/smo/visit/IVisitInnerServiceSMO.java

@@ -1,6 +1,7 @@
 package com.java110.core.smo.visit;
 
 import com.java110.core.feign.FeignConfiguration;
+
 import com.java110.dto.visit.VisitDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;

java110-db/src/main/resources/mapper/visit/VisitServiceDaoImplMapper.xml

@@ -6,19 +6,20 @@
 
     <!-- 保存访客信息信息 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessVisitInfo" parameterType="Map">
-        insert into business_visit_info(
-        v_id,departure_time,visit_time,phone_number,operate,name,visit_case,visit_gender,owner_id,user_id,b_id
-        ) values (
-        #{vId},#{departureTime},#{visitTime},#{phoneNumber},#{operate},#{name},#{visitCase},#{visitGender},#{ownerId},#{userId},#{bId}
-        )
-    </insert>
+           insert into business_visit_info(
+v_id,departure_time,visit_time,phone_number,operate,name,visit_case,community_id,visit_gender,owner_id,user_id
+) values (
+#{vId},#{departureTime},#{visitTime},#{phoneNumber},#{operate},#{name},#{visitCase},#{communityId},#{visitGender},#{ownerId},#{userId}
+)
+       </insert>
 
 
     <!-- 查询访客信息信息（Business） add by wuxw 2018-07-03 -->
     <select id="getBusinessVisitInfo" parameterType="Map" resultType="Map">
         select t.v_id,t.v_id vId,t.departure_time,t.departure_time departureTime,t.visit_time,t.visit_time
-        visitTime,t.phone_number phoneNumber,t.operate,t.name,t.visit_case,t.visit_case visitCase,t.visit_gender,t.visit_gender
-        visitGender,t.owner_id,t.owner_id ownerId,t.user_id userId,t.b_id,t.b_id bId
+        visitTime,t.phone_number,t.phone_number phoneNumber,t.operate,t.name,t.visit_case,t.visit_case
+        visitCase,t.community_id,t.community_id communityId,t.visit_gender,t.visit_gender
+        visitGender,t.owner_id,t.owner_id ownerId,t.user_id,t.user_id userId
         from business_visit_info t
         where 1 =1
         <if test="vId !=null and vId != ''">
@@ -42,6 +43,9 @@
         <if test="visitCase !=null and visitCase != ''">
             and t.visit_case= #{visitCase}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
         <if test="visitGender !=null and visitGender != ''">
             and t.visit_gender= #{visitGender}
         </if>
@@ -51,19 +55,16 @@
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
         </if>
-        <if test="bId !=null and bId != ''">
-            and t.b_id= #{bId}
-        </if>
 
     </select>
 
 
     <!-- 保存访客信息信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveVisitInfoInstance" parameterType="Map">
-        insert into visit_info(
-        v_id,departure_time,visit_time,phone_number,name,visit_case,status_cd,visit_gender,owner_id,user_id,b_id
+        insert into s_visit_info(
+        v_id,departure_time,visit_time,phone_number,name,visit_case,status_cd,community_id,visit_gender,owner_id,user_id
         ) select
-        t.v_id,t.departure_time,t.visit_time,t.phone_number,t.name,t.visit_case,'0',t.visit_gender,t.owner_id,t.user_id,t.b_id
+        t.v_id,t.departure_time,t.visit_time,t.phone_number,t.name,t.visit_case,'0',t.community_id,t.visit_gender,t.owner_id,t.user_id
         from business_visit_info t where 1=1
         <if test="vId !=null and vId != ''">
             and t.v_id= #{vId}
@@ -84,6 +85,9 @@
         <if test="visitCase !=null and visitCase != ''">
             and t.visit_case= #{visitCase}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
         <if test="visitGender !=null and visitGender != ''">
             and t.visit_gender= #{visitGender}
         </if>
@@ -93,9 +97,6 @@
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
         </if>
-        <if test="bId !=null and bId != ''">
-            and t.b_id= #{bId}
-        </if>
 
     </insert>
 
@@ -103,19 +104,10 @@
     <!-- 查询访客信息信息 add by wuxw 2018-07-03 -->
     <select id="getVisitInfo" parameterType="Map" resultType="Map">
         select t.v_id,t.v_id vId,t.departure_time,t.departure_time departureTime,t.visit_time,t.visit_time
-        visitTime,t.phone_number phoneNumber,t.name,t.visit_case,t.visit_case visitCase,t.status_cd,t.status_cd
-        statusCd,t.visit_gender,t.visit_gender visitGender,
-        (CASE
-        WHEN t.`visit_gender` = '1'
-        THEN '男'
-        WHEN t.visit_gender = '0'
-        THEN '女'
-        ELSE
-        '未知'
-        END) visitGenderName ,
-        t.owner_id,t.owner_id ownerId,t.user_id userId,t.b_id,
-        t.b_id bId
-        from visit_info t
+        visitTime,t.phone_number,t.phone_number phoneNumber,t.name,t.visit_case,t.visit_case
+        visitCase,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id
+        communityId,t.visit_gender,t.visit_gender visitGender,t.owner_id,t.owner_id ownerId,t.user_id,t.user_id userId
+        from s_visit_info t
         where 1 =1
         <if test="vId !=null and vId != ''">
             and t.v_id= #{vId}
@@ -138,6 +130,9 @@
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
         <if test="visitGender !=null and visitGender != ''">
             and t.visit_gender= #{visitGender}
         </if>
@@ -147,11 +142,8 @@
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
         </if>
-        <if test="bId !=null and bId != ''">
-            and t.b_id= #{bId}
-        </if>
         <if test="page != -1 and page != null ">
-            limit #{page}, #{row}
+            limit #{page},#{row}
         </if>
 
     </select>
@@ -159,7 +151,7 @@
 
     <!-- 修改访客信息信息 add by wuxw 2018-07-03 -->
     <update id="updateVisitInfoInstance" parameterType="Map">
-        update visit_info t set t.status_cd = #{statusCd}
+        update s_visit_info t set t.status_cd = #{statusCd}
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
@@ -178,6 +170,9 @@
         <if test="visitCase !=null and visitCase != ''">
             , t.visit_case= #{visitCase}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
         <if test="visitGender !=null and visitGender != ''">
             , t.visit_gender= #{visitGender}
         </if>
@@ -191,16 +186,13 @@
         <if test="vId !=null and vId != ''">
             and t.v_id= #{vId}
         </if>
-        <if test="bId !=null and bId != ''">
-            and t.b_id= #{bId}
-        </if>
 
     </update>
 
     <!-- 查询访客信息数量 add by wuxw 2018-07-03 -->
     <select id="queryVisitsCount" parameterType="Map" resultType="Map">
         select count(1) count
-        from visit_info t
+        from s_visit_info t
         where 1 =1
         <if test="vId !=null and vId != ''">
             and t.v_id= #{vId}
@@ -223,6 +215,9 @@
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
         <if test="visitGender !=null and visitGender != ''">
             and t.visit_gender= #{visitGender}
         </if>