核算重构完成

fuliqi

2025-01-07 e23edcf2619ad46fd77a710fca6c21de78234bc0

 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java

@@ -23,7 +23,6 @@
    /**
     * 国标码
     */
    @TextIndexed
    private String deviceNo;

    /**
@@ -43,7 +42,6 @@
    /**
     * ip
     */
    @TextIndexed
    private String ip;

    /**
@@ -58,10 +56,10 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date setTime;


    /**
     * osd通道名
     */
    @TextIndexed
    private String osdName;
    /**
     * osd省
@@ -91,7 +89,7 @@
    /**
     * osdTimeCorrect时间是否正确
     */
    private String osdTimeCorrectText;
    private Boolean osdTimeError;

    /**
     * osd通道名是否正确   1正确  0未知  -1错
@@ -99,9 +97,9 @@
    private Integer osdNameCorrect;

    /**
     * osd通道名是否正确   1正确  0未知  -1错
     * osd通道名是否正确
     */
    private String osdNameCorrectText;
    private Boolean osdNameError;

    /**
     * osd省是否正确
@@ -111,7 +109,7 @@
    /**
     * osd省是否正确
     */
    private String osdProvinceCorrectText;
    private Boolean osdProvinceError;

    /**
     * osd市是否正确
@@ -121,7 +119,7 @@
    /**
     * osd市是否正确
     */
    private String osdCityCorrectText;
    private Boolean osdCityError;

    /**
     * osd区是否正确
@@ -131,7 +129,7 @@
    /**
     * osd区是否正确
     */
    private String osdPartCorrectText;
    private Boolean osdPartError;
    /**
     * osd左下角是否正确
     */
@@ -150,26 +148,21 @@
        return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect());
    }

    public static void getText(OsdCheckResult result) {
        if(ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect())) result.setOsdTimeCorrectText("正确");
        else if(ApiConstants.OSD_Error.equals(result.getOsdTimeCorrect())) result.setOsdTimeCorrectText("错误");
        else { result.setOsdTimeCorrectText("未知"); }
    public static void getError(OsdCheckResult result) {
        if(ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect())) result.setOsdTimeError(Boolean.FALSE);
        else {result.setOsdTimeError(Boolean.TRUE); }

        if(ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect())) result.setOsdNameCorrectText("正确");
        else if(ApiConstants.OSD_Error.equals(result.getOsdNameCorrect())) result.setOsdNameCorrectText("错误");
        else { result.setOsdNameCorrectText("未知"); }
        if(ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect())) result.setOsdNameError(Boolean.FALSE);
        else { result.setOsdNameError(Boolean.TRUE); }

        if(ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceCorrectText("正确");
        else if(ApiConstants.OSD_Error.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceCorrectText("错误");
        else { result.setOsdProvinceCorrectText("未知"); }
        if(ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect())) result.setOsdProvinceError(Boolean.FALSE);
        else { result.setOsdProvinceError(Boolean.TRUE); }

        if(ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect())) result.setOsdCityCorrectText("正确");
        else if(ApiConstants.OSD_Error.equals(result.getOsdCityCorrect())) result.setOsdCityCorrectText("错误");
        else { result.setOsdCityCorrectText("未知"); }
        if(ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect())) result.setOsdCityError(Boolean.FALSE);
        else { result.setOsdCityError(Boolean.TRUE); }

        if(ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("正确");
        else if(ApiConstants.OSD_Error.equals(result.getOsdPartCorrect())) result.setOsdPartCorrectText("错误");
        else { result.setOsdPartCorrectText("未知"); }
        if(ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect())) result.setOsdPartError(Boolean.FALSE);
        else { result.setOsdPartError(Boolean.TRUE); }

        if(DeviceType.DH.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.DH.getDesc());
        else if(DeviceType.HK.getType().equals(result.getDeviceBrand())) result.setDeviceBrandStr(DeviceType.HK.getDesc());