Ver código fonte

【CHG】无交叉线岔

zhaomn 3 anos atrás
pai
commit
96e8b9b143

+ 5 - 5
railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcbWjcxcServiceImpl.java

@@ -192,10 +192,10 @@ public class BusJcbWjcxcServiceImpl extends BusJcabServiceImpl implements IBusJc
       params.put("month", jcrqArr.getMonthValue());
       params.put("day", jcrqArr.getDayOfMonth());
     }
-    params.put("jxdxzt", StringUtils.yesOrNo(info.getJcdxzt()));
-    params.put("hdxjzt", StringUtils.yesOrNo(info.getHdxjzt()));
-    params.put("wxjqzt", StringUtils.yesOrNo(info.getWxjqzt()));
-    params.put("dljzt", StringUtils.yesOrNo(info.getDljzt()));
+    params.put("jxdxzt", StringUtils.yesOrNo(!StringUtils.isTrue(info.getJcdxzt())));
+    params.put("hdxjzt", StringUtils.yesOrNo(!StringUtils.isTrue(info.getHdxjzt())));
+    params.put("wxjqzt", StringUtils.yesOrNo(!StringUtils.isTrue(info.getWxjqzt())));
+    params.put("dljzt", StringUtils.yesOrNo(!StringUtils.isTrue(info.getDljzt())));
     params.put("azzxlcz", StringUtils.bigDecimalToString(info.getAzzxlcz()));
     params.put("azzxdg", StringUtils.bigDecimalToString(info.getAzzxdg()));
     params.put("azcxlcz", StringUtils.bigDecimalToString(info.getAzcxlcz()));
@@ -250,7 +250,7 @@ public class BusJcbWjcxcServiceImpl extends BusJcabServiceImpl implements IBusJc
     } else {
       dto.setYwxj("无");
     }
-    if(StringUtils.YES_VALUE.equals(x.getDljzt())){
+    if(!StringUtils.YES_VALUE.equals(x.getDljzt())){
       dto.setDljzt("良好");
     } else {
       dto.setDljzt("故障");

+ 4 - 0
railway-common/src/main/java/com/railway/common/utils/StringUtils.java

@@ -64,6 +64,10 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     return YES_VALUE.equals(value) || NONE.equals(value) ? YES : NO;
   }
 
+  public static String yesOrNo(boolean value) {
+    return value ? YES : NO;
+  }
+
   public static String lhOrGz(String value) {
     return lhOrGz(YES_VALUE.equals(value) || NONE.equals(value));
   }