接口编写

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelConfigServiceImpl.java

@@ -333,24 +333,28 @@ public class InstrumentPanelConfigServiceImpl extends ServiceImpl<InstrumentPane
                 .findFirst()
                 .orElse(null);
             if(ObjectUtils.isNotEmpty(waitConfig)){
+                if(StringUtils.isNotEmpty(waitConfig.getConfigDetails())) {
                     try {
                         waitPublished = URLDecoder.decode(waitConfig.getConfigDetails(), StandardCharsets.UTF_8.name());
-                }catch (Exception e){
+                    } catch (Exception e) {
                         e.printStackTrace();
                     }
                 }
+            }
             InstrumentPanelConfig publishConfig = configs.stream()
                 .filter(x -> PublishedStatus.PUBLISHED.value.equals(x.getPublished()))
                 .findFirst()
                 .orElse(null);
             if(ObjectUtils.isNotEmpty(publishConfig)){
+                if(StringUtils.isNotEmpty(publishConfig.getConfigDetails())) {
                     try {
                         published = URLDecoder.decode(publishConfig.getConfigDetails(), StandardCharsets.UTF_8.name());
-                }catch (Exception e){
+                    } catch (Exception e) {
                         e.printStackTrace();
                     }
                 }
             }
+        }
         maps.put(PublishedStatus.WAIT_PUBLISHED.value,waitPublished);
         maps.put(PublishedStatus.PUBLISHED.value,published);
         return maps;

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelGroupServiceImpl.java

@@ -78,7 +78,8 @@ public class InstrumentPanelGroupServiceImpl extends ServiceImpl<InstrumentPanel
                 stack.add(pGroup);
             }
         }
-        return Lists.newArrayList(filteredMap.values());
+        return Lists.newArrayList(filteredMap.values()).stream().sorted(Comparator.comparing(InstrumentPanelGroupVo::getCreateTime)).collect(
+            Collectors.toList());
     }
 
     @Override

src/main/java/com/syc/slm/slmbi/service/impl/InstrumentPanelTreeServiceImpl.java

@@ -15,15 +15,14 @@ import com.syc.slm.common.core.util.R;
 import com.syc.slm.common.core.util.RestTemplateUtils;
 import com.syc.slm.slmbi.dao.InstrumentPanelTreeMapper;
 import com.syc.slm.slmbi.dto.InstrumentPanelAssemblyDTO;
-import com.syc.slm.slmbi.entity.*;
+import com.syc.slm.slmbi.entity.BaseEntity;
+import com.syc.slm.slmbi.entity.CurrentUser;
+import com.syc.slm.slmbi.entity.InstrumentPanelDraft;
+import com.syc.slm.slmbi.entity.InstrumentPanelTree;
 import com.syc.slm.slmbi.enums.NodeType;
-import com.syc.slm.slmbi.enums.PublishedStatus;
-import com.syc.slm.slmbi.exception.SysException;
 import com.syc.slm.slmbi.service.*;
-import com.syc.slm.slmbi.vo.*;
-import lombok.NonNull;
+import com.syc.slm.slmbi.vo.PanelTreeNodeVo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.filefilter.FalseFileFilter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -190,7 +189,8 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
                 }
             }
         }
-        return lists;
+        return lists.stream().sorted(Comparator.comparing(PanelTreeNodeVo::getCreateTime)).collect(
+            Collectors.toList());
     }
 
 
@@ -271,7 +271,8 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
                 }
             }
         }
-        return lists;
+        return lists.stream().sorted(Comparator.comparing(PanelTreeNodeVo::getCreateTime)).collect(
+            Collectors.toList());
     }
 
     @Override
@@ -327,7 +328,8 @@ public class InstrumentPanelTreeServiceImpl extends ServiceImpl<InstrumentPanelT
                 }
             }
         }
-        return lists;
+        return lists.stream().sorted(Comparator.comparing(PanelTreeNodeVo::getCreateTime)).collect(
+            Collectors.toList());
     }
 
     @Override