修正禁用托盘接口BUG

myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaDisabledTrayController.java

@@ -85,30 +85,28 @@ public class QisdaDisabledTrayController {
             if(Strings.isBlank(trayList)){
             if(Strings.isBlank(trayList)){
                 trayList = "";
                 trayList = "";
             }
             }
-            if(Strings.isNotBlank(trayList)){
-                Map<String,String> disableMap = new HashMap<>();
-                List<String> newDisabeldTrayList = Lists.newArrayList(trayList.split(","));
-                for (String disableInfo : newDisabeldTrayList) {
-                    String[] disableArr = disableInfo.split("=");
-                    if(disableArr.length == 2){
-                        String trayId = disableArr[0];
-                        String disableLoc = disableArr[1];
-                        disableMap.put(trayId,disableLoc);
-                        updateTrayInfo(trayId,disableLoc);
-                    }
+            Map<String,String> disableMap = new HashMap<>();
+            List<String> newDisabeldTrayList = Lists.newArrayList(trayList.split(","));
+            for (String disableInfo : newDisabeldTrayList) {
+                String[] disableArr = disableInfo.split("=");
+                if(disableArr.length == 2){
+                    String trayId = disableArr[0];
+                    String disableLoc = disableArr[1];
+                    disableMap.put(trayId,disableLoc);
+                    updateTrayInfo(trayId,disableLoc);
                 }
                 }
-                for (TrayInfo trayInfo : trayMap.values()) {
-                    String trayId = trayInfo.getTrayId();
-                    String disableLoc = disableMap.get(trayId);
-                    if(disableLoc == null){
-                        //禁用托盘未包含此托盘,如果之前已经禁用,需要解除禁用
-                        if(Strings.isNotBlank(trayInfo.getDisabledLoc())){
-                            log.info("托盘["+trayId+"]已启用,去除禁用信息["+trayInfo.getDisabledLoc()+"]");
-                            updateTrayInfo(trayId,"");
-                        }
+            }
+            for (TrayInfo trayInfo : trayMap.values()) {
+                String trayId = trayInfo.getTrayId();
+                String disableLoc = disableMap.get(trayId);
+                if(disableLoc == null){
+                    //禁用托盘未包含此托盘,如果之前已经禁用,需要解除禁用
+                    if(Strings.isNotBlank(trayInfo.getDisabledLoc())){
+                        log.info("托盘["+trayId+"]已启用,去除禁用信息["+trayInfo.getDisabledLoc()+"]");
+                        updateTrayInfo(trayId,"");
                     }
                     }
-
                 }
                 }
+
             }
             }
             return ResultBean.newOkResult("");
             return ResultBean.newOkResult("");
         }catch(Exception e){
         }catch(Exception e){

myproject/src/main/webapp/WEB-INF/pages/updateHistory.jsp

@@ -12,6 +12,23 @@
 <div class="row">
 <div class="row">
     <div class="col-md-12">
     <div class="col-md-12">
         <ul class="timeline">
         <ul class="timeline">
+            <li class="timeline-yellow">
+                <div class="timeline-time">
+                    <span class="date">2023</span>
+                    <span class="time">2-8</span>
+                </div>
+                <div class="timeline-icon">
+                    <i class="fa fa-clock-o"></i>
+                </div>
+                <div class="timeline-body">
+                    <h2>版本: V2023020810</h2>
+                    <div class="timeline-content">
+                        <ul>
+                            <li>修正禁用托盘接口BUG</li>
+                        </ul>
+                    </div>
+                </div>
+            </li>
             <li class="timeline-grey">
             <li class="timeline-grey">
                 <div class="timeline-time">
                 <div class="timeline-time">
                     <span class="date">2023</span>
                     <span class="date">2023</span>

myproject/src/main/webapp/decorators/metro.jsp

@@ -239,7 +239,7 @@
   <div class="page-footer-inner">
   <div class="page-footer-inner">
     2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
     2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
   </div>
   </div>
-  <span class="right" style="color: #a3a3a3;">Version: V2023020210</span>
+  <span class="right" style="color: #a3a3a3;">Version: V2023020810</span>
   <div class="scroll-to-top">
   <div class="scroll-to-top">
     <i class="icon-arrow-up"></i>
     <i class="icon-arrow-up"></i>
   </div>
   </div>