2.1.0

src/main/java/com/fdkankan/scene/entity/SceneIcon.java

@@ -44,7 +44,7 @@ public class SceneIcon implements Serializable {
      * 文件名
      */
     @TableField("file_name")
-    private String fileName;
+    private String name;
 
     @TableField("create_time")
     private Date createTime;

src/main/java/com/fdkankan/scene/service/impl/SceneEvidenceServiceImpl.java

@@ -309,11 +309,11 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
             return;
         }
         List<SceneIcon> sceneIconList = icons.stream().map(v -> {
-            String sid = FileUtil.getPrefix(v.getFileName());
+            String sid = FileUtil.getPrefix(v.getName());
             SceneIcon sceneIcon = new SceneIcon();
             sceneIcon.setNum(num);
             sceneIcon.setSid(sid);
-            sceneIcon.setFileName(v.getFileName());
+            sceneIcon.setName(v.getName());
             sceneIcon.setDictId(v.getDictId());
             sceneIcon.setBizType("evidence");
             return sceneIcon;
@@ -382,7 +382,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
             int count = 0;
             for (JSONObject tag : evidences) {
                 String sid = tag.getString("icon");
-                if(StrUtil.isEmpty(sid) || !icon.getFileName().equals(sid)){
+                if(StrUtil.isEmpty(sid) || !icon.getName().equals(sid)){
                     continue;
                 }
                 ++count;
@@ -405,7 +405,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
                 new LambdaQueryWrapper<SceneIcon>()
                         .eq(SceneIcon::getBizType, "evidence")
                         .eq(SceneIcon::getNum, param.getNum())
-                        .in(SceneIcon::getFileName, param.getFileNameList()));
+                        .in(SceneIcon::getName, param.getFileNameList()));
     }
 
     @Override

src/main/java/com/fdkankan/scene/vo/EvidenceIconVO.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -12,6 +13,6 @@ public class EvidenceIconVO {
     private Long dictId;
 
     @NotBlank(message = "图标文件名称不能为空")
-    private String fileName;
+    private String name;
 
 }