From 1adb62f9f3e71b17430edead1af2ce65f950b249 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 25 十一月 2022 16:04:08 +0800
Subject: [PATCH] 卡口管理

---
 ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java               |    4 +-
 ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java |    7 +++
 ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml             |   56 +++++++++++++++-------------
 ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java                 |   19 ++++++++-
 4 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
index 609bdab..b728a00 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/epuipment/EquipmentBayonetController.java
@@ -65,6 +65,13 @@
         return CommonResult.success(iEquipmentBayonetService.updateById(equipmentBayonet));
     }
 
+    @DeleteMapping("/delete/{id}")
+    @ApiOperation("淇敼")
+    @LogSave(operationType = "鍗″彛绠$悊", contain = "鍒犻櫎鍗″彛")
+    public CommonResult delete(@PathVariable Integer id) {
+        return CommonResult.success(iEquipmentBayonetService.removeById(id));
+    }
+
     @GetMapping("/export")
     @ApiOperation("瀵煎嚭")
     @SneakyThrows
diff --git a/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java b/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
index 2c16a23..bea07f8 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/equipment/EquipmentBayonet.java
@@ -35,9 +35,9 @@
     /**
      * 鍗″彛鍚嶇О
      */
-    @TableField("bayonet_name")
+    @TableField("name")
     @ExcelProperty(index = 1, value = "鍗″彛鍚嶇О")
-    private String bayonetName;
+    private String name;
 
     /**
      * 鍗″彛缁忓害
diff --git a/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java b/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
index 61df0d7..06fd27b 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/equipment/EquipmentBayonetVO.java
@@ -31,7 +31,7 @@
      */
     @ApiModelProperty(value = "鍗″彛鍚嶇О")
     @ExcelProperty(index = 0, value = "鍗″彛鍚嶇О")
-    private String bayonetName;
+    private String name;
 
     /**
      * 鍗″彛缁忓害
@@ -72,15 +72,28 @@
      * 鍓嶇绫诲瀷
      */
     @ApiModelProperty(value = "鍓嶇绫诲瀷")
+    @ExcelIgnore
+    private Integer frontEndType;
+
+    /**
+     * 鍑哄叆鍩庣被鍨�
+     */
+    @ApiModelProperty(value = "鍑哄叆鍩庣被鍨�")
+    @ExcelIgnore
+    private Integer inOutCityType;
+    /**
+     * 鍓嶇绫诲瀷
+     */
+    @ApiModelProperty(value = "鍓嶇绫诲瀷")
     @ExcelProperty(index = 5, value = "鍓嶇绫诲瀷")
-    private String frontEndType;
+    private String frontEndTypeName;
 
     /**
      * 鍑哄叆鍩庣被鍨�
      */
     @ApiModelProperty(value = "鍑哄叆鍩庣被鍨�")
     @ExcelProperty(index = 6, value = "鍑哄叆鍩庣被鍨�")
-    private String inOutCityType;
+    private String inOutCityTypeName;
 
     private String belongArea;
 }
\ No newline at end of file
diff --git a/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml b/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml
index 9848aff..3687103 100644
--- a/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/equipment/EquipmentBayonetMapper.xml
@@ -4,43 +4,47 @@
 
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.ycl.entity.equipment.EquipmentBayonet">
-        <id column="id" property="id" />
-        <result column="bayonet_name" property="bayonetName" />
-        <result column="longitude" property="longitude" />
-        <result column="latitude" property="latitude" />
-        <result column="ip_address" property="ipAddress" />
-        <result column="port" property="port" />
-        <result column="description" property="description" />
+        <id column="id" property="id"/>
+        <result column="name" property="name"/>
+        <result column="longitude" property="longitude"/>
+        <result column="latitude" property="latitude"/>
+        <result column="ip_address" property="ipAddress"/>
+        <result column="port" property="port"/>
+        <result column="description" property="description"/>
     </resultMap>
 
     <!-- 閫氱敤鏌ヨ缁撴灉鍒� -->
     <sql id="Base_Column_List">
-        id, bayonet_name, longitude, latitude, ip_address, port, description
+        id
+        , name, longitude, latitude, ip_address, port, description
     </sql>
 
     <select id="selectEquipmentPage" resultType="com.ycl.vo.equipment.EquipmentBayonetVO">
         SELECT
-            t1.id,
-            t1.bayonet_name,
-            t1.description,
-            t1.ip_address,
-            t1.latitude,
-            t1.longitude,
-            t1.`port`,
-            t2.`name` as frontEndType,
-            t3.`name` as inOutCityType,
-            t4.region_name as belongArea
+        t1.id,
+        t1.name,
+        t1.description,
+        t1.ip_address,
+        t1.latitude,
+        t1.longitude,
+        t1.`port`,
+        t1.belong_area belongArea,
+        t1.front_end_type frontEndType,
+        t1.in_out_city_type inOutCityType,
+        t2.`name` as frontEndTypeName,
+        t3.`name` as inOutCityTypeName,
+        t4.region_name as belongArea
         FROM
-            `ums_equipment_bayonet` t1
-                LEFT JOIN
-            ums_data_dictionary t2 on t1.front_end_type=t2.id
-                LEFT JOIN
-            ums_data_dictionary t3 on  t1.in_out_city_type=t3.id
-                LEFT JOIN
-            ums_sccg_region t4 on  t4.id=t1.belong_area
+        `ums_equipment_bayonet` t1
+        LEFT JOIN
+        ums_data_dictionary t2 on t1.front_end_type=t2.id
+        LEFT JOIN
+        ums_data_dictionary t3 on t1.in_out_city_type=t3.id
+        LEFT JOIN
+        ums_sccg_region t4 on t4.id=t1.belong_area
         <where>
             <if test="bayonetName !=null and bayonetName !='' ">
-                bayonet_name like CONCAT('%',#{bayonetName},'%')
+                name like CONCAT('%',#{bayonetName},'%')
             </if>
         </where>
     </select>

--
Gitblit v1.8.0