报告那更改显示

api-common/src/main/java/api/common/pojo/vo/project/SensorBaseInfoVo.java

@@ -33,6 +33,7 @@ public class SensorBaseInfoVo {
     private Double sensorR;
 
     private Integer sensorPort;
+    private String share;
 
 
 }

simulation-resource-server/src/main/java/com/css/simulation/resource/project/service/impl/SimulationProjectServiceImpl.java

@@ -293,6 +293,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                 ProjectDetailsVo info = selectProjectDetailsByIdBackUp(SimulationManualProjectParam.builder()
                         .id(projectId).projectType(DictConstants.PROJECT_TYPE_MANUAL).build()).getInfo();
                 String infoJson = JsonUtil.beanToJson(info);
+                // 保存項目詳情信息
                 simulationProjectMapper.updateDetailsById(projectId, infoJson);
                 // Kafka推送消息
                 projectRunToKafka(po);
@@ -303,6 +304,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
                         .id(projectId).projectType(DictConstants.PROJECT_TYPE_MANUAL).build()).getInfo();
                 String infoJson = JsonUtil.beanToJson(info);
                 log.info("项目 " + projectId + " 的详情信息为：" + infoJson);
+                // 保存項目詳情信息
                 simulationProjectMapper.updateDetailsById(projectId, infoJson);
                 if ("20".equals(param.getNowRunState())) {
                     // 设置开始时间
@@ -565,21 +567,41 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             if (DictConstants.SENSOR_CAMERA.equals(sensorType)) {
                 // 摄像头
                 SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorCamera(sensorId);
+                if(ObjectUtil.isNotNull(sensorBaseInfoVo)&&sensorBaseInfoVo.getShare().equals("0")){
+                    sensorBaseInfoVo.setSensorName("私有/"+sensorBaseInfoVo.getSensorName());
+                }else if(ObjectUtil.isNotNull(sensorBaseInfoVo)&&sensorBaseInfoVo.getShare().equals("1")){
+                    sensorBaseInfoVo.setSensorName("公有/"+sensorBaseInfoVo.getSensorName());
+                }
                 setVehicleConfig(sensorBaseInfoVo, vs);
                 sensorCameraList.add(sensorBaseInfoVo);
             } else if (DictConstants.SENSOR_OGT.equals(sensorType)) {
                 // 完美传感器
                 SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorOgt(sensorId);
+                if(ObjectUtil.isNotNull(sensorBaseInfoVo)&&sensorBaseInfoVo.getShare().equals("0")){
+                    sensorBaseInfoVo.setSensorName("私有/"+sensorBaseInfoVo.getSensorName());
+                }else if(ObjectUtil.isNotNull(sensorBaseInfoVo)&&sensorBaseInfoVo.getShare().equals("1")){
+                    sensorBaseInfoVo.setSensorName("公有/"+sensorBaseInfoVo.getSensorName());
+                }
                 setVehicleConfig(sensorBaseInfoVo, vs);
                 sensorOgtList.add(sensorBaseInfoVo);
             } else if (DictConstants.SENSOR_LIDAR.equals(sensorType)) {
                 // 激光雷达
                 SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorLidar(sensorId);
+                if(ObjectUtil.isNotNull(sensorBaseInfoVo)&&sensorBaseInfoVo.getShare().equals("0")){
+                    sensorBaseInfoVo.setSensorName("私有/"+sensorBaseInfoVo.getSensorName());
+                }else if(ObjectUtil.isNotNull(sensorBaseInfoVo)&&sensorBaseInfoVo.getShare().equals("1")){
+                    sensorBaseInfoVo.setSensorName("公有/"+sensorBaseInfoVo.getSensorName());
+                }
                 setVehicleConfig(sensorBaseInfoVo, vs);
                 sensorLidarList.add(sensorBaseInfoVo);
             } else if (DictConstants.SENSOR_RADAR.equals(sensorType)) {
                 // 毫米波雷达
                 SensorBaseInfoVo sensorBaseInfoVo = simulationProjectMapper.selectSensorRadar(sensorId);
+                if(ObjectUtil.isNotNull(sensorBaseInfoVo)&&sensorBaseInfoVo.getShare().equals("0")){
+                    sensorBaseInfoVo.setSensorName("私有/"+sensorBaseInfoVo.getSensorName());
+                }else if(ObjectUtil.isNotNull(sensorBaseInfoVo)&&sensorBaseInfoVo.getShare().equals("1")){
+                    sensorBaseInfoVo.setSensorName("公有/"+sensorBaseInfoVo.getSensorName());
+                }
                 setVehicleConfig(sensorBaseInfoVo, vs);
                 sensorRadarList.add(sensorBaseInfoVo);
             } else if (DictConstants.SENSOR_GPS.equals(sensorType)) {

simulation-resource-server/src/main/resources/mapper/project/SimulationProjectMapper.xml

@@ -400,27 +400,27 @@
 
     <!--摄像头基本信息-->
     <select id="selectSensorCamera" parameterType="string" resultType="api.common.pojo.vo.project.SensorBaseInfoVo">
-        select a.sensor_name, description as sensorDescription
+        select a.sensor_name, description as sensorDescription,share
         from model_sensor_camera a
         where a.id = #{id,jdbcType=VARCHAR}
     </select>
 
     <!--完美传感器基本信息-->
     <select id="selectSensorOgt" parameterType="string" resultType="api.common.pojo.vo.project.SensorBaseInfoVo">
-        select a.sensor_name, description as sensorDescription
+        select a.sensor_name, description as sensorDescription,share
         from model_sensor_ogt a
         where a.id = #{id,jdbcType=VARCHAR}
     </select>
 
     <!--激光雷达基本信息-->
     <select id="selectSensorLidar" parameterType="string" resultType="api.common.pojo.vo.project.SensorBaseInfoVo">
-        select a.sensor_name, description as sensorDescription
+        select a.sensor_name, description as sensorDescription,share
         from model_sensor_lidar a
         where a.id = #{id,jdbcType=VARCHAR}
     </select>
     <!--毫米波雷达基本信息-->
     <select id="selectSensorRadar" parameterType="string" resultType="api.common.pojo.vo.project.SensorBaseInfoVo">
-        select a.name as sensor_name, description as sensorDescription
+        select a.name as sensor_name, description as sensorDescription,share
         from model_sensor_radar a
         where a.id = #{id,jdbcType=VARCHAR}
     </select>