优化调整上海接口

CZT

2023-10-27 65b168669d6ad76c09b56b58e34be360c530e2d3

优化调整上海接口

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java

@@ -80,6 +80,9 @@

                sh2023Api1311.setAzwz(sysData.getName());
                sh2023Api1311.setAzwzlx(StringUtils.isEmpty(sysData.getSpdwlx()) ? "7" : sysData.getSpdwlx());
                if(sh2023Api1311.getAzwzlx().length() == 1){
                    sh2023Api1311.setAzwzlx("0" + sh2023Api1311.getAzwzlx());
                }
                if ("12".equals(sh2023Api1311.getAzwzlx()) || "13".equals(sh2023Api1311.getAzwzlx())
                        || "14".equals(sh2023Api1311.getAzwzlx()) || "15".equals(sh2023Api1311.getAzwzlx())) {
                    sh2023Api1311.setAzwzlx("99");

 src/main/java/com/fzzy/otherview/sh2023/ShApi1311.view.xml

@@ -113,40 +113,40 @@
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1-出入口</Property>
                <Property name="key">01</Property>
                <Property name="value">01-出入口</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2-扦样机</Property>
                <Property name="key">02</Property>
                <Property name="value">02-扦样机</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">3-化验室</Property>
                <Property name="key">03</Property>
                <Property name="value">03-化验室</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">4-结算室</Property>
                <Property name="key">04</Property>
                <Property name="value">04-结算室</Property>
              </Entity>
              <Entity>
                <Property name="key">5</Property>
                <Property name="value">5-地磅室</Property>
                <Property name="key">05</Property>
                <Property name="value">05-地磅室</Property>
              </Entity>
              <Entity>
                <Property name="key">6</Property>
                <Property name="value">6-库区主干道</Property>
                <Property name="key">06</Property>
                <Property name="value">06-库区主干道</Property>
              </Entity>
              <Entity>
                <Property name="key">7</Property>
                <Property name="value">7-仓间监控</Property>
                <Property name="key">07</Property>
                <Property name="value">07-仓间监控</Property>
              </Entity>
              <Entity>
                <Property name="key">8</Property>
                <Property name="value">8-仓内</Property>
                <Property name="key">08</Property>
                <Property name="value">08-仓内</Property>
              </Entity>
              <Entity>
                <Property name="key">9</Property>
                <Property name="value">9-药品房内外</Property>
                <Property name="key">09</Property>
                <Property name="value">09-药品房内外</Property>
              </Entity>
              <Entity>
                <Property name="key">10</Property>

 src/main/java/com/fzzy/otherview/sh2023/pr/SHApi1311PR.java

@@ -37,7 +37,7 @@
import java.util.List;

/**
 * 上海市接口-2101 检斤单
 * 上海市接口-1311 视频监控接口
 *
 * @author czt
 * @date 2023/8/17

 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java

@@ -270,10 +270,7 @@
            map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
            api1109.setWjl(JSON.toJSONString(map));
            //上海市平台文件名称规则：库区编码_业务流水号_分类码_顺序码.jpg，例如：91310114703439394M001_142211080101_GL_00.jpg
            String[] split = api1109.getWjmc().split(".");
            if (split.length == 2) {
                api1109.setWjmc(split[0] + "_00" + split[1]);
            }
            api1109.setWjmc(getWjmc(api1109.getWjmc()));
            //设置空属性为默认值
            changeObject(api1109);
            return api1109;
@@ -749,6 +746,16 @@
        return data;
    }

    private String getWjmc(String wjmc){
        if(wjmc.endsWith(".jpg")) {
            wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
        }
        if(wjmc.endsWith(".png")) {
            wjmc = wjmc.replaceAll(".png", "_00.png");
        }
        return wjmc;
    }

    /**
     * 获取财务数据json
     *