1111

src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -617,10 +617,6 @@ public class CommonServiceImpl implements ICommonService {
                 if (ObjectUtil.isNotEmpty(ms.getShapes())){
                     for (JSONObject s : ms.getShapes()) {
                         String category = s.getString("category");
-                        SceneShapeEnum sceneShapeEnum = sceneShapeEnumService.findByClassName(category);
-                        if (ObjectUtil.isNotNull(sceneShapeEnum)){
-                            s.put("name",sceneShapeEnum.getName());
-                        }
                         if (category.contains("Tag_")){
                             s.put("category","Tag");
                         }

src/main/java/com/fdkankan/contro/service/impl/SceneMarkShapeServiceImpl.java

@@ -44,7 +44,9 @@ public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, Scen
             SceneShapeEnum category = sceneShapeEnumService.findByClassName(shape.getString("category"));
             if (ObjectUtil.isNull(category)){
                 SceneShapeEnum sceneShapeEnum = new SceneShapeEnum();
-                sceneShapeEnum.setName(shape.getString("name"));
+                //删除数字shape.getString("name")
+                String nameWithoutNumbers = shape.getString("name").replaceAll("\\d+", "");
+                sceneShapeEnum.setName(nameWithoutNumbers);
                 sceneShapeEnum.setClassName(shape.getString("category"));
                 sceneShapeEnumService.save(sceneShapeEnum);
             }