bug

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/dao/mysql/KwsDeviceMapper.java

@@ -36,6 +36,8 @@ public interface KwsDeviceMapper extends BaseMapper<KwsDevice> {
      */
     List<DeviceDataDTO> selectDeviceAllNotDeviceRelation(@Param("projectId") String projectId);
 
+    List<DeviceDataDTO> selectAllDeviceByProject(@Param("projectId") String projectId);
+
     List<DeviceVo> selectByDeviceParam(@Param("deviceQuery") DeviceQuery deviceQuery);
 
     /**

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/model/vo/AffiliationDeviceVO.java

@@ -39,4 +39,9 @@ public class AffiliationDeviceVO implements Serializable {
      * 逻辑海拔（测点布设的值）
      */
     private String logicAlt;
+
+    /**
+     * sncode
+     */
+    private String snCode;
 }

slope-modules/slope-detection/src/main/java/com/sckw/slope/detection/service/BackTrackService.java

@@ -77,7 +77,7 @@ public class BackTrackService {
 
     public HttpResult getParts(String projectId) {
         //首先获取项目中全部设备
-        List<DeviceDataDTO> list = deviceMapper.selectDeviceAllNotDeviceRelation(projectId);
+        List<DeviceDataDTO> list = deviceMapper.selectAllDeviceByProject(projectId);
         List<String> devicesId = list.stream().map(DeviceDataDTO::getDeviceId).toList();
         if(devicesId.size() == 0){
             return HttpResult.ok(Collections.emptyList());
@@ -93,7 +93,7 @@ public class BackTrackService {
 
     public HttpResult getDeviceByParts(String parts,String projectId) {
         //获取项目中的设备
-        List<DeviceDataDTO> listDevice = deviceMapper.selectDeviceAllNotDeviceRelation(projectId);
+        List<DeviceDataDTO> listDevice = deviceMapper.selectAllDeviceByProject(projectId);
         List<String> devicesId = listDevice.stream().map(DeviceDataDTO::getDeviceId).toList();
         //在获取设备的要素
         String[] arr = parts.split(",");

slope-modules/slope-detection/src/main/resources/mapper/mysql/KwsDeviceMapper.xml

@@ -300,7 +300,8 @@
                a.alias     as alias,
                a.logic_alt as logicAlt,
                a.logic_lat as logicLat,
-               a.logic_lng as logicLng
+               a.logic_lng as logicLng,
+               a.sn_code
         FROM kws_device a
                  LEFT JOIN kws_project_device b ON a.id = b.device_id
                  LEFT JOIN kws_project c ON b.project_id = c.id
@@ -311,6 +312,21 @@
         and c.id = #{projectId}
     </select>
 
+    <select id="selectAllDeviceByProject"
+            resultType="com.sckw.slope.detection.model.dto.DeviceDataDTO">
+        SELECT a.id     AS deviceId,
+               a.alias  as deviceAlias,
+               a.`name` AS deviceName
+        FROM kws_device a
+                 LEFT JOIN kws_project_device b ON a.id = b.device_id
+                 LEFT JOIN kws_project c ON b.project_id = c.id
+        WHERE
+            a.del_flag=0
+          and b.del_flag=0
+          and c.del_flag=0
+          and c.id = #{projectId}
+    </select>
+
     <select id="selectDeviceAllByProjectAndMountainId" resultType="com.sckw.slope.detection.model.dto.ThresholdSelectDTO">
         SELECT b.id     AS deviceId,
                b.alias  AS deviceAlias,