fengxiang
2018-04-17 ac5c0ea75ed3606ff675c70c4456241495c2c8a9
组织报警间隔时间
4 files modified
120 ■■■■ changed files
src/main/java/com/moral/common/util/StringUtils.java 51 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/entity/alarm/AlarmMode.java 1 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java 10 ●●●● patch | view | raw | blame | history
src/main/resources/system/alarmLevels.json 58 ●●●●● patch | view | raw | blame | history
src/main/java/com/moral/common/util/StringUtils.java
@@ -81,4 +81,55 @@
        return result;
    }
    /**
     *  中英文字符长度控制
     * @param str
     * @param maxLength
     * @return
     */
    public static String subStringCN(final String str, final int maxLength) {
        if (str == null) {
            return str;
        }
        String suffix = "...";
        int suffixLen = suffix.length();
        final StringBuffer sbuffer = new StringBuffer();
        final char[] chr = str.trim().toCharArray();
        int len = 0;
        for (int i = 0; i < chr.length; i++) {
            if (chr[i] >= 0xa1) {
                len += 2;
            } else {
                len++;
            }
        }
        if(len<=maxLength){
            return str;
        }
        len = 0;
        for (int i = 0; i < chr.length; i++) {
            if (chr[i] >= 0xa1) {
                len += 2;
                if (len + suffixLen > maxLength) {
                    break;
                }else {
                    sbuffer.append(chr[i]);
                }
            } else {
                len++;
                if (len + suffixLen > maxLength) {
                    break;
                }else {
                    sbuffer.append(chr[i]);
                }
            }
        }
        sbuffer.append(suffix);
        return sbuffer.toString();
    }
}
src/main/java/com/moral/entity/alarm/AlarmMode.java
@@ -10,6 +10,7 @@
@Data
public class AlarmMode {
    private boolean enable;
    private Long interval;
    private List<AlarmStyle> level1;
    private List<AlarmStyle> level2;
    private List<AlarmStyle> level3;
src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
@@ -47,7 +47,7 @@
    @Resource
    AlarmConfigMapper alarmConfigMapper;
    @Override
    public Optional queryValueByOrganizationId(int organizationId) {
    public Optional<AlarmConfigValue> queryValueByOrganizationId(int organizationId) {
        String key = RedisUtils.getAlarmKey(organizationId);
        AlarmConfigValue alarmConfigValue = redisUtils.get(key,new TypeReference<AlarmConfigValue>(){});
        if(alarmConfigValue==null) {
@@ -58,13 +58,17 @@
                alarmConfigValue = getDefaultAlarmConfigValue();
            }
        }
        return Optional.of(alarmConfigValue);
        return Optional.ofNullable(alarmConfigValue);
    }
    @Override
    public Optional<AlarmConfig> queryByOrganizationId(int organizationId) {
        AlarmConfig alarmConfig = alarmConfigMapper.selectByOrganizationId(organizationId);
        return Optional.of(alarmConfig);
        if(alarmConfig==null){
            alarmConfig = new AlarmConfig();
            alarmConfig.setValue(getDefaultAlarmConfigValue());
        }
        return Optional.ofNullable(alarmConfig);
    }
    @Override
src/main/resources/system/alarmLevels.json
@@ -1,6 +1,7 @@
{
    "alarmMode": {
        "enable": 0,
    "interval":1440,
        "level1": [],
        "level2": [],
        "level3": []
@@ -13,7 +14,8 @@
                115,
                250
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e2": {
            "enable": 1,
@@ -22,7 +24,8 @@
                250,
                420
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e3": {
            "enable": 0,
@@ -31,7 +34,8 @@
                30000,
                40000
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e4": {
            "enable": 0,
@@ -40,7 +44,8 @@
                75,
                100
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e5": {
            "enable": 0,
@@ -49,7 +54,8 @@
                0.02,
                0.05
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e6": {
            "enable": 0,
@@ -58,7 +64,8 @@
                100,
                160
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e7": {
            "enable": 0,
@@ -67,7 +74,8 @@
                30,
                40
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e8": {
            "enable": 0,
@@ -76,7 +84,8 @@
                40,
                50
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e9": {
            "enable": 0,
@@ -85,7 +94,8 @@
                0.02,
                0.03
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e10": {
            "enable": 1,
@@ -94,7 +104,8 @@
                14,
                36
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e11": {
            "enable": 1,
@@ -103,7 +114,8 @@
                475,
                1600
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e12": {
            "enable": 0,
@@ -112,7 +124,8 @@
                15000,
                20000
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e13": {
            "enable": 0,
@@ -121,7 +134,8 @@
                90,
                120
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e14": {
            "enable": 0,
@@ -130,7 +144,8 @@
                200,
                300
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e15": {
            "enable": 1,
@@ -139,7 +154,8 @@
                300,
                800
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e16": {
            "enable": 1,
@@ -148,7 +164,8 @@
                180,
                565
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e17": {
            "enable": 0,
@@ -157,7 +174,8 @@
                3,
                5
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e18": {
            "enable": 0,
@@ -166,7 +184,8 @@
                6,
                8
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        },
        "e19": {
            "enable": 0,
@@ -175,7 +194,8 @@
                4000,
                5000
            ],
            "degression": null
      "degressEnable": 0,
      "degression": [0,0,0]
        }
    }
}