json字符串按值排序

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JMemorandumController.java

@@ -86,13 +86,13 @@ public class JMemorandumController extends BaseController {
     /**
      * 删除数据
      *
-     * @param idList 主键结合
+     * @param id 主键结合
      * @return 删除结果
      */
     @ApiOperation(value = "删除数据")
     @DeleteMapping
-    public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
+    public AjaxResult delete(@RequestParam("id") Long id) {
-        return success(this.jMemorandumService.removeByIds(idList));
+        return success(this.jMemorandumService.removeById(id));
     }
 }
 

ruoyi-admin/src/main/java/com/ruoyi/jjh/ent/controller/JProjectController.java

@@ -87,13 +87,13 @@ public class JProjectController extends BaseController {
     /**
      * 删除数据
      *
-     * @param idList 主键结合
+     * @param id 主键
      * @return 删除结果
      */
     @ApiOperation(value = "删除项目")
     @DeleteMapping
-    public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
+    public AjaxResult delete(@RequestParam("id") Long id) {
-        return success(this.jProjectService.removeByIds(idList));
+        return success(this.jProjectService.removeById(id));
     }
 
     /**
@@ -114,12 +114,8 @@ public class JProjectController extends BaseController {
         if(proList == null &&  proList.isEmpty()){
             throw new ServiceException("项目导入数据不能为空");
         }else {
-            if (!proList.isEmpty()) {
+            jProjectService.saveBatch(proList);
-                jProjectService.saveBatch(proList);
+            successMsg.append("导入成功");
-                successMsg.append("导入成功");
-            } else {
-                successMsg.append("导入失败，文件为空");
-            }
         }
         return AjaxResult.success(successMsg);
     }

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ProjectExcelUtil.java

@@ -310,7 +310,7 @@ public class ProjectExcelUtil<T> {
                     fieldsMap.put(column, objects);
                 }
             }
-            if(fieldsMap.size() != 4){
+            if (fieldsMap.size() != 4) {
                 throw new ServiceException("请导入正确的项目数据");
             }
             for (int i = titleNum + 1; i <= rows; i++) {
@@ -387,20 +387,34 @@ public class ProjectExcelUtil<T> {
                 }
                 cellMap.entrySet().removeIf(entry -> hasStr.contains(entry.getKey()));
                 StringBuilder str = new StringBuilder();
+                Map<String,String> sortHash = new HashMap<>();
                 str.append("{");
                 for (Map.Entry<String, Integer> entry : cellMap.entrySet()) {
                     String key1 = entry.getKey();
                     Object val1 = this.getCellValue(row, entry.getValue());
-                    if (val1 == "" || val1 == null) {
+                    sortHash.put(key1, String.valueOf(val1));
-                        val1 = null;
+                }
-                        str.append('"').append(key1).append('"').append(":").append(val1).append(",");
+                // 自定义比较器按值排序
-                    }else {
+                Comparator<Map.Entry<String, String>> customComparator = Comparator.comparingInt(entry -> entry.getValue().length());
-                        str.append('"').append(key1).append('"').append(":").append('"').append(val1).append('"').append(",");
+                Map<String, String> sortedMap = sortHash.entrySet().stream()
+                        .sorted(customComparator)
+                        .collect(Collectors.toMap(
+                                Map.Entry::getKey,
+                                Map.Entry::getValue,
+                                (oldVal, newVal) -> oldVal,
+                                LinkedHashMap::new
+                        ));
+                for (Map.Entry<String, String> entry : sortedMap.entrySet()) {
+                    if (Objects.equals(entry.getValue(), "") || entry.getValue() == null) {
+                        String nulls = null;
+                        str.append('"').append(entry.getKey()).append('"').append(":").append(nulls).append(",");
+                    } else {
+                        str.append('"').append(entry.getKey()).append('"').append(":").append('"').append(entry.getValue()).append('"').append(",");
                     }
                 }
                 str.append("}");
                 String res = String.valueOf(str).replaceAll("\\s*|\r|\n|\t", "");
-                ReflectUtils.invokeSetter(entity, "otherJson", res.replaceAll(",(?!.*,)",""));
+                ReflectUtils.invokeSetter(entity, "otherJson", res.replaceAll(",(?!.*,)", ""));
                 list.add(entity);
             }
         }