2024-10-28 常用取水口单独建表，按照使用时间和使用次数排序

zhubaomin

2024-10-28 cef410f571a2960e979ca9383d9c8dd01ecc862c

 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealAlarmStatus.java

@@ -109,19 +109,19 @@
            po.intakeId = controller==null?null:controller.getIntakeId() ;
            po.rtuAddr = rtuAddr ;
            po.valueFrom(dV1_0_1, rtuDt, alarmVo, stateVo);
            if(alarmVo.hasAlarm()){
            if(alarmVo.hasAlarmExcludeLoss()){
                po.sendMsTime = System.currentTimeMillis() ;
                this.sendMessage(controller, alarmVo);
            }
            sv.saveRmAlarmStateLast(po) ;
        }else{
            if(po.sendMsTime == null){
                if(alarmVo.hasAlarm()) {
                if(alarmVo.hasAlarmExcludeLoss()) {
                    po.sendMsTime = System.currentTimeMillis();
                    this.sendMessage(controller, alarmVo);
                }
            }else{
                if(alarmVo.hasAlarm()){
                if(alarmVo.hasAlarmExcludeLoss()){
                    Long now = System.currentTimeMillis() ;
                    if(((now - po.sendMsTime) / (1000 * 60)) > ServerProperties.sendDingDingAlarmMsInterval){
                        //大于规定的间隔时间
@@ -171,7 +171,7 @@
     * @param alarmVo
     */
    private void sendMessage(PrController controller, DataAlarmVo alarmVo){
        String ms = "取水口“" + controller.getIntakeName() + "”产生报警：" + alarmVo.alarmContent() ;
        String ms = "取水口“" + controller.getIntakeName() + "”产生报警：" + alarmVo.alarmContentExcludeLoss() ;
        try{
            SendMsCache.cacheMs(ms);
        }catch (Exception e){