自车渲染

api-common/src/main/java/api/common/pojo/vo/model/ConfigVO.java

@@ -24,6 +24,8 @@ public class ConfigVO {
     private String vehicleDescription;
     //车辆图片
     private String vehicleTopView;
+    //glb文件地址
+    private String vehicleFrontView;
     //是否分享
     private String share;
 

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

@@ -108,11 +108,6 @@ public class VehicleTempService {
             newVehicle.setVehicleCode(StringUtil.getRandomCode());
             newVehicle.setValid("1");
             vehicleTempMapper.insert(newVehicle);
-            //字典新增osgb文件
-            dictPo.setId(StringUtil.getRandomUUID());
-            dictPo.setDictType("carType");
-            dictPo.setDictOrder(1);
-            dictMapper.saveSystemDict(dictPo);
             logService.logVehicle(LogConstants.SYS_LOG_VEHICLE_INSERT, newVehicle);
         } else { //修改
             // 如果旧的车辆模板的标识和新的车辆模板标识不相等，则需要同步所有的车辆
@@ -120,9 +115,21 @@ public class VehicleTempService {
                 vehicleMapper.updateModelLabel(oldVehicle.getModelLabel(),newVehicle.getModelLabel());
             }
             vehicleTempMapper.update(newVehicle);
-            dictMapper.updateSystemDict(dictPo);
             logService.logVehicle(LogConstants.SYS_LOG_VEHICLE_UPDATE, newVehicle);
         }
+
+        //先判断字典表中是否有
+       String carId= dictMapper.getDictByDictCode(dictPo);
+        if(ObjectUtil.isNull(carId)){
+            //字典新增osgb文件
+            dictPo.setId(StringUtil.getRandomUUID());
+            dictPo.setDictType("carType");
+            dictPo.setDictOrder(1);
+            dictMapper.saveSystemDict(dictPo);
+        }else{
+            dictMapper.updateSystemDict(dictPo);
+        }
+
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, newVehicle);
     }
 

simulation-resource-server/src/main/java/com/css/simulation/resource/system/mapper/DictMapper.java

@@ -16,4 +16,6 @@ public interface DictMapper {
     void saveSystemDict(DictPO po);
     void updateSystemDict(DictPO po);
     int deleteSystemDict(DictPO po);
+
+    String getDictByDictCode(DictPO po);
 }

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

@@ -57,6 +57,7 @@
             c.share,
             v.vehicle_name,
             v.description as vehicleDescription,
+            v.vehicle_front_view,
             v.vehicle_top_view
         FROM model_config c
         LEFT JOIN model_vehicle v ON v.id = c.vehicle_id

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

@@ -34,6 +34,7 @@
           id,
           vehicle_name,
           description,
+          vehicle_front_view,
           vehicle_top_view,
           share
         from model_vehicle v

simulation-resource-server/src/main/resources/mapper/scene/SystemScenePackageMapper.xml

@@ -62,12 +62,11 @@
         select a.username, GROUP_CONCAT(DISTINCT (p.package_name)) as package_name, max(a.modify_time) modify_time
         from (select u.id user_id, s.is_deleted, u.username, u.company, s.package_id, s.modify_time
         from system_user u
-        left join system_user_scene s on u.id = s.user_id
+        left join system_user_scene s on u.id = s.user_id and s.is_deleted = '0'
         where u.is_deleted = '0'
-        and s.is_deleted = '0'
         and u.role_code = '2') a
-        left join system_scene_package p on a.package_id = p.id
-        where p.is_deleted = '0'
+        left join system_scene_package p on a.package_id = p.id and p.is_deleted = '0'
+        where 1=1
         <if test="userName != null and userName != ''">
             and username like CONCAT('%',#{userName,jdbcType=VARCHAR},'%')
         </if>

simulation-resource-server/src/main/resources/mapper/system/DictMapper.xml

@@ -71,4 +71,14 @@
         and dict_type='carType'
         and is_deleted='0'
     </update>
+
+
+    <select id="getDictByDictCode"  resultType="java.lang.String" parameterType="api.common.pojo.po.system.DictPO" >
+        select
+        id
+        from system_dict
+        where is_deleted = '0'
+        and dict_code = #{dictCode,jdbcType=VARCHAR}
+        and dict_type='carType'
+    </select>
 </mapper>