【CHG】字符转换

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbBlqController.java

@@ -9,6 +9,7 @@ import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import com.railway.common.utils.DateUtils;
+import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
 import io.swagger.annotations.Api;
@@ -134,17 +135,17 @@ public class BusJcbBlqController extends BaseController {
         params.put("${wd}", info.getTemperature());
         params.put("${jcrq}", DateUtils.parseCheckDate(info.getCheckDate()));
         params.put("${jcr}", info.getCheckUser());
-        params.put("${tjwzBlqtjazsp}", info.getTjwzBlqtjazsp().equals("1") ? "√" : "×");
-        params.put("${tjwzWxs}", info.getTjwzWxs().equals("1") ? "√" : "×");
-        params.put("${tjwzGblsljjg}", info.getTjwzGblsljjg().equals("1") ? "√" : "×");
-        params.put("${blqjyzBlqjzcjyzcszzt}", info.getBlqjyzBlqjzcjyzcszzt().equals("1") ? "√" : "×");
-        params.put("${blqjyzBmqjazlg}", info.getBlqjyzBmqjazlg().equals("1") ? "√" : "×");
-        params.put("${blqyxBlqyxwssdg}", info.getBlqyxBlqyxwssdg().equals("1") ? "√" : "×");
+        params.put("${tjwzBlqtjazsp}", StringUtils.yesOrNo(info.getTjwzBlqtjazsp()));
+        params.put("${tjwzWxs}", StringUtils.yesOrNo(info.getTjwzWxs()));
+        params.put("${tjwzGblsljjg}", StringUtils.yesOrNo(info.getTjwzGblsljjg()));
+        params.put("${blqjyzBlqjzcjyzcszzt}", StringUtils.yesOrNo(info.getBlqjyzBlqjzcjyzcszzt()));
+        params.put("${blqjyzBmqjazlg}", StringUtils.yesOrNo(info.getBlqjyzBmqjazlg()));
+        params.put("${blqyxBlqyxwssdg}", StringUtils.yesOrNo(info.getBlqyxBlqyxwssdg()));
         params.put("${blqyxGycyxdjdtdtzxjl}", info.getBlqyxGycyxdjdtdtzxjl());
-        params.put("${tlqZtlhwpslh}", info.getTlqZtlhwpslh().equals("1") ? "√" : "×");
+        params.put("${tlqZtlhwpslh}", StringUtils.yesOrNo(info.getTlqZtlhwpslh()));
         params.put("${jsqDzjs}", info.getJsqDzjs());
         params.put("${blqjdztJddz}", info.getBlqjdztJddz());
-        params.put("${sbzt}", info.getSbzt().equals("1") ? "合格" : "不合格");
+        params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
         params.put("${confirmUser}", info.getConfirmUser());
         params.put("${czwt}", info.getCzwt());
 

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbDmcgyqController.java

@@ -7,6 +7,7 @@ import com.railway.business.catenary.service.IBusJcbDmcgyqService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
+import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
 import io.swagger.annotations.Api;
@@ -128,18 +129,18 @@ public class BusJcbDmcgyqController extends BaseController {
         params.put("${wendu}", info.getTemperature());
         params.put("${zzhfw}", info.getPillarArea().toString());
         params.put("${xingbie}", info.getXingbie());
-        params.put("${dgqwgAzlg}", info.getDgqwgAzlg().equals("1") ? "√" : "×");
-        params.put("${dgqwgWzws}", info.getDgqwgWzws().equals("1") ? "√" : "×");
-        params.put("${dgqwgBmqj}", info.getDgqwgBmqj().equals("1") ? "√" : "×");
-        params.put("${bspwgBsqx}", info.getBspwgBsqx().equals("1") ? "√" : "×");
-        params.put("${bspwgAzlg}", info.getBspwgAzlg().equals("1") ? "√" : "×");
+        params.put("${dgqwgAzlg}", StringUtils.yesOrNo(info.getDgqwgAzlg()));
+        params.put("${dgqwgWzws}", StringUtils.yesOrNo(info.getDgqwgWzws()));
+        params.put("${dgqwgBmqj}", StringUtils.yesOrNo(info.getDgqwgBmqj()));
+        params.put("${bspwgBsqx}", StringUtils.yesOrNo(info.getBspwgBsqx()));
+        params.put("${bspwgAzlg}", StringUtils.yesOrNo(info.getBspwgAzlg()));
         params.put("${dgqclG1}", info.getDgqclG1().toString());
         params.put("${dgqclG2}", info.getDgqclG2().toString());
         params.put("${dgqclG3}", info.getDgqclG3().toString());
         params.put("${dgqclG4}", info.getDgqclG4().toString());
         params.put("${jianchariqi}", info.getCheckDate());
         params.put("${jcr}", info.getCheckUser());
-        params.put("${sbzt}", info.getSbzt().equals("1") ? "合格" : "不合格");
+        params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
         params.put("${qrr}", info.getConfirmUser());
         params.put("${czwt}", info.getCzwt());
 

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbFdfxjyqController.java

@@ -8,6 +8,7 @@ import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import com.railway.common.utils.DateUtils;
+import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
 import io.swagger.annotations.Api;
@@ -141,19 +142,19 @@ public class BusJcbFdfxjyqController extends BaseController {
         params.put("${pointG}", info.getPointG().toString());
         params.put("${fcd}", info.getFcd().toString());
         params.put("${fddmpsd}", info.getFddmpsd().toString());
-        params.put("${jybjFdjyqzjyzt}", info.getJybjFdjyqzjyzt().equals("1")?"√":"×");
-        params.put("${jybjClsjyzzt}", info.getJybjClsjyzzt().equals("1")?"√":"×");
-        params.put("${lbjztLs}", info.getLbjztLs().equals("1")?"√":"×");
-        params.put("${lbjztXdx}", info.getLbjztXdx().equals("1")?"√":"×");
-        params.put("${lbjztPhzj}", info.getLbjztPhzj().equals("1")?"√":"×");
-        params.put("${lbjztJcxjt}", info.getLbjztJcxjt().equals("1")?"√":"×");
-        params.put("${lbjztXhj}", info.getLbjztXhj().equals("1")?"√":"×");
-        params.put("${sbzt}", info.getSbzt().equals("0") ? "合格" : "不合格");
+        params.put("${jybjFdjyqzjyzt}", StringUtils.yesOrNo(info.getJybjFdjyqzjyzt()));
+        params.put("${jybjClsjyzzt}", StringUtils.yesOrNo(info.getJybjClsjyzzt()));
+        params.put("${lbjztLs}", StringUtils.yesOrNo(info.getLbjztLs()));
+        params.put("${lbjztXdx}", StringUtils.yesOrNo(info.getLbjztXdx()));
+        params.put("${lbjztPhzj}", StringUtils.yesOrNo(info.getLbjztPhzj()));
+        params.put("${lbjztJcxjt}", StringUtils.yesOrNo(info.getLbjztJcxjt()));
+        params.put("${lbjztXhj}", StringUtils.yesOrNo(info.getLbjztXhj()));
+        params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
         params.put("${xlfdXlpd}", info.getXlfdXlpd().toString());
         params.put("${xlfdWgdg}", info.getXlfdWgdg().toString());
         params.put("${xlfdFdsxlqj}", info.getXlfdFdsxlqj().toString());
         params.put("${xlfdFdczxlqj}", info.getXlfdFdczxlqj().toString());
-        params.put("${sdgjcztSddg}", info.getSdgjcztSddg().equals("1")?"√":"×");
+        params.put("${sdgjcztSddg}", StringUtils.yesOrNo(info.getSdgjcztSddg()));
         params.put("${qrr}", info.getConfirmUser());
         //填充图片信息
         Map<String,Object> header = new HashMap<>();

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbGlkgController.java

@@ -8,6 +8,7 @@ import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
 import com.railway.common.utils.DateUtils;
+import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
 import io.swagger.annotations.Api;
@@ -16,7 +17,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import javax.validation.Valid;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -126,36 +126,36 @@ public class BusJcbGlkgController extends BaseController {
         params.put("${qj}", info.getStationName());
         params.put("${wd}", info.getTemperature());
         params.put("${jcrq}", DateUtils.parseCheckDate(info.getCheckDate()));
-        params.put("${jgxA}", info.getJgxA().equals("1") ? "√" : "×");
-        params.put("${jgxB}", info.getJgxB().equals("1") ? "√" : "×");
-        params.put("${jgxC}", info.getJgxC().equals("1") ? "√" : "×");
-        params.put("${qdzzA}", info.getQdzzA().equals("1") ? "√" : "×");
-        params.put("${cdgA}", info.getCdgA().equals("1") ? "√" : "×");
-        params.put("${cdgB}", info.getCdgB().equals("1") ? "√" : "×");
-        params.put("${cdgC}", info.getCdgC().equals("1") ? "√" : "×");
-        params.put("${gbA}", info.getGbA().equals("1") ? "√" : "×");
-        params.put("${ctztA}", info.getCtztA().equals("1") ? "√" : "×");
-        params.put("${ctmtztA}", info.getCtmtztA().equals("1") ? "√" : "×");
-        params.put("${hjkztA}", info.getHjkztA().equals("1") ? "√" : "×");
-        params.put("${zcjyzztA}", info.getZcjyzztA().equals("1") ? "√" : "×");
-        params.put("${yxztA}", info.getYxztA().equals("1") ? "√" : "×");
-        params.put("${yxztB}", info.getYxztB().equals("1") ? "√" : "×");
-        params.put("${yxztC}", info.getYxztC().equals("1") ? "√" : "×");
-        params.put("${swyx1Lcz}", StringUtils.isNoneBlank(info.getSwyx1Lcz()) ? info.getSwyx1Lcz() : "/");
-        params.put("${swyx1Dg}", StringUtils.isNoneBlank(info.getSwyx1Dg()) ? info.getSwyx1Dg() : "/");
-        params.put("${swyx2Lcz}", StringUtils.isNoneBlank(info.getSwyx2Lcz()) ? info.getSwyx2Lcz() : "/");
-        params.put("${swyx2Dg}", StringUtils.isNoneBlank(info.getSwyx2Dg()) ? info.getSwyx2Dg() : "/");
-        params.put("${zxjl}", StringUtils.isNoneBlank(info.getZxjl()) ? info.getZxjl() : "/");
-        params.put("${xjztA}", info.getXjztA().equals("1") ? "√" : "×");
-        params.put("${xjztB}", info.getXjztB().equals("1") ? "√" : "×");
-        params.put("${sdfhsyA}", info.getSdfhsyA().equals("1") ? "√" : "×");
-        params.put("${ddfhsyA}", info.getDdfhsyA().equals("1") ? "√" : "×");
-        params.put("${ydfhsyA}", info.getYdfhsyA().equals("1") ? "√" : "×");
-        params.put("${kgztjdztA}", info.getKgztjdztA().equals("1") ? "√" : "×");
-        params.put("${kgztjdztDzz}", StringUtils.isNoneBlank(info.getKgztjdztDzz()) ? info.getKgztjdztDzz() : "/");
-        params.put("${kgjgxjdztA}", info.getKgjgxjdztA().equals("1") ? "√" : "×");
-        params.put("${kgjgxjdztDzz}", StringUtils.isNoneBlank(info.getKgjgxjdztDzz()) ? info.getKgjgxjdztDzz() : "/");
-        params.put("${sbzt}", info.getSbzt().equals("1") ? "合格" : "不合格");
+        params.put("${jgxA}", StringUtils.yesOrNo(info.getJgxA()));
+        params.put("${jgxB}", StringUtils.yesOrNo(info.getJgxB()));
+        params.put("${jgxC}", StringUtils.yesOrNo(info.getJgxC()));
+        params.put("${qdzzA}", StringUtils.yesOrNo(info.getQdzzA()));
+        params.put("${cdgA}", StringUtils.yesOrNo(info.getCdgA()));
+        params.put("${cdgB}", StringUtils.yesOrNo(info.getCdgB()));
+        params.put("${cdgC}", StringUtils.yesOrNo(info.getCdgC()));
+        params.put("${gbA}", StringUtils.yesOrNo(info.getGbA()));
+        params.put("${ctztA}", StringUtils.yesOrNo(info.getCtztA()));
+        params.put("${ctmtztA}", StringUtils.yesOrNo(info.getCtmtztA()));
+        params.put("${hjkztA}", StringUtils.yesOrNo(info.getHjkztA()));
+        params.put("${zcjyzztA}", StringUtils.yesOrNo(info.getZcjyzztA()));
+        params.put("${yxztA}", StringUtils.yesOrNo(info.getYxztA()));
+        params.put("${yxztB}", StringUtils.yesOrNo(info.getYxztB()));
+        params.put("${yxztC}", StringUtils.yesOrNo(info.getYxztC()));
+        params.put("${swyx1Lcz}", StringUtils.getSlash(info.getSwyx1Lcz()));
+        params.put("${swyx1Dg}", StringUtils.getSlash(info.getSwyx1Dg()));
+        params.put("${swyx2Lcz}", StringUtils.getSlash(info.getSwyx2Lcz()));
+        params.put("${swyx2Dg}", StringUtils.getSlash(info.getSwyx2Dg()));
+        params.put("${zxjl}", StringUtils.getSlash(info.getZxjl()));
+        params.put("${xjztA}", StringUtils.yesOrNo(info.getXjztA()));
+        params.put("${xjztB}", StringUtils.yesOrNo(info.getXjztB()));
+        params.put("${sdfhsyA}", StringUtils.yesOrNo(info.getSdfhsyA()));
+        params.put("${ddfhsyA}", StringUtils.yesOrNo(info.getDdfhsyA()));
+        params.put("${ydfhsyA}", StringUtils.yesOrNo(info.getYdfhsyA()));
+        params.put("${kgztjdztA}", StringUtils.yesOrNo(info.getKgztjdztA()));
+        params.put("${kgztjdztDzz}", StringUtils.getSlash(info.getKgztjdztDzz()));
+        params.put("${kgjgxjdztA}", StringUtils.yesOrNo(info.getKgjgxjdztA()));
+        params.put("${kgjgxjdztDzz}", StringUtils.getSlash(info.getKgjgxjdztDzz()));
+        params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
         params.put("${jcr}", info.getCheckUser());
         params.put("${qrr}", info.getConfirmUser());
         params.put("${czwt}", info.getCzwt());

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbJcxcController.java

@@ -7,6 +7,7 @@ import com.railway.business.catenary.service.IBusJcbJcxcService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
 import com.railway.common.core.page.TableDataInfo;
+import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
 import io.swagger.annotations.Api;
@@ -139,22 +140,22 @@ public class BusJcbJcxcController extends BaseController {
         params.put("${qglcz}", info.getQglcz().toString());
         params.put("${ngj}", info.getNgj().toString());
         params.put("${plz}", info.getPlz().toString());
-        params.put("${xcxzgazlg}", info.getXcxzgazlg().equals("1") ? "√" : "×");
-        params.put("${hdjx}", info.getHdjx().equals("1") ? "√" : "×");
-        params.put("${fhzzsq}", info.getFhzzsq().equals("1") ? "√" : "×");
-        params.put("${dqssxx}", info.getDqssxx().equals("1") ? "√" : "×");
-        params.put("${lswst}", info.getLswst().equals("1") ? "√" : "×");
-        params.put("${xzgldydx}", info.getXzgldydx().equals("1") ? "√" : "×");
-        params.put("${dxztlh}", info.getDxztlh().equals("1") ? "√" : "×");
+        params.put("${xcxzgazlg}", StringUtils.yesOrNo(info.getXcxzgazlg()));
+        params.put("${hdjx}", StringUtils.yesOrNo(info.getHdjx()));
+        params.put("${fhzzsq}", StringUtils.yesOrNo(info.getFhzzsq()));
+        params.put("${dqssxx}", StringUtils.yesOrNo(info.getDqssxx()));
+        params.put("${lswst}", StringUtils.yesOrNo(info.getLswst()));
+        params.put("${xzgldydx}", StringUtils.yesOrNo(info.getXzgldydx()));
+        params.put("${dxztlh}", StringUtils.yesOrNo(info.getDxztlh()));
         params.put("${czjj}", info.getCzjj().toString());
         params.put("${lgzzgc}", info.getLgzzgc().toString());
         params.put("${gzyfzgc}", info.getGzyfzgc().toString());
-        params.put("${wxj}", info.getWxj().equals("1") ? "√" : "×");
-        params.put("${hddxxjzt}", info.getHddxxjzt().equals("1") ? "√" : "×");
-        params.put("${jcdxzt}", info.getJcdxzt().equals("1") ? "√" : "×");
-        params.put("${dljxzt}", info.getDljxzt().equals("1") ? "√" : "×");
+        params.put("${wxj}", StringUtils.yesOrNo(info.getWxj()));
+        params.put("${hddxxjzt}", StringUtils.yesOrNo(info.getHddxxjzt()));
+        params.put("${jcdxzt}", StringUtils.yesOrNo(info.getJcdxzt()));
+        params.put("${dljxzt}", StringUtils.yesOrNo(info.getDljxzt()));
         params.put("${jcr}", info.getCheckUser());
-        params.put("${sbzt}", info.getSbzt().equals("1") ? "合格" : "不合格");
+        params.put("${sbzt}", StringUtils.YES_VALUE.equals(info.getSbzt()) ? "合格" : "不合格");
         params.put("${qrr}", info.getConfirmUser());
         params.put("${czwt}", info.getCzwt());
 

railway-common/src/main/java/com/railway/common/utils/StringUtils.java

@@ -27,6 +27,19 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
    */
   private static final char SEPARATOR = '_';
 
+  private static final String YES = "√";
+  public static final String YES_VALUE = "1";
+  private static final String NO = "×";
+  private static final String SLASH = "/";
+
+  public static String yesOrNo(String value){
+    return YES_VALUE.equals(value) ? YES : NO;
+  }
+
+  public static String getSlash(String value){
+    return StringUtils.isNoneBlank(value) ? value : SLASH;
+  }
+
   /**
    * 获取参数不为空值
    *

railway-system/src/main/java/com/railway/system/service/impl/SysMenuServiceImpl.java

@@ -168,7 +168,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
     List<RouterVo> routers = new LinkedList<>();
     for (SysMenu menu : menus) {
       RouterVo router = new RouterVo();
-      router.setHidden("1".equals(menu.getVisible()));
+      router.setHidden(StringUtils.YES_VALUE.equals(menu.getVisible()));
       router.setName(getRouteName(menu));
       router.setPath(getRouterPath(menu));
       router.setComponent(getComponent(menu));