screen-manage 删除local配置文件

kaiyu

2021-07-13 f1f702f03e617ac8b49ea5fe484b41885ea83f0c

screen-manage
                 删除local配置文件

 screen-api/src/main/java/com/moral/api/kafka/consumer/SecondDataConsumer.java

@@ -29,7 +29,7 @@
@Component
public class SecondDataConsumer implements ConsumerSeekAware {

    @KafkaListener(topics = "second_data", groupId = "SecondsDataGroup3")
    @KafkaListener(topics = "second_data", groupId = "SecondsDataGroup998")
    public void listen(ConsumerRecord<String, String> record, Consumer consumer) throws Exception {
        String messageStr = record.value();
        Map<String, String> message = (Map<String, String>) JSON.parse(messageStr);
@@ -46,11 +46,14 @@
            List<Sensor> sensors = device.getVersion().getSensors();//获取型号所有因子信息
            for (Sensor sensor : sensors) {
                String code = sensor.getCode();
                String showUnit = sensor.getShowUnit();
                String showUnitKey = sensor.getShowUnitKey();
                String unitKey = sensor.getUnitKey();
                String unit = sensor.getUnit();
                String sourceData = message.get(code);
                //数据补偿
                //单位转换
                if (!unitKey.equals(showUnitKey)) {
                if (!unitKey.equals(showUnitKey)) {//如果源单位和显示单位不同，则进行单位转换
                    String formula = sensor.getFormula();
                    //如果sensor中的公式为空则从缓存中获取公式
                    if (ObjectUtils.isEmpty(formula)) {
@@ -61,13 +64,18 @@
                        }
                    }
                    //单位转换
                    UnitConvertUtils.calculate(message.get(code),formula);
                    String resultData = UnitConvertUtils.calculate(message.get(code), formula);
                    if (resultData != null) {
                        resultData+=showUnit;
                    }else{//如果转换出的数据为null，则代表缓存中也没有公式，依然使用源单位。
                        resultData = sourceData+unit;
                    }
                    resultMessgae.put(sensor.getCode(), resultData);
                } else {
                    //拼接单位
                    sourceData += showUnit;
                    resultMessgae.put(sensor.getCode(), sourceData);
                }
                //拼接单位
                String showUnit = sensor.getShowUnit();
                String value = message.get(code);
                value += showUnit;
                resultMessgae.put(sensor.getCode(), value);
            }
            resultMessgae.put("DataTime", message.get("DataTime"));
            socket.sendMessage(JSON.toJSONString(resultMessgae));

 screen-api/src/main/resources/application-local.yml

File was deleted

 screen-common/src/main/java/com/moral/util/UnitConvertUtils.java

@@ -31,7 +31,7 @@
            */
    public static String calculate(String value, String formula) {
        if(ObjectUtils.isEmpty(formula))
            return value;
            return null;
        ScriptEngine jse = new ScriptEngineManager().getEngineByName("JavaScript");
        formula = formula.replaceAll("\\{0\\}", value);
        Double result = null;