新增pad接口：摄像头报修

nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/controller/AppCameraInfoController.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import com.nu.modules.iot.tplink.camerainfo.entity.AppCameraInfo;
 import com.nu.modules.iot.tplink.camerainfo.service.IAppCameraInfoService;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -265,4 +267,11 @@ public class AppCameraInfoController extends JeecgController<AppCameraInfo, IApp
         return service.motionCtrl(cameraInfo);
     }
 
+    @AutoLog(value = "设备报修")
+    @ApiOperation(value="设备报修", notes="设备报修")
+    @RequestMapping(value = "/baoxiu", method = {RequestMethod.PUT,RequestMethod.POST})
+    public Result<String> baoxiu(@RequestBody AppCameraInfo cameraInfo) {
+        service.baoxiu(cameraInfo);
+        return Result.OK("操作成功!");
+    }
 }

nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/entity/AppCameraInfo.java

@@ -297,4 +297,7 @@ public class AppCameraInfo implements Serializable {
 	private String ftpUsername; //回放视频转FTP上传用户
 	private String ftpPassword; //回放视频转FTP上传密码
 	private String ftpUploadpath; //回放视频转FTP上传路径
+
+	/**维修状态*/
+	private String maintainStatus;
 }

nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/IAppCameraInfoService.java

@@ -46,4 +46,6 @@ public interface IAppCameraInfoService extends IService<AppCameraInfo> {
     Result<String> stopUploadToServer(AppCameraInfo cameraInfo);
     Result getUploadToServerProcess(AppCameraInfo cameraInfo);
     Result motionCtrl(AppCameraInfo cameraInfo);
+
+    void baoxiu(AppCameraInfo cameraInfo);
 }

nursing-unit-api/src/main/java/com/nu/modules/iot/tplink/camerainfo/service/impl/AppCameraInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.nu.modules.iot.tplink.camerainfo.service.impl;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -19,6 +20,7 @@ import org.apache.commons.compress.utils.Lists;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -46,6 +48,10 @@ public class AppCameraInfoServiceImpl extends ServiceImpl<AppCameraInfoMapper, A
     @Autowired
     private AppTumsConfigMapper tumsConfigMapper;
 
+    @Lazy
+    @Autowired
+    private AppCameraInfoServiceImpl syncImpl;
+
     /**
      * 获取摄像头信息-分页
      * @param page
@@ -1963,4 +1969,16 @@ public class AppCameraInfoServiceImpl extends ServiceImpl<AppCameraInfoMapper, A
             return Result.error(errMsg);
         }
     }
+
+    @Override
+    public void baoxiu(AppCameraInfo cameraInfo) {
+        cameraInfo.setMaintainStatus("1");
+        baseMapper.updateById(cameraInfo);
+        syncImpl.devopsBaoxiu(cameraInfo);
+    }
+
+    @DS("devops")
+    public void devopsBaoxiu(AppCameraInfo cameraInfo){
+        baseMapper.updateById(cameraInfo);
+    }
 }

nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml

@@ -15,11 +15,17 @@
 
 
     <select id="qyList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">
-        select a.*,b.id as camera_id,b.device_name,b.device_status,REPLACE(b.mac,'-','') as device_mac,0 as streamType,b.device_index
+        select distinct a.*
         from nu_base_info a
         left join nu_iot_tplink_camera b on a.nu_id = b.nu_id
         ${ew.customSqlSegment}
     </select>
+<!--    <select id="qyList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">-->
+<!--        select a.*,b.id as camera_id,b.device_name,b.device_status,REPLACE(b.mac,'-','') as device_mac,0 as streamType,b.device_index-->
+<!--        from nu_base_info a-->
+<!--                 left join nu_iot_tplink_camera b on a.nu_id = b.nu_id-->
+<!--            ${ew.customSqlSegment}-->
+<!--    </select>-->
 
     <select id="queryinfoByBuId" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">
         select * from nu_base_info