mlx

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/CameraCtrl.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
 
 @Controller
-@RequestMapping(value = "/camera" , name = LogConstants.MODULE_CAMERA)
+@RequestMapping(value = "/camera", name = LogConstants.MODULE_CAMERA)
 public class CameraCtrl {
 
     @Autowired
@@ -28,7 +28,7 @@ public class CameraCtrl {
      */
     @RequestMapping("/getCameraList")
     @ResponseBody
-    public ResponseBodyVO<List<CameraVO>> getCameraList(@RequestBody CameraParam cameraParam){
+    public ResponseBodyVO<List<CameraVO>> getCameraList(@RequestBody CameraParam cameraParam) {
         ResponseBodyVO<List<CameraVO>> response = new ResponseBodyVO<List<CameraVO>>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(cameraService.getCameraList(cameraParam));
         return response;
@@ -39,10 +39,8 @@ public class CameraCtrl {
      */
     @RequestMapping("/getMyCameraList")
     @ResponseBody
-    public ResponseBodyVO<List<CameraVO>> getMyCameraList(@RequestBody CameraParam cameraParam){
-        ResponseBodyVO<List<CameraVO>> response = new ResponseBodyVO<List<CameraVO>>(ResponseBodyVO.Response.SUCCESS);
-        response.setInfo(cameraService.getMyCameraList(cameraParam));
-        return response;
+    public ResponseBodyVO<List<CameraVO>> getMyCameraList(@RequestBody CameraParam cameraParam) {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, cameraService.getMyCameraList(cameraParam));
     }
 
 
@@ -51,7 +49,7 @@ public class CameraCtrl {
      */
     @RequestMapping("/getCameraInfo")
     @ResponseBody
-    public ResponseBodyVO<CameraVO> getCameraInfo(@RequestBody CameraParam cameraParam){
+    public ResponseBodyVO<CameraVO> getCameraInfo(@RequestBody CameraParam cameraParam) {
         ResponseBodyVO<CameraVO> response = new ResponseBodyVO<CameraVO>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(cameraService.getCameraInfo(cameraParam));
         return response;
@@ -62,14 +60,14 @@ public class CameraCtrl {
      */
     @RequestMapping("/saveCamera")
     @ResponseBody
-    public ResponseBodyVO<CameraPO> saveCamera(@RequestBody CameraPO cameraPO){
-        if(ObjectUtil.isNull(cameraPO)){
-            return new ResponseBodyVO(false, 500, "参数必传！",null);
+    public ResponseBodyVO<CameraPO> saveCamera(@RequestBody CameraPO cameraPO) {
+        if (ObjectUtil.isNull(cameraPO)) {
+            return new ResponseBodyVO(false, 500, "参数必传！", null);
         }
         ResponseBodyVO<CameraPO> response = new ResponseBodyVO<CameraPO>(ResponseBodyVO.Response.SUCCESS);
         CameraPO po = cameraService.saveCamera(cameraPO);
-        if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO(false, 500, "传感器名称重复！",null);
+        if (ObjectUtil.isNull(po.getId())) {
+            return new ResponseBodyVO(false, 500, "传感器名称重复！", null);
         }
         response.setInfo(po);
         return response;
@@ -81,14 +79,14 @@ public class CameraCtrl {
     @RequestMapping("/shareCamera")
     @ResponseBody
     @PreAuthorize("@AuthorityCheck.admin()")
-    public ResponseBodyVO<CameraPO> shareCamera(@RequestBody CameraPO cameraPO){
-        if(ObjectUtil.isNull(cameraPO)){
-            return new ResponseBodyVO<>(false, 500, "参数必传！",null);
+    public ResponseBodyVO<CameraPO> shareCamera(@RequestBody CameraPO cameraPO) {
+        if (ObjectUtil.isNull(cameraPO)) {
+            return new ResponseBodyVO<>(false, 500, "参数必传！", null);
         }
         ResponseBodyVO<CameraPO> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         CameraPO po = cameraService.shareCamera(cameraPO);
-        if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO<>(false, 500, "传感器名称重复！",null);
+        if (ObjectUtil.isNull(po.getId())) {
+            return new ResponseBodyVO<>(false, 500, "传感器名称重复！", null);
         }
         response.setInfo(po);
         return response;
@@ -99,12 +97,12 @@ public class CameraCtrl {
      */
     @RequestMapping("/delCameraById")
     @ResponseBody
-    public ResponseBodyVO delCameraById(@RequestBody CameraPO cameraPO){
+    public ResponseBodyVO delCameraById(@RequestBody CameraPO cameraPO) {
         int i = cameraService.delCameraById(cameraPO);
-        if(i>0){
+        if (i > 0) {
             return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-        }else{
-            return new ResponseBodyVO(false, 500, "删除失败！",null);
+        } else {
+            return new ResponseBodyVO(false, 500, "删除失败！", null);
         }
     }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/GpsCtrl.java

@@ -18,19 +18,19 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.List;
 
 @Controller
-@RequestMapping(value = "/gps",name = LogConstants.MODULE_GPS)
+@RequestMapping(value = "/gps", name = LogConstants.MODULE_GPS)
 public class GpsCtrl {
 
     @Autowired
-    GpsService gpsService;
+    private GpsService gpsService;
 
     /**
      * 获取列表
      */
     @RequestMapping("/getGpsList")
     @ResponseBody
-    public ResponseBodyVO<List<GpsVO>> getGpsList(@RequestBody GpsParam gpsParam){
-        ResponseBodyVO<List<GpsVO>> response = new ResponseBodyVO<List<GpsVO>>(ResponseBodyVO.Response.SUCCESS);
+    public ResponseBodyVO<List<GpsVO>> getGpsList(@RequestBody GpsParam gpsParam) {
+        ResponseBodyVO<List<GpsVO>> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(gpsService.getGpsList(gpsParam));
         return response;
     }
@@ -40,8 +40,8 @@ public class GpsCtrl {
      */
     @RequestMapping("/getMyGpsList")
     @ResponseBody
-    public ResponseBodyVO<List<GpsVO>> getMyCameraList(@RequestBody GpsParam gpsParam){
-        ResponseBodyVO<List<GpsVO>> response = new ResponseBodyVO<List<GpsVO>>(ResponseBodyVO.Response.SUCCESS);
+    public ResponseBodyVO<List<GpsVO>> getMyCameraList(@RequestBody GpsParam gpsParam) {
+        ResponseBodyVO<List<GpsVO>> response = new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(gpsService.getMyGpsList(gpsParam));
         return response;
     }
@@ -51,7 +51,7 @@ public class GpsCtrl {
      */
     @RequestMapping("/getGpsInfo")
     @ResponseBody
-    public ResponseBodyVO<GpsVO> getGpsInfo(@RequestBody GpsParam gpsParam){
+    public ResponseBodyVO<GpsVO> getGpsInfo(@RequestBody GpsParam gpsParam) {
         ResponseBodyVO<GpsVO> response = new ResponseBodyVO<GpsVO>(ResponseBodyVO.Response.SUCCESS);
         response.setInfo(gpsService.getGpsInfo(gpsParam));
         return response;
@@ -62,14 +62,14 @@ public class GpsCtrl {
      */
     @RequestMapping("/saveGps")
     @ResponseBody
-    public ResponseBodyVO<GpsPO> saveGps(@RequestBody GpsPO gpsPO){
-        if(ObjectUtil.isNull(gpsPO)){
-            return new ResponseBodyVO(false, 500, "参数必传！",null);
+    public ResponseBodyVO<GpsPO> saveGps(@RequestBody GpsPO gpsPO) {
+        if (ObjectUtil.isNull(gpsPO)) {
+            return new ResponseBodyVO(false, 500, "参数必传！", null);
         }
         ResponseBodyVO<GpsPO> response = new ResponseBodyVO<GpsPO>(ResponseBodyVO.Response.SUCCESS);
         GpsPO po = gpsService.saveGps(gpsPO);
-        if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO(false, 500, "传感器名称重复！",null);
+        if (ObjectUtil.isNull(po.getId())) {
+            return new ResponseBodyVO(false, 500, "传感器名称重复！", null);
         }
         response.setInfo(po);
         return response;
@@ -81,14 +81,14 @@ public class GpsCtrl {
     @RequestMapping("/shareGps")
     @ResponseBody
     @PreAuthorize("@AuthorityCheck.admin()")
-    public ResponseBodyVO<GpsPO> shareGps(@RequestBody GpsPO gpsPO){
-        if(ObjectUtil.isNull(gpsPO)){
-            return new ResponseBodyVO(false, 500, "参数必传！",null);
+    public ResponseBodyVO<GpsPO> shareGps(@RequestBody GpsPO gpsPO) {
+        if (ObjectUtil.isNull(gpsPO)) {
+            return new ResponseBodyVO(false, 500, "参数必传！", null);
         }
         ResponseBodyVO<GpsPO> response = new ResponseBodyVO<GpsPO>(ResponseBodyVO.Response.SUCCESS);
         GpsPO po = gpsService.shareGps(gpsPO);
-        if(ObjectUtil.isNull(po.getId())){
-            return new ResponseBodyVO(false, 500, "传感器名称重复！",null);
+        if (ObjectUtil.isNull(po.getId())) {
+            return new ResponseBodyVO(false, 500, "传感器名称重复！", null);
         }
         response.setInfo(po);
         return response;
@@ -99,12 +99,12 @@ public class GpsCtrl {
      */
     @RequestMapping("/delGpsById")
     @ResponseBody
-    public ResponseBodyVO delGpsById(@RequestBody GpsPO gpsPO){
+    public ResponseBodyVO delGpsById(@RequestBody GpsPO gpsPO) {
         int i = gpsService.delGpsById(gpsPO);
-        if(i>0){
+        if (i > 0) {
             return new ResponseBodyVO(ResponseBodyVO.Response.SUCCESS);
-        }else{
-            return new ResponseBodyVO(false, 500, "删除失败！",null);
+        } else {
+            return new ResponseBodyVO(false, 500, "删除失败！", null);
         }
     }
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/CameraService.java

@@ -30,8 +30,15 @@ public class CameraService {
 
     public List<CameraVO> getMyCameraList(CameraParam cameraParam) {
         cameraParam.setCreateUserId(AuthUtil.getCurrentUserId());
-        cameraParam.setShare(DictConstants.NO);
-        return cameraMapper.getCameraList(cameraParam);
+//        cameraParam.setShare(DictConstants.NO);
+        cameraParam.setShare(null);
+        List<CameraVO> cameraList = cameraMapper.getCameraList(cameraParam);
+        cameraList.forEach(camera -> {
+            if ("1".equals(camera.getShare())) {
+                camera.setSensorName(camera.getSensorName() + "（公有）");
+            }
+        });
+        return cameraList;
     }
 
     public CameraVO getCameraInfo(CameraParam cameraParam) {
@@ -51,17 +58,17 @@ public class CameraService {
         cameraPO.setShare(DictConstants.NO);//私有
         //名称校验
         List<CameraVO> list = cameraMapper.checkCameraName(cameraPO);
-        if(ObjectUtil.isNotNull(list)){
+        if (ObjectUtil.isNotNull(list)) {
             cameraPO.setId(null);
             return cameraPO;
         }
         String id = cameraPO.getId();
-        if(ObjectUtil.isNull(id)){//新增
+        if (ObjectUtil.isNull(id)) {//新增
             cameraPO.setId(StringUtil.getRandomUUID());
             cameraPO.setSensorCode(StringUtil.getRandomCode());
             cameraMapper.insert(cameraPO);
             LogUtil.insert();
-        }else{//修改
+        } else {//修改
             cameraMapper.update(cameraPO);
             LogUtil.update();
         }
@@ -75,7 +82,7 @@ public class CameraService {
         cameraPO.setCreateUserId(null);
         //名称校验
         List<CameraVO> list = cameraMapper.checkCameraName(cameraPO);
-        if(ObjectUtil.isNotNull(list)){
+        if (ObjectUtil.isNotNull(list)) {
             String currentUserId = AuthUtil.getCurrentUserId();
             Timestamp currentTime = TimeUtil.getNowForMysql();
             cameraPO.setId(list.get(0).getId());
@@ -83,7 +90,7 @@ public class CameraService {
             cameraPO.setModifyTime(currentTime);
             cameraMapper.update(cameraPO);
             LogUtil.update();
-        }else {
+        } else {
             //常规字段赋值
             String currentUserId = AuthUtil.getCurrentUserId();
             Timestamp currentTime = TimeUtil.getNowForMysql();

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/GpsService.java

@@ -11,17 +11,17 @@ import api.common.util.TimeUtil;
 import com.css.simulation.resource.common.utils.AuthUtil;
 import com.css.simulation.resource.common.utils.PoUtil;
 import com.css.simulation.resource.model.mapper.GpsMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.sql.Timestamp;
 import java.util.List;
 
 @Service
 public class GpsService {
 
-    @Autowired
-    GpsMapper gpsMapper;
+    @Resource
+    private GpsMapper gpsMapper;
 
     public List<GpsVO> getGpsList(GpsParam gpsParam) {
         gpsParam.setCreateUserId(AuthUtil.getCurrentUserId());
@@ -32,9 +32,15 @@ public class GpsService {
 
     public List<GpsVO> getMyGpsList(GpsParam gpsParam) {
         gpsParam.setCreateUserId(AuthUtil.getCurrentUserId());
-        gpsParam.setShare(DictConstants.NO);
-        List<GpsVO> list = gpsMapper.getGpsList(gpsParam);
-        return list;
+//        gpsParam.setShare(DictConstants.NO);
+        gpsParam.setShare(null);
+        List<GpsVO> gpsList = gpsMapper.getGpsList(gpsParam);
+        gpsList.forEach(gps-> {
+            if("1".equals(gps.getShare()) ){
+                gps.setSensorName(gps.getSensorName()+"（公有）");
+            }
+        });
+        return gpsList;
     }
 
     public GpsVO getGpsInfo(GpsParam gpsParam) {

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/LidarService.java

@@ -31,8 +31,15 @@ public class LidarService {
 
     public List<LidarVO> getMyLidarList(LidarParam lidarParam) {
         lidarParam.setCreateUserId(AuthUtil.getCurrentUserId());
-        lidarParam.setShare(DictConstants.NO);
+//        lidarParam.setShare(DictConstants.NO);
+
+        lidarParam.setShare(null);
         List<LidarVO> list = lidarMapper.getLidarList(lidarParam);
+        list.forEach(element -> {
+            if ("1".equals(element.getShare())) {
+                element.setSensorName(element.getSensorName() + "（公有）");
+            }
+        });
         return list;
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/model/service/OgtService.java

@@ -33,8 +33,14 @@ public class OgtService {
 
     public List<OgtVO> getMyOgtList(OgtParam ogtParam) {
         ogtParam.setCreateUserId(AuthUtil.getCurrentUserId());
-        ogtParam.setShare(DictConstants.NO);
+//        ogtParam.setShare(DictConstants.NO);
+        ogtParam.setShare(null);
         List<OgtVO> list = ogtMapper.getOgtList(ogtParam);
+        list.forEach(element -> {
+            if ("1".equals(element.getShare())) {
+                element.setSensorName(element.getSensorName() + "（公有）");
+            }
+        });
         return list;
     }
 

simulation-resource-server/src/main/resources/mapper/model/CameraMapper.xml

@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.css.simulation.resource.model.mapper.CameraMapper" >
+<mapper namespace="com.css.simulation.resource.model.mapper.CameraMapper">
 
     <resultMap id="CameraVOMap" type="api.common.pojo.vo.model.CameraVO">
-        <id column="ID" property="id" jdbcType="VARCHAR" />
-        <result column="sensor_code" property="sensorCode" jdbcType="VARCHAR" />
-        <result column="sensor_name" property="sensorName" jdbcType="VARCHAR" />
-        <result column="description" property="description" jdbcType="VARCHAR" />
-        <result column="near_distance" property="nearDistance" jdbcType="DECIMAL" />
-        <result column="far_distance" property="farDistance" jdbcType="DECIMAL" />
-        <result column="fov_h" property="fovH" jdbcType="DECIMAL" />
-        <result column="fov_v" property="fovV" jdbcType="DECIMAL" />
-        <result column="resolution" property="resolution" jdbcType="VARCHAR" />
-        <result column="frame_rate" property="frameRate" jdbcType="DECIMAL" />
-        <result column="self_display" property="selfDisplay" jdbcType="VARCHAR" />
-        <result column="share" property="share" jdbcType="VARCHAR" />
+        <id column="ID" property="id" jdbcType="VARCHAR"/>
+        <result column="sensor_code" property="sensorCode" jdbcType="VARCHAR"/>
+        <result column="sensor_name" property="sensorName" jdbcType="VARCHAR"/>
+        <result column="description" property="description" jdbcType="VARCHAR"/>
+        <result column="near_distance" property="nearDistance" jdbcType="DECIMAL"/>
+        <result column="far_distance" property="farDistance" jdbcType="DECIMAL"/>
+        <result column="fov_h" property="fovH" jdbcType="DECIMAL"/>
+        <result column="fov_v" property="fovV" jdbcType="DECIMAL"/>
+        <result column="resolution" property="resolution" jdbcType="VARCHAR"/>
+        <result column="frame_rate" property="frameRate" jdbcType="DECIMAL"/>
+        <result column="self_display" property="selfDisplay" jdbcType="VARCHAR"/>
+        <result column="share" property="share" jdbcType="VARCHAR"/>
 
     </resultMap>
 
     <select id="getCameraList" parameterType="api.common.pojo.param.model.CameraParam" resultMap="CameraVOMap">
         select
-          id,
-          sensor_name,
-          description,
-          fov_h,
-          fov_v,
+        id,
+        sensor_name,
+        description,
+        fov_h,
+        fov_v,
         far_distance,
         near_distance,
-          share
+        share
         from model_sensor_camera c
         where c.is_deleted = '0'
         <if test="sensorName != null and sensorName != ''">
@@ -44,29 +44,28 @@
     </select>
 
     <select id="getCameraInfo" parameterType="api.common.pojo.param.model.CameraParam" resultMap="CameraVOMap">
-        select
-            id,
-            sensor_code,
-            sensor_name,
-            description,
-            near_distance,
-            far_distance,
-            fov_h,
-            fov_v,
-            resolution,
-            frame_rate,
-            self_display,
-            share
+        select id,
+               sensor_code,
+               sensor_name,
+               description,
+               near_distance,
+               far_distance,
+               fov_h,
+               fov_v,
+               resolution,
+               frame_rate,
+               self_display,
+               share
         from model_sensor_camera c
         where c.id = #{id,jdbcType=VARCHAR} limit 1
     </select>
 
     <select id="checkCameraName" parameterType="api.common.pojo.po.model.CameraPO" resultMap="CameraVOMap">
         select
-            id
+        id
         from model_sensor_camera
         where is_deleted = '0'
-          and sensor_name = #{sensorName,jdbcType=VARCHAR}
+        and sensor_name = #{sensorName,jdbcType=VARCHAR}
         <if test="share != null and share != ''">
             and share = #{share,jdbcType=VARCHAR}
         </if>
@@ -77,68 +76,64 @@
     </select>
 
     <insert id="insert" parameterType="api.common.pojo.po.model.CameraPO">
-        insert into model_sensor_camera(
-            id,
-            sensor_code,
-            sensor_name,
-            description,
-            near_distance,
-            far_distance,
-            fov_h,
-            fov_v,
-            resolution,
-            frame_rate,
-            self_display,
-            share,
-            create_time,
-            modify_time,
-            create_user_id,
-            modify_user_id,
-            is_deleted
-        )
-        values(
-            #{id,jdbcType=VARCHAR},
-            #{sensorCode,jdbcType=VARCHAR},
-            #{sensorName,jdbcType=VARCHAR},
-            #{description,jdbcType=VARCHAR},
-            #{nearDistance,jdbcType=DECIMAL},
-            #{farDistance,jdbcType=DECIMAL},
-            #{fovH,jdbcType=DECIMAL},
-            #{fovV,jdbcType=DECIMAL},
-            #{resolution,jdbcType=VARCHAR},
-            #{frameRate,jdbcType=DECIMAL},
-            #{selfDisplay,jdbcType=VARCHAR},
-            #{share,jdbcType=VARCHAR},
-            #{createTime,jdbcType=TIMESTAMP},
-            #{modifyTime,jdbcType=TIMESTAMP},
-            #{createUserId,jdbcType=VARCHAR},
-            #{modifyUserId,jdbcType=VARCHAR},
-            #{isDeleted,jdbcType=VARCHAR}
-        )
+        insert into model_sensor_camera(id,
+                                        sensor_code,
+                                        sensor_name,
+                                        description,
+                                        near_distance,
+                                        far_distance,
+                                        fov_h,
+                                        fov_v,
+                                        resolution,
+                                        frame_rate,
+                                        self_display,
+                                        share,
+                                        create_time,
+                                        modify_time,
+                                        create_user_id,
+                                        modify_user_id,
+                                        is_deleted)
+        values (#{id,jdbcType=VARCHAR},
+                #{sensorCode,jdbcType=VARCHAR},
+                #{sensorName,jdbcType=VARCHAR},
+                #{description,jdbcType=VARCHAR},
+                #{nearDistance,jdbcType=DECIMAL},
+                #{farDistance,jdbcType=DECIMAL},
+                #{fovH,jdbcType=DECIMAL},
+                #{fovV,jdbcType=DECIMAL},
+                #{resolution,jdbcType=VARCHAR},
+                #{frameRate,jdbcType=DECIMAL},
+                #{selfDisplay,jdbcType=VARCHAR},
+                #{share,jdbcType=VARCHAR},
+                #{createTime,jdbcType=TIMESTAMP},
+                #{modifyTime,jdbcType=TIMESTAMP},
+                #{createUserId,jdbcType=VARCHAR},
+                #{modifyUserId,jdbcType=VARCHAR},
+                #{isDeleted,jdbcType=VARCHAR})
     </insert>
 
     <update id="update" parameterType="api.common.pojo.po.model.CameraPO">
-        update model_sensor_camera set
-            sensor_name = #{sensorName,jdbcType=VARCHAR},
-            description = #{description,jdbcType=VARCHAR},
-            near_distance = #{nearDistance,jdbcType=DECIMAL},
-            far_distance = #{farDistance,jdbcType=DECIMAL},
-            fov_h = #{fovH,jdbcType=DECIMAL},
-            fov_v = #{fovV,jdbcType=DECIMAL},
-            resolution = #{resolution,jdbcType=VARCHAR},
-            frame_rate = #{frameRate,jdbcType=DECIMAL},
-            self_display = #{selfDisplay,jdbcType=VARCHAR},
+        update model_sensor_camera
+        set sensor_name    = #{sensorName,jdbcType=VARCHAR},
+            description    = #{description,jdbcType=VARCHAR},
+            near_distance  = #{nearDistance,jdbcType=DECIMAL},
+            far_distance   = #{farDistance,jdbcType=DECIMAL},
+            fov_h          = #{fovH,jdbcType=DECIMAL},
+            fov_v          = #{fovV,jdbcType=DECIMAL},
+            resolution     = #{resolution,jdbcType=VARCHAR},
+            frame_rate     = #{frameRate,jdbcType=DECIMAL},
+            self_display   = #{selfDisplay,jdbcType=VARCHAR},
 
-            modify_time = #{modifyTime,jdbcType=TIMESTAMP},
+            modify_time    = #{modifyTime,jdbcType=TIMESTAMP},
             modify_user_id = #{modifyUserId,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
     </update>
 
     <update id="delCameraById" parameterType="api.common.pojo.po.model.CameraPO">
-        update model_sensor_camera set
-          modify_time = #{modifyTime,jdbcType=TIMESTAMP},
-          modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
-          is_deleted = #{isDeleted,jdbcType=VARCHAR}
+        update model_sensor_camera
+        set modify_time    = #{modifyTime,jdbcType=TIMESTAMP},
+            modify_user_id = #{modifyUserId,jdbcType=VARCHAR},
+            is_deleted     = #{isDeleted,jdbcType=VARCHAR}
         where id = #{id,jdbcType=VARCHAR}
     </update>
 </mapper>