Merge remote-tracking branch 'origin/master'

src/main/java/com/sooka/sponest/monitor/uav/controller/CentermonitorTUavController.java

@@ -914,9 +914,9 @@ public class CentermonitorTUavController extends BaseController {
     /**
      * 根据uavId获取无人机及所属部门集合
      */
-    @GetMapping("/selectUavByUavId/{uavId}")
-    public AjaxResult selectUavByUavId(@PathVariable("uavId") Long uavId) {
-        return AjaxResult.success(centermonitorTUavService.selectUavByUavId(uavId));
+    @GetMapping("/selectUavByUavId/{uavSn}")
+    public AjaxResult selectUavByUavId(@PathVariable("uavSn") String uavSn) {
+        return AjaxResult.success(centermonitorTUavService.selectUavByUavSn(uavSn));
     }
 
     /**

src/main/java/com/sooka/sponest/monitor/uav/mapper/CentermonitorTUavMapper.java

@@ -68,5 +68,5 @@ public interface CentermonitorTUavMapper {
      */
     List<CentermonitorTUav> selectCentermonitorTUavByDeptId(@Param("deptId") String deptId);
 
-    CentermonitorTUav selectUavByUavId(@Param("uavId") Long uavId);
+    CentermonitorTUav selectUavByUavSn(@Param("uavSn") String uavSn);
 }

src/main/java/com/sooka/sponest/monitor/uav/service/ICentermonitorTUavService.java

@@ -65,5 +65,5 @@ public interface ICentermonitorTUavService {
      */
     List<CentermonitorTUav> selectCentermonitorTUavByDeptId();
 
-    CentermonitorTUav selectUavByUavId(Long uavId);
+    CentermonitorTUav selectUavByUavSn(String uavSn);
 }

src/main/java/com/sooka/sponest/monitor/uav/service/impl/CentermonitorTUavServiceImpl.java

@@ -103,8 +103,8 @@ public class CentermonitorTUavServiceImpl implements ICentermonitorTUavService {
     }
 
     @Override
-    public CentermonitorTUav selectUavByUavId(Long uavId) {
-        CentermonitorTUav centermonitorTUav = centermonitorTUavMapper.selectUavByUavId(uavId);
+    public CentermonitorTUav selectUavByUavSn(String uavSn) {
+        CentermonitorTUav centermonitorTUav = centermonitorTUavMapper.selectUavByUavSn(uavSn);
         if (ObjectUtils.isNotEmpty(centermonitorTUav)) {
             centermonitorTUav.setDeptList(centermonitorTUavdeptMapper.selectUavdeptByUavId(centermonitorTUav.getId()));
         }

src/main/resources/mapper/monitor/uav/CentermonitorTUavMapper.xml

@@ -120,13 +120,13 @@
             ctud.dept_id = #{deptId}
     </select>
 
-    <select id="selectUavByUavId" parameterType="Long" resultMap="CentermonitorTUavResult">
+    <select id="selectUavByUavSn" parameterType="String" resultMap="CentermonitorTUavResult">
         SELECT ctu.*,
                GROUP_CONCAT(ctud.dept_id) dept_id,
                GROUP_CONCAT(ctud.dept_name) dept_name
         FROM centermonitor_t_uav ctu
                  LEFT JOIN centermonitor_t_uavdept ctud ON ctud.uav_id = ctu.id
-        where ctu.uav_id = #{uavId}
+        where ctu.uav_sn = #{uavSn}
         group by ctu.uav_id
     </select>
 </mapper>