加入 在场车辆

Api/src/main/java/com/java110/api/listener/carInout/ListCarInoutsListener.java

@@ -66,6 +66,12 @@ public class ListCarInoutsListener extends AbstractServiceApiListener {
 
         CarInoutDto carInoutDto = BeanConvertUtil.covertBean(reqJson, CarInoutDto.class);
 
+        if (reqJson.containsKey("state") && reqJson.getString("state").contains(",")) {
+            carInoutDto.setState("");
+            String[] states = reqJson.getString("state").split(",");
+            carInoutDto.setStates(states);
+        }
+
         int count = carInoutInnerServiceSMOImpl.queryCarInoutsCount(carInoutDto);
 
         List<ApiCarInoutDataVo> carInouts = null;

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

@@ -0,0 +1,40 @@
+package com.java110.web.components.carInout;
+
+
+import com.java110.core.context.IPageData;
+import com.java110.web.smo.carInout.IListCarInoutsSMO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 车辆进场组件管理类
+ *
+ * add by wuxw
+ *
+ * 2019-06-29
+ */
+@Component("carInManage")
+public class CarInManageComponent {
+
+    @Autowired
+    private IListCarInoutsSMO listCarInoutsSMOImpl;
+
+    /**
+     * 查询车辆进场列表
+     * @param pd 页面数据封装
+     * @return 返回 ResponseEntity 对象
+     */
+    public ResponseEntity<String> list(IPageData pd){
+        return listCarInoutsSMOImpl.listCarInouts(pd);
+    }
+
+    public IListCarInoutsSMO getListCarInoutsSMOImpl() {
+        return listCarInoutsSMOImpl;
+    }
+
+    public void setListCarInoutsSMOImpl(IListCarInoutsSMO listCarInoutsSMOImpl) {
+        this.listCarInoutsSMOImpl = listCarInoutsSMOImpl;
+    }
+}

WebService/src/main/resources/components/carInoutPackage/carIn-manage/carInManage.html

@@ -0,0 +1,100 @@
+<div id="component" class="wrapper wrapper-content animated fadeInRight ecommerce">
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox ">
+                <div class="ibox-title">
+                    <h5>查询条件</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                        <button type="button" class="btn btn-link btn-sm" style="margin-right:10px;"
+                                v-on:click="_moreCondition()">{{carInManageInfo.moreCondition == true?'隐藏':'更多'}}
+                        </button>
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入车牌号" v-model="carInManageInfo.conditions.carNum"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入进出场ID"
+                                       v-model="carInManageInfo.conditions.inoutId" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-3" v-if="carInManageInfo.moreCondition == true">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入进场开始时间"
+                                       v-model="carInManageInfo.conditions.startTime" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
+                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryCarInoutMethod()">
+                                <i class="glyphicon glyphicon-search"></i> 查询
+                            </button>
+                        </div>
+                    </div>
+                    <div class="row">
+
+                        <div class="col-sm-4" v-if="carInManageInfo.moreCondition == true">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入进场结束时间"
+                                       v-model="carInManageInfo.conditions.endTime" class=" form-control">
+                            </div>
+                        </div>
+                    </div>
+
+
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-lg-12">
+            <div class="ibox">
+                <div class="ibox-title">
+                    <h5>进场记录</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <table class="footable table table-stripped toggle-arrow-tiny"
+                           data-page-size="15"
+                    >
+                        <thead>
+                        <tr>
+                            <th class="text-center">进出场ID</th>
+                            <th class="text-center">车辆状态</th>
+                            <th class="text-center">车牌号</th>
+                            <th class="text-center">进场时间</th>
+                            <th class="text-center">在场时间</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr v-for="carIn in carInManageInfo.carIns">
+                            <td class="text-center">{{carIn.inoutId}}</td>
+                            <td class="text-center">{{carIn.state}}</td>
+                            <td class="text-center">{{carIn.carNum}}</td>
+                            <td class="text-center">{{carIn.inTime}}</td>
+                            <td class="text-center">{{carIn.continueHours}}</td>
+                        </tr>
+                        </tbody>
+                        <tfoot>
+                        <tr>
+                            <td colspan="7">
+                                <ul class="pagination float-right"></ul>
+                            </td>
+                        </tr>
+                        </tfoot>
+                    </table>
+                    <!-- 分页 -->
+                    <vc:create name="pagination"></vc:create>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+</div>

WebService/src/main/resources/components/carInoutPackage/carIn-manage/carInManage.js

@@ -0,0 +1,89 @@
+/**
+    入驻小区
+**/
+(function(vc) {
+    var DEFAULT_PAGE = 1;
+    var DEFAULT_ROWS = 10;
+    vc.extends({
+        data: {
+            carInManageInfo: {
+                carIns: [],
+                total: 0,
+                records: 1,
+                moreCondition: false,
+                carNum: '',
+                conditions: {
+                    state: '100300,100400,100600',
+                    carNum: '',
+                    inoutId: '',
+                    startTime: '',
+                    endTime: '',
+
+                }
+            }
+        },
+        _initMethod: function() {
+            vc.component._listCarInouts(DEFAULT_PAGE, DEFAULT_ROWS);
+        },
+        _initEvent: function() {
+
+            vc.on('carInoutManage', 'listCarInout',
+            function(_param) {
+                vc.component._listCarIns(DEFAULT_PAGE, DEFAULT_ROWS);
+            });
+            vc.on('pagination', 'page_event',
+            function(_currentPage) {
+                vc.component._listCarIns(_currentPage, DEFAULT_ROWS);
+            });
+        },
+        methods: {
+            _listCarIns: function(_page, _rows) {
+
+                vc.component.carInManageInfo.conditions.page = _page;
+                vc.component.carInManageInfo.conditions.row = _rows;
+                vc.component.carInManageInfo.conditions.communityId = vc.getCurrentCommunity().communityId;
+                var param = {
+                    params: vc.component.carInManageInfo.conditions
+                };
+
+                //发送get请求
+                vc.http.get('carInManage', 'list', param,
+                function(json, res) {
+                    var _carInManageInfo = JSON.parse(json);
+                    vc.component.carInManageInfo.total = _carInManageInfo.total;
+                    vc.component.carInManageInfo.records = _carInManageInfo.records;
+                    var _tmpCarIns = [];
+                    for(var carInIndex = 0 ; carInIndex < _carInManageInfo.carInouts.length;carInIndex ++){
+                        var _tmpCarIn = _carInManageInfo.carInouts[carInIndex];
+                        var _tmpInTime = new Date(_tmpCarIn.inTime);
+                        var _tmpNow = new Date();
+                        var total = (_tmpNow - _tmpInTime)/1000;
+                        var hours = parseFloat(total / (60*60));//计算整数天数
+                        _tmpCarIn.continueHours = hours;
+                        _tmpCarIns.push(_tmpCarIn);
+                    }
+                    vc.component.carInManageInfo.carIns = _tmpCarIns;
+                    vc.emit('pagination', 'init', {
+                        total: vc.component.carInManageInfo.records,
+                        currentPage: _page
+                    });
+                },
+                function(errInfo, error) {
+                    console.log('请求失败处理');
+                });
+            },
+            _queryCarInoutMethod: function() {
+                vc.component._listCarInouts(DEFAULT_PAGE, DEFAULT_ROWS);
+
+            },
+            _moreCondition: function() {
+                if (vc.component.carInManageInfo.moreCondition) {
+                    vc.component.carInManageInfo.moreCondition = false;
+                } else {
+                    vc.component.carInManageInfo.moreCondition = true;
+                }
+            }
+
+        }
+    });
+})(window.vc);

WebService/src/main/resources/views/carInFlow.html

@@ -0,0 +1,36 @@
+<!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>在场车辆|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>
+        <div class="wrapper wrapper-content" style="padding-bottom: 0px;">
+            <vc:create name="breadcrumb"></vc:create>
+        </div>
+        <!-- id="component" -->
+        <div class="wrapper wrapper-content animated fadeInRight">
+            <vc:create name="carInManage"></vc:create>
+        </div>
+
+        <vc:create name="copyright"></vc:create>
+
+    </div>
+</div>
+
+<vc:create name="commonBottom"></vc:create>
+</body>
+</html>

java110-bean/src/main/java/com/java110/dto/hardwareAdapation/CarInoutDto.java

@@ -19,6 +19,7 @@ public class CarInoutDto extends PageDto implements Serializable {
     private String inoutId;
     private String carNum;
     private String state;
+    private String[] states;
     private String communityId;
     private String outTime;
 
@@ -92,4 +93,12 @@ public class CarInoutDto extends PageDto implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String[] getStates() {
+        return states;
+    }
+
+    public void setStates(String[] states) {
+        this.states = states;
+    }
 }

java110-db/src/main/resources/mapper/hardwareAdapation/CarInoutServiceDaoImplMapper.xml

@@ -5,182 +5,193 @@
 <mapper namespace="carInoutServiceDaoImpl">
 
     <!-- 保存进出场信息 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessCarInoutInfo" parameterType="Map">
-           insert into business_car_inout(
-in_time,inout_id,operate,car_num,state,community_id,b_id,out_time
-) values (
-#{inTime},#{inoutId},#{operate},#{carNum},#{state},#{communityId},#{bId},#{outTime}
-)
-       </insert>
-
-
-       <!-- 查询进出场信息（Business） add by wuxw 2018-07-03 -->
-       <select id="getBusinessCarInoutInfo" parameterType="Map" resultType="Map">
-           select  t.in_time,t.in_time inTime,t.inout_id,t.inout_id inoutId,t.operate,t.car_num,t.car_num carNum,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.out_time,t.out_time outTime 
-from business_car_inout t 
-where 1 =1 
-<if test="inTime !=null and inTime != ''">
-   and t.in_time= #{inTime}
-</if> 
-<if test="inoutId !=null and inoutId != ''">
-   and t.inout_id= #{inoutId}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="carNum !=null and carNum != ''">
-   and t.car_num= #{carNum}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="outTime !=null and outTime != ''">
-   and t.out_time= #{outTime}
-</if> 
-
-       </select>
+    <insert id="saveBusinessCarInoutInfo" parameterType="Map">
+        insert into business_car_inout(
+        in_time,inout_id,operate,car_num,state,community_id,b_id,out_time
+        ) values (
+        #{inTime},#{inoutId},#{operate},#{carNum},#{state},#{communityId},#{bId},#{outTime}
+        )
+    </insert>
 
 
+    <!-- 查询进出场信息（Business） add by wuxw 2018-07-03 -->
+    <select id="getBusinessCarInoutInfo" parameterType="Map" resultType="Map">
+        select t.in_time,t.in_time inTime,t.inout_id,t.inout_id inoutId,t.operate,t.car_num,t.car_num
+        carNum,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.out_time,t.out_time outTime
+        from business_car_inout t
+        where 1 =1
+        <if test="inTime !=null ">
+            and t.in_time= #{inTime}
+        </if>
+        <if test="inoutId !=null and inoutId != ''">
+            and t.inout_id= #{inoutId}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="outTime !=null ">
+            and t.out_time= #{outTime}
+        </if>
 
+    </select>
 
 
     <!-- 保存进出场信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveCarInoutInfoInstance" parameterType="Map">
         insert into car_inout(
-in_time,inout_id,car_num,status_cd,state,community_id,b_id,out_time
-) select t.in_time,t.inout_id,t.car_num,'0',t.state,t.community_id,t.b_id,t.out_time from business_car_inout t where 1=1
-<if test="inTime !=null and inTime != ''">
-   and t.in_time= #{inTime}
-</if> 
-<if test="inoutId !=null and inoutId != ''">
-   and t.inout_id= #{inoutId}
-</if> 
-   and t.operate= 'ADD'
-<if test="carNum !=null and carNum != ''">
-   and t.car_num= #{carNum}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="outTime !=null and outTime != ''">
-   and t.out_time= #{outTime}
-</if> 
+        in_time,inout_id,car_num,status_cd,state,community_id,b_id,out_time
+        ) select t.in_time,t.inout_id,t.car_num,'0',t.state,t.community_id,t.b_id,t.out_time from business_car_inout t
+        where 1=1
+        <if test="inTime !=null ">
+            and t.in_time= #{inTime}
+        </if>
+        <if test="inoutId !=null and inoutId != ''">
+            and t.inout_id= #{inoutId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="outTime !=null ">
+            and t.out_time= #{outTime}
+        </if>
 
     </insert>
 
 
-
     <!-- 查询进出场信息 add by wuxw 2018-07-03 -->
     <select id="getCarInoutInfo" parameterType="Map" resultType="Map">
-        select  t.in_time,t.in_time inTime,t.inout_id,t.inout_id inoutId,t.car_num,t.car_num carNum,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.out_time,t.out_time outTime 
-from car_inout t 
-where 1 =1 
-<if test="inTime !=null and inTime != ''">
-   and t.in_time= #{inTime}
-</if> 
-<if test="inoutId !=null and inoutId != ''">
-   and t.inout_id= #{inoutId}
-</if> 
-<if test="carNum !=null and carNum != ''">
-   and t.car_num= #{carNum}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="outTime !=null and outTime != ''">
-   and t.out_time= #{outTime}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.in_time,t.in_time inTime,t.inout_id,t.inout_id inoutId,t.car_num,t.car_num
+        carNum,t.status_cd,t.status_cd statusCd,t.state,t.community_id,t.community_id communityId,t.b_id,t.b_id
+        bId,t.out_time,t.out_time outTime
+        from car_inout t
+        where 1 =1
+        <if test="inTime !=null ">
+            and t.in_time= #{inTime}
+        </if>
+        <if test="inoutId !=null and inoutId != ''">
+            and t.inout_id= #{inoutId}
+        </if>
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="states !=null">
+            and t.state in
+            <foreach collection="states" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="outTime !=null ">
+            and t.out_time= #{outTime}
+        </if>
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改进出场信息 add by wuxw 2018-07-03 -->
     <update id="updateCarInoutInfoInstance" parameterType="Map">
-        update  car_inout t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="inTime !=null and inTime != ''">
-, t.in_time= #{inTime}
-</if> 
-<if test="carNum !=null and carNum != ''">
-, t.car_num= #{carNum}
-</if> 
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="outTime !=null and outTime != ''">
-, t.out_time= #{outTime}
-</if> 
- where 1=1 <if test="inoutId !=null and inoutId != ''">
-and t.inout_id= #{inoutId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update car_inout t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="inTime !=null ">
+            , t.in_time= #{inTime}
+        </if>
+        <if test="carNum !=null and carNum != ''">
+            , t.car_num= #{carNum}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="outTime !=null ">
+            , t.out_time= #{outTime}
+        </if>
+        where 1=1
+        <if test="inoutId !=null and inoutId != ''">
+            and t.inout_id= #{inoutId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>
 
     <!-- 查询进出场数量 add by wuxw 2018-07-03 -->
-     <select id="queryCarInoutsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from car_inout t 
-where 1 =1 
-<if test="inTime !=null and inTime != ''">
-   and t.in_time= #{inTime}
-</if> 
-<if test="inoutId !=null and inoutId != ''">
-   and t.inout_id= #{inoutId}
-</if> 
-<if test="carNum !=null and carNum != ''">
-   and t.car_num= #{carNum}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="state !=null and state != ''">
-   and t.state= #{state}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="outTime !=null and outTime != ''">
-   and t.out_time= #{outTime}
-</if> 
-
-
-     </select>
+    <select id="queryCarInoutsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from car_inout t
+        where 1 =1
+        <if test="inTime !=null ">
+            and t.in_time= #{inTime}
+        </if>
+        <if test="inoutId !=null and inoutId != ''">
+            and t.inout_id= #{inoutId}
+        </if>
+        <if test="carNum !=null and carNum != ''">
+            and t.car_num= #{carNum}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="states !=null">
+            and t.state in
+            <foreach collection="states" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="outTime !=null ">
+            and t.out_time= #{outTime}
+        </if>
+
+
+    </select>
 
 </mapper>