From 0df845132de353af1e93225a9e873c587c8ab8cd Mon Sep 17 00:00:00 2001
From: chenlinghy <chenlinghy@cmhi.chinamobile.com>
Date: Thu, 31 Aug 2023 19:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=8E=82?=
 =?UTF-8?q?=E5=95=86=E6=9F=A5=E8=AF=A2=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zjyr/beidouservice/pojo/dataobject/DeviceDO.java   | 4 ++--
 .../zjyr/beidouservice/pojo/dto/DeviceByLocationDTO.java   | 2 ++
 .../java/com/zjyr/beidouservice/pojo/dto/DeviceReqDTO.java | 6 ++++++
 .../com/zjyr/beidouservice/pojo/dto/DeviceRespDTO.java     | 7 +++++++
 .../zjyr/beidouservice/service/impl/DeviceServiceImpl.java | 3 ++-
 src/main/resources/mappers/DeviceMapper.xml                | 5 ++++-
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DeviceDO.java b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DeviceDO.java
index 2972da2..82d18c3 100644
--- a/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DeviceDO.java
+++ b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/DeviceDO.java
@@ -92,9 +92,9 @@ public class DeviceDO {
      */
     private Integer type;
     /**
-     * 警报器厂商
+     * 警报器厂商 1:圆融科技 2:欧丽 3:厚华
      */
-    private String manufacturer;
+    private Integer manufacturer;
     /**
      * 警报器功率
      */
diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceByLocationDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceByLocationDTO.java
index 7d7e0bb..85b0b46 100644
--- a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceByLocationDTO.java
+++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceByLocationDTO.java
@@ -18,4 +18,6 @@ public class DeviceByLocationDTO {
     private Integer countyCode;
 
     private String deviceName;
+
+    private Integer manufacturer;
 }
diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceReqDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceReqDTO.java
index 9e61be8..4c3519f 100644
--- a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceReqDTO.java
+++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceReqDTO.java
@@ -36,5 +36,11 @@ public class DeviceReqDTO {
     @Schema(title = "省份代码", example = "1", description = "该值为null查询所有省份")
     private Integer provinceCode;
 
+    /**
+     * 警报器厂商 1:圆融科技 2:欧丽 3:厚华
+     */
+    @Schema(title = "警报器厂商", example = "1", description = "警报器厂商 1:圆融科技 2:欧丽 3:厚华")
+    private Integer manufacturer;
+
 
 }
diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceRespDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceRespDTO.java
index 635e0de..ec67821 100644
--- a/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceRespDTO.java
+++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/DeviceRespDTO.java
@@ -69,6 +69,12 @@ public class DeviceRespDTO {
     @Schema(title = "是否告警中", example = "false", description = "false为非告警中，true为告警中")
     private Boolean isAlarming;
 
+    /**
+     * 警报器厂商 1:圆融科技 2:欧丽 3:厚华
+     */
+    @Schema(title = "警报器厂商", example = "1", description = "警报器厂商 1:圆融科技 2:欧丽 3:厚华")
+    private Integer manufacturer;
+
     public static DeviceRespDTO fromDO(DeviceDO deviceDO) {
         DeviceRespDTO resp = new DeviceRespDTO();
         resp.setDeviceId(deviceDO.getDeviceId());
@@ -80,6 +86,7 @@ public class DeviceRespDTO {
         resp.setLongitude(deviceDO.getLongitude());
         resp.setInstallSite(deviceDO.getInstallSite());
         resp.setIsAlarming(DeviceAlarmStatusEnum.ALARMING.getCode().equals(deviceDO.getAlarmStatus()));
+        resp.setManufacturer(deviceDO.getManufacturer());
 
         return resp;
     }
diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java
index 7619a5e..1af1918 100644
--- a/src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/zjyr/beidouservice/service/impl/DeviceServiceImpl.java
@@ -40,7 +40,8 @@ public class DeviceServiceImpl implements DeviceService {
                 .provinceCode(deviceReqDTO.getProvinceCode())
                 .cityCode(deviceReqDTO.getCityCode())
                 .countyCode(deviceReqDTO.getCountyCode())
-                .deviceName(deviceReqDTO.getDeviceName()).build();
+                .deviceName(deviceReqDTO.getDeviceName())
+                .manufacturer(deviceReqDTO.getManufacturer()).build();
         log.info("device search info : [{}]", searchDTO);
 
         List<DeviceDO> deviceDOList = deviceMapper.selectDeviceByLoc(searchDTO);
diff --git a/src/main/resources/mappers/DeviceMapper.xml b/src/main/resources/mappers/DeviceMapper.xml
index a53e900..994df2b 100644
--- a/src/main/resources/mappers/DeviceMapper.xml
+++ b/src/main/resources/mappers/DeviceMapper.xml
@@ -20,7 +20,7 @@
         <result property="state" column="state" jdbcType="INTEGER"/>
         <result property="model" column="model" jdbcType="VARCHAR"/>
         <result property="type" column="type" jdbcType="INTEGER"/>
-        <result property="manufacturer" column="manufacturer" jdbcType="VARCHAR"/>
+        <result property="manufacturer" column="manufacturer" jdbcType="INTEGER"/>
         <result property="power" column="power" jdbcType="INTEGER"/>
         <result property="alarmStatus" column="alarm_status" jdbcType="INTEGER"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -44,6 +44,9 @@
             <if test="deviceName != null and deviceName != ''">
                 and device_name like CONCAT('%', #{deviceName}, '%')
             </if>
+            <if test="manufacturer != null and manufacturer != ''">
+                and manufacturer = #{manufacturer}
+            </if>
         </where>
     </select>