增加广西来宾气体背景图

CZT

2023-08-25 4552e5898e56d6f46d560f463669ae96a22c3784

增加广西来宾气体背景图

 igds-core/src/main/java/com/ld/igds/data/ConfigGasImg.java

@@ -22,8 +22,9 @@
public class ConfigGasImg {

    /**
     * 图片的封装规则：仓库编码.img.png --照片
     * 图片的封装规则：分库编码.img.png --默认照片
     * gas.mapImg.5318_001.img=5318_001.png
     * 图片的封装规则：gas.mapImg.companyId_仓库编码.img.png --照片
     * 图片的封装规则：gas.mapImg.companyId_分库编码.img.png --默认照片
     */
    private Map<String, GasImg> mapImg;

@@ -39,12 +40,16 @@
        Map<String, GasImg> result = new HashMap<>();
        Map<String, GasImg> all = this.getMapImg();
        if (null == depotList || null == all) return result;
        String companyId = depotList.get(0).getCompanyId();
        GasImg temp;
        for (Depot d : depotList) {
            temp = all.get(d.getId());
            //先从配置中获取
            temp = all.get(companyId + "_" + d.getId());

            if (null == temp) {
                temp = all.get(deptId);
            }

            result.put(d.getId(), temp);
        }
        return result;

 igds-web/src/main/resources/gas-conf.properties

@@ -4,20 +4,20 @@
gas.mapImg.5000_001.img=5000_001.png

## 5016-\u5927\u6E7E\u533A\u6C14\u4F53\uFF0C\u53EA\u670910\u4E2A\u5E73\u65B9\u4ED3\u6709\u6C14\u4F53
gas.mapImg.3P01.img=5016_001.png
gas.mapImg.3P02.img=5016_001.png
gas.mapImg.3P03.img=5016_001.png
gas.mapImg.3P04.img=5016_001.png
gas.mapImg.3P05.img=5016_001.png
gas.mapImg.3P06.img=5016_001.png
gas.mapImg.3P07.img=5016_001.png
gas.mapImg.3P08.img=5016_001.png
gas.mapImg.3P09.img=5016_001.png
gas.mapImg.3P10.img=5016_001.png
gas.mapImg.5016_3P01.img=5016_001.png
gas.mapImg.5016_3P02.img=5016_001.png
gas.mapImg.5016_3P03.img=5016_001.png
gas.mapImg.5016_3P04.img=5016_001.png
gas.mapImg.5016_3P05.img=5016_001.png
gas.mapImg.5016_3P06.img=5016_001.png
gas.mapImg.5016_3P07.img=5016_001.png
gas.mapImg.5016_3P08.img=5016_001.png
gas.mapImg.5016_3P09.img=5016_001.png
gas.mapImg.5016_3P10.img=5016_001.png

## 5303-\u4E0A\u6D77\u5609\u5B9A\uFF0C\u53EA\u67092\u4E2A\u4ED3\u6709\u6C14\u4F53
gas.mapImg.91310114703439394M0010009001.img=009001.png
gas.mapImg.91310114703439394M0010009002.img=009002.png
gas.mapImg.5303_91310114703439394M0010009001.img=009001.png
gas.mapImg.5303_91310114703439394M0010009002.img=009002.png

## 5317-\u6F6E\u9633
gas.mapImg.5317_001.img=5317_001.png
@@ -29,4 +29,20 @@
gas.mapImg.5013_001.img=5013_001.png

## 5318-\u6F6E\u9633
gas.mapImg.5318_001.img=5318_001.png
gas.mapImg.5318_001.img=5318_001.png

## 5328  广西来宾
gas.mapImg.5328_0P18.img=5328_001_7.png
gas.mapImg.5328_0P19.img=5328_001_7.png
gas.mapImg.5328_0P20.img=5328_001_7.png
gas.mapImg.5328_0P21.img=5328_001_5.png
gas.mapImg.5328_0P22.img=5328_001_4.png
gas.mapImg.5328_0P23.img=5328_001_10.png
gas.mapImg.5328_0P24.img=5328_001_10.png
gas.mapImg.5328_0P25.img=5328_001_7.png
gas.mapImg.5328_0P26.img=5328_001_7.png
gas.mapImg.5328_0P27.img=5328_001_7.png
gas.mapImg.5328_0P28.img=5328_001_5.png
gas.mapImg.5328_0P29.img=5328_001_5.png
gas.mapImg.5328_0P30.img=5328_001_10.png
gas.mapImg.5328_0P31.img=5328_001_10.png

 igds-web/src/main/resources/lib/modbus4j-3.1.0.jar

Binary files differ

 igds-web/src/main/resources/static/img/aerial-5325_001.png

 igds-web/src/main/resources/static/img/gas/5328/5328_001_10.png

 igds-web/src/main/resources/static/img/gas/5328/5328_001_4.png

 igds-web/src/main/resources/static/img/gas/5328/5328_001_5.png

 igds-web/src/main/resources/static/img/gas/5328/5328_001_7.png