浏览代码

停车场修改

lchao 1 年之前
父节点
当前提交
0de5f6997f
共有 2 个文件被更改,包括 34 次插入22 次删除
  1. 19 19
      songhua-system/src/main/resources/mapper/system/ParkDataMapper.xml
  2. 15 3
      songhua-ui/src/views/index1/index.vue

+ 19 - 19
songhua-system/src/main/resources/mapper/system/ParkDataMapper.xml

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="parkId"    column="park_id"    />
         <result property="allSpaceNumber"    column="all_space_number"    />
-        <result property="useSpaceNumber"    column="use_space_umber"    />
+        <result property="useSpaceNumber"    column="use_space_number"    />
         <result property="remainSpaceNumber"    column="remain_space_number"    />
         <result property="inParkCount"    column="in_park_count"    />
         <result property="outParkCount"    column="out_park_count"    />
@@ -22,28 +22,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectParkData" parameterType="ParkData" resultMap="BasicCruiseShipResult">
-        SELECT
-            id,
-            park_id,
-            all_space_number,
-            use_space_umber,
-            remain_space_number,
-            in_park_count,
-            out_park_count,
-            total_out_money,
-            total_pre_money,
-            max( create_time ) create_time
-        FROM
-            parking_lot_statistics
-        GROUP BY
-            park_id
-        ORDER BY
-            create_time DESC;
+        SELECT pls.id,
+               pls.park_id,
+               pls.all_space_number,
+               pls.use_space_number,
+               pls.remain_space_number,
+               pls.in_park_count,
+               pls.out_park_count,
+               pls.total_out_money / 100 AS total_out_money,
+               pls.total_pre_money / 100 AS total_pre_money,
+               pls.create_time
+        FROM parking_lot_statistics pls
+                 JOIN (SELECT park_id,
+                              MAX(create_time) AS max_create_time
+                       FROM parking_lot_statistics
+                       GROUP BY park_id) max_create
+                      ON pls.park_id = max_create.park_id AND pls.create_time = max_create.max_create_time
+        ORDER BY pls.create_time DESC;
     </select>
 
     <insert id="save" >
         insert into parking_lot_statistics (
-        park_id,all_space_number,use_space_umber,remain_space_number,in_park_count,out_park_count,total_out_money,total_pre_money,create_time)
+        park_id,all_space_number,use_space_number,remain_space_number,in_park_count,out_park_count,total_out_money,total_pre_money,create_time)
         values(
                #{parkId},#{allSpaceNumber},#{useSpaceNumber},#{remainSpaceNumber},#{inParkCount},#{outParkCount},#{totalOutMoney},#{totalPreMoney},now()
               )

+ 15 - 3
songhua-ui/src/views/index1/index.vue

@@ -6,12 +6,16 @@
     </div>
     <div id="parkCar" class="shh_part">
       <div class="shh_part_div"  v-for="(item,index) in parkingLots" :key="index">
-        <img :src="getImgUrl(index + 1)"/>
+        <img :src="getImgUrl(item.parkId)"/>
         <div class="shh_txt">
           <h1>{{getParkingLotName(item.parkId)}}</h1>
           <p>总车位数:{{ item.allSpaceNumber }}</p >
           <p>当日营收:{{ item.totalOutMoney }}</p >
           <p>当月营收:{{ item.totalPreMoney }}</p >
+          <p>已用车位:{{ item.useSpaceNumber }}</p >
+          <p>剩余车位:{{ item.remainSpaceNumber }}</p >
+          <p>当前在场车辆:{{ item.inParkCount }}</p >
+          <p>当天出场车辆:{{ item.outParkCount }}</p >
         </div>
       </div>
     </div>
@@ -79,8 +83,16 @@ export default {
         this.parkingLots = response.data;
       })
     },
-    getImgUrl (index) {
-      return require("@/assets/images/shh_part" + index + ".png");
+    getImgUrl (parkId) {
+      switch (parkId) {
+        case "15305":
+          return require("@/assets/images/shh_part" + 1 + ".png");
+        case "15338":
+          return require("@/assets/images/shh_part" + 2 + ".png");
+        // 可以继续添加其他停车场的情况
+        // default:
+        //   return "未知停车场";
+      }
     },
     getParkingLotName(parkId) {
       // 在这里根据 parkId 返回停车场名称