历史详细数据问题修改

jeecg-module-interlock/src/main/java/org/jeecg/modules/binlog/PostgreSQLClient.java

@@ -200,6 +200,24 @@ public class PostgreSQLClient implements ApplicationRunner {
                                 }else{//故障
                                     interlockDetailHistory.setControlSystemStatusName(base.getControlSystemStatusAbnormalName());//当前控制系统状态的名称
                                 }
+                                //输入卡件状态名称写入
+                                if(interlockDetailHistory.getInputStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                                    interlockDetailHistory.setInputStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+                                }else{//故障
+                                    interlockDetailHistory.setInputStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+                                }
+                                //输出卡件状态名称写入
+                                if(interlockDetailHistory.getOutputStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                                    interlockDetailHistory.setOutputStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+                                }else{//故障
+                                    interlockDetailHistory.setOutputStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+                                }
+                                //MP卡件状态名称写入
+                                if(interlockDetailHistory.getMpStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                                    interlockDetailHistory.setMpStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+                                }else{//故障
+                                    interlockDetailHistory.setMpStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+                                }
                                 detailHistoryService.save(interlockDetailHistory);
                             }
 
@@ -263,6 +281,24 @@ public class PostgreSQLClient implements ApplicationRunner {
                             }else{//故障
                                 interlockDetailHistory.setControlSystemStatusName(base.getControlSystemStatusAbnormalName());//当前控制系统状态的名称
                             }
+                            //输入卡件状态名称写入
+                            if(interlockDetailHistory.getInputStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                                interlockDetailHistory.setInputStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+                            }else{//故障
+                                interlockDetailHistory.setInputStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+                            }
+                            //输出卡件状态名称写入
+                            if(interlockDetailHistory.getOutputStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                                interlockDetailHistory.setOutputStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+                            }else{//故障
+                                interlockDetailHistory.setOutputStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+                            }
+                            //MP卡件状态名称写入
+                            if(interlockDetailHistory.getMpStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                                interlockDetailHistory.setMpStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+                            }else{//故障
+                                interlockDetailHistory.setMpStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+                            }
                             detailHistoryService.save(interlockDetailHistory);
 
                         }else {
@@ -711,6 +747,24 @@ public class PostgreSQLClient implements ApplicationRunner {
                                     }else{//故障
                                         interlockDetailHistory.setControlSystemStatusName(base.getControlSystemStatusAbnormalName());//当前控制系统状态的名称
                                     }
+                                    //输入卡件状态名称写入
+                                    if(interlockDetailHistory.getInputStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                                        interlockDetailHistory.setInputStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+                                    }else{//故障
+                                        interlockDetailHistory.setInputStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+                                    }
+                                    //输出卡件状态名称写入
+                                    if(interlockDetailHistory.getOutputStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                                        interlockDetailHistory.setOutputStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+                                    }else{//故障
+                                        interlockDetailHistory.setOutputStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+                                    }
+                                    //MP卡件状态名称写入
+                                    if(interlockDetailHistory.getMpStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                                        interlockDetailHistory.setMpStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+                                    }else{//故障
+                                        interlockDetailHistory.setMpStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+                                    }
                                     historyList.add(interlockDetailHistory);
                                 }
                                 detailHistoryService.saveBatch(historyList);

jeecg-module-interlock/src/main/java/org/jeecg/modules/history/mapper/xml/InterlockDetailHistoryMapper.xml

@@ -36,11 +36,8 @@
         select d.id, d.summaryid, d.interlockname, d.interlock_condition, d.interlock_condition_tag, d.description,
         d.instrument_status, d.interlock_set_value, d.current_value, d.if_bypass, d.bypass, d.input_status,
         d.output_status, d.mp_status, s.ljgx, s.interlock_out_value, s.tag_time, d.summary_origin_id,
-        d.control_system_status_name as mp_status_name,
-        d.control_system_status_name as input_status_name,
-        d.control_system_status_name as output_status_name,
-        d.bypass_name,
-        d.instrument_status_name,
+        d.mp_status_name, d.input_status_name, d.output_status_name,
+        d.bypass_name, d.instrument_status_name,
         d.instrument_status_normal, d.bypass_yes, s.interlock_status_ty, d.control_system_status_normal,
         d.interlock_current_unit, d.interlock_set_unit,
         d.bypass_tag, d.input_status_tag, d.output_status_tag, d.mp_status_tag, s.interlock_out_value_tag, d.instrument_status_tag

jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/service/impl/InterlockSummaryServiceImpl.java

@@ -704,6 +704,24 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
             }else{//故障
                 interlockDetailHistory.setControlSystemStatusName(base.getControlSystemStatusAbnormalName());//当前控制系统状态的名称
             }
+            //输入卡件状态名称写入
+            if(interlockDetailHistory.getInputStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                interlockDetailHistory.setInputStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+            }else{//故障
+                interlockDetailHistory.setInputStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+            }
+            //输出卡件状态名称写入
+            if(interlockDetailHistory.getOutputStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                interlockDetailHistory.setOutputStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+            }else{//故障
+                interlockDetailHistory.setOutputStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+            }
+            //MP卡件状态名称写入
+            if(interlockDetailHistory.getMpStatus().equals(interlockDetailHistory.getControlSystemStatusNormal())){//正常
+                interlockDetailHistory.setMpStatusName(interlockDetailHistory.getControlSystemStatusNormalName());
+            }else{//故障
+                interlockDetailHistory.setMpStatusName(interlockDetailHistory.getControlSystemStatusAbnormalName());
+            }
 
             detailHistoryMapper.insert(interlockDetailHistory);