diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index abbc336..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index abbc336..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 2f407dc..be8b099 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); +// LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index abbc336..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 2f407dc..be8b099 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); +// LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..e8eabec 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,7 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + //LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + LogHelper.Error("出现数据无法入库:" + f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index abbc336..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 2f407dc..be8b099 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); +// LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..e8eabec 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,7 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + //LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + LogHelper.Error("出现数据无法入库:" + f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index abbc336..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 2f407dc..be8b099 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); +// LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..e8eabec 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,7 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + //LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + LogHelper.Error("出现数据无法入库:" + f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 68ae617..87fb2a4 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1592,7 +1592,8 @@ GSOLayer lsLayer = node.Tag as GSOLayer; if (lsLayer == null) { - LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); +// LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); + LogHelper.Error("要定位的临时图层不存在：" + node.Text); return; } double x = lsLayer.LatLonBounds.Center.X; @@ -7211,7 +7212,8 @@ catch (Exception ex) { redSH = false; - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("",ex); } } void addRedLineDataToDataGridView(List dt, DataGridView dataGridView) @@ -7333,7 +7335,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7365,7 +7368,8 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); +// LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index abbc336..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 2f407dc..be8b099 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); +// LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..e8eabec 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,7 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + //LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + LogHelper.Error("出现数据无法入库:" + f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 68ae617..87fb2a4 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1592,7 +1592,8 @@ GSOLayer lsLayer = node.Tag as GSOLayer; if (lsLayer == null) { - LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); +// LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); + LogHelper.Error("要定位的临时图层不存在：" + node.Text); return; } double x = lsLayer.LatLonBounds.Center.X; @@ -7211,7 +7212,8 @@ catch (Exception ex) { redSH = false; - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("",ex); } } void addRedLineDataToDataGridView(List dt, DataGridView dataGridView) @@ -7333,7 +7335,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7365,7 +7368,8 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); +// LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); diff --git a/Utility.cs b/Utility.cs index 39d47cc..c65bf59 100644 --- a/Utility.cs +++ b/Utility.cs @@ -598,7 +598,10 @@ #endregion } - + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 public static string GetRoleServer() { string roleserver = ""; @@ -617,7 +620,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + //LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } finally { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index abbc336..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 2f407dc..be8b099 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); +// LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..e8eabec 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,7 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + //LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + LogHelper.Error("出现数据无法入库:" + f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 68ae617..87fb2a4 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1592,7 +1592,8 @@ GSOLayer lsLayer = node.Tag as GSOLayer; if (lsLayer == null) { - LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); +// LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); + LogHelper.Error("要定位的临时图层不存在：" + node.Text); return; } double x = lsLayer.LatLonBounds.Center.X; @@ -7211,7 +7212,8 @@ catch (Exception ex) { redSH = false; - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("",ex); } } void addRedLineDataToDataGridView(List dt, DataGridView dataGridView) @@ -7333,7 +7335,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7365,7 +7368,8 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); +// LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); diff --git a/Utility.cs b/Utility.cs index 39d47cc..c65bf59 100644 --- a/Utility.cs +++ b/Utility.cs @@ -598,7 +598,10 @@ #endregion } - + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 public static string GetRoleServer() { string roleserver = ""; @@ -617,7 +620,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + //LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } finally { diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..3a184e0 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,8 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); +// LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +248,8 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); +// LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +318,8 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); +// LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +391,9 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); +// LogHelper.WriteLog(typeof(FieldEmptyValidate), +// "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index abbc336..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 2f407dc..be8b099 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); +// LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..e8eabec 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,7 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + //LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + LogHelper.Error("出现数据无法入库:" + f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 68ae617..87fb2a4 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1592,7 +1592,8 @@ GSOLayer lsLayer = node.Tag as GSOLayer; if (lsLayer == null) { - LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); +// LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); + LogHelper.Error("要定位的临时图层不存在：" + node.Text); return; } double x = lsLayer.LatLonBounds.Center.X; @@ -7211,7 +7212,8 @@ catch (Exception ex) { redSH = false; - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("",ex); } } void addRedLineDataToDataGridView(List dt, DataGridView dataGridView) @@ -7333,7 +7335,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7365,7 +7368,8 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); +// LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); diff --git a/Utility.cs b/Utility.cs index 39d47cc..c65bf59 100644 --- a/Utility.cs +++ b/Utility.cs @@ -598,7 +598,10 @@ #endregion } - + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 public static string GetRoleServer() { string roleserver = ""; @@ -617,7 +620,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + //LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } finally { diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..3a184e0 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,8 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); +// LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +248,8 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); +// LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +318,8 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); +// LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +391,9 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); +// LogHelper.WriteLog(typeof(FieldEmptyValidate), +// "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index abbc336..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 2f407dc..be8b099 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); +// LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..e8eabec 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,7 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + //LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + LogHelper.Error("出现数据无法入库:" + f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 68ae617..87fb2a4 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1592,7 +1592,8 @@ GSOLayer lsLayer = node.Tag as GSOLayer; if (lsLayer == null) { - LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); +// LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); + LogHelper.Error("要定位的临时图层不存在：" + node.Text); return; } double x = lsLayer.LatLonBounds.Center.X; @@ -7211,7 +7212,8 @@ catch (Exception ex) { redSH = false; - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("",ex); } } void addRedLineDataToDataGridView(List dt, DataGridView dataGridView) @@ -7333,7 +7335,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7365,7 +7368,8 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); +// LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); diff --git a/Utility.cs b/Utility.cs index 39d47cc..c65bf59 100644 --- a/Utility.cs +++ b/Utility.cs @@ -598,7 +598,10 @@ #endregion } - + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 public static string GetRoleServer() { string roleserver = ""; @@ -617,7 +620,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + //LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } finally { diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..3a184e0 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,8 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); +// LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +248,8 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); +// LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +318,8 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); +// LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +391,9 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); +// LogHelper.WriteLog(typeof(FieldEmptyValidate), +// "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/log/2016/201611/20161129_ERROR.txt b/bin/x86/Debug/log/2016/201611/20161129_ERROR.txt new file mode 100644 index 0000000..d5ef05f --- /dev/null +++ b/bin/x86/Debug/log/2016/201611/20161129_ERROR.txt @@ -0,0 +1,8 @@ + + +��¼ʱ�䣺2016-11-29 16:55:49,203 +�߳�ID:[8] +��־���� ERROR +�����ࣺCyberpipe.FrmLogin property: [(null)] - +����������������־���� + diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index abbc336..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 2f407dc..be8b099 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); +// LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..e8eabec 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,7 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + //LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + LogHelper.Error("出现数据无法入库:" + f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 68ae617..87fb2a4 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1592,7 +1592,8 @@ GSOLayer lsLayer = node.Tag as GSOLayer; if (lsLayer == null) { - LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); +// LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); + LogHelper.Error("要定位的临时图层不存在：" + node.Text); return; } double x = lsLayer.LatLonBounds.Center.X; @@ -7211,7 +7212,8 @@ catch (Exception ex) { redSH = false; - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("",ex); } } void addRedLineDataToDataGridView(List dt, DataGridView dataGridView) @@ -7333,7 +7335,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7365,7 +7368,8 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); +// LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); diff --git a/Utility.cs b/Utility.cs index 39d47cc..c65bf59 100644 --- a/Utility.cs +++ b/Utility.cs @@ -598,7 +598,10 @@ #endregion } - + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 public static string GetRoleServer() { string roleserver = ""; @@ -617,7 +620,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + //LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } finally { diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..3a184e0 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,8 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); +// LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +248,8 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); +// LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +318,8 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); +// LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +391,9 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); +// LogHelper.WriteLog(typeof(FieldEmptyValidate), +// "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/log/2016/201611/20161129_ERROR.txt b/bin/x86/Debug/log/2016/201611/20161129_ERROR.txt new file mode 100644 index 0000000..d5ef05f --- /dev/null +++ b/bin/x86/Debug/log/2016/201611/20161129_ERROR.txt @@ -0,0 +1,8 @@ + + +��¼ʱ�䣺2016-11-29 16:55:49,203 +�߳�ID:[8] +��־���� ERROR +�����ࣺCyberpipe.FrmLogin property: [(null)] - +����������������־���� + diff --git a/bin/x86/Debug/log/2016/201611/20161129_WARN.txt b/bin/x86/Debug/log/2016/201611/20161129_WARN.txt new file mode 100644 index 0000000..aba186f --- /dev/null +++ b/bin/x86/Debug/log/2016/201611/20161129_WARN.txt @@ -0,0 +1,8 @@ + + +RECORDTIME��2016-11-29 16:55:49,203 +THREADID:[8] +LEVEL�� ERROR +ERRORCLASS��Cyberpipe.FrmLogin property: [(null)] - +ERRORDESC��������־���� + diff --git a/Cyberpipe.suo b/Cyberpipe.suo index f78f4b3..1172ba4 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FeatureTools.cs b/FeatureTools.cs index 0ba33d7..3c08f34 100644 --- a/FeatureTools.cs +++ b/FeatureTools.cs @@ -44,7 +44,7 @@ } feature.Delete();//地球上删除该feature string sql = "delete from " + layerName + " where LSSYS_ID =" + feature.ID + " and (编号 is null or substr(编号,length(编号)-2)='TMP')"; - OledbHelper.sqlExecuteNonQuery(sql);//目前无法取到LSSYS_ID，所以这个判断条件不太合适，会导致把该类所有新建的都删除了 + OledbHelper.sqlExecuteNonQuery(sql); } catch (Exception) { diff --git a/Forms/FrmPipelineModelDataBase.cs b/Forms/FrmPipelineModelDataBase.cs index b577fd8..d34fb00 100644 --- a/Forms/FrmPipelineModelDataBase.cs +++ b/Forms/FrmPipelineModelDataBase.cs @@ -149,7 +149,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); +// LogHelper.WriteLog(typeof(FrmPipelineModelDB), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 7983349..f1552fd 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -100,7 +100,8 @@ catch (Exception ex) { LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); +// LogHelper.WriteLog(typeof(FrmAddWellShp), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmBSQStatis.cs b/FrmBSQStatis.cs index 5b05926..125ac79 100644 --- a/FrmBSQStatis.cs +++ b/FrmBSQStatis.cs @@ -97,7 +97,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); +// LogHelper.WriteLog(typeof(FrmBSQStatis),ex.Message); + LogHelper.Error(ex.Message); } return typeAndCount; } @@ -108,7 +109,8 @@ GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption("标识器"); GSOFeatures bsqFs = FeatureStatisticsService.GetLayerFeatures(polygon, layer); if (bsqFs == null || bsqFs.Length <= 0) { - LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); +// LogHelper.WriteLog(typeof(FrmBSQStatis),"标识器图层下的Feature为空"); + LogHelper.Error("标识器图层下的Feature为空!"); return null; } diff --git a/FrmBasicQuery.cs b/FrmBasicQuery.cs index baeeade..0896724 100644 --- a/FrmBasicQuery.cs +++ b/FrmBasicQuery.cs @@ -224,7 +224,8 @@ } catch(Exception ex) { - LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmBasicQuery), ex.Message); + LogHelper.Error(ex.Message); } } else diff --git a/FrmCodingQuery.cs b/FrmCodingQuery.cs index f1ac322..f0df466 100644 --- a/FrmCodingQuery.cs +++ b/FrmCodingQuery.cs @@ -82,7 +82,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); ; +// LogHelper.WriteLog(typeof(FrmCodingQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmDiameterQuery.cs b/FrmDiameterQuery.cs index e7b3657..776431b 100644 --- a/FrmDiameterQuery.cs +++ b/FrmDiameterQuery.cs @@ -150,7 +150,8 @@ catch (Exception ex) { //LogError.PublishError(ex); - LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmDiameterQuery), ex.Message); + LogHelper.Error(ex.Message); MessageBox.Show("请输入正确的管径范围！"); return; } diff --git a/FrmFittingQuery.cs b/FrmFittingQuery.cs index 12f6007..a415040 100644 --- a/FrmFittingQuery.cs +++ b/FrmFittingQuery.cs @@ -69,7 +69,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmFittingQuery), ex.Message); + LogHelper.Error(ex.Message); } } /// diff --git a/FrmKeywordQuery.cs b/FrmKeywordQuery.cs index 405524f..5307f8d 100644 --- a/FrmKeywordQuery.cs +++ b/FrmKeywordQuery.cs @@ -87,7 +87,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); +// LogHelper.WriteLog(typeof(FrmKeywordQuery), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmLogin.cs b/FrmLogin.cs index 898feaa..928ed64 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -45,16 +45,6 @@ } } /// - /// 关闭按钮事件处理 - /// - /// - /// - private void button2_Click(object sender, EventArgs e) - { - Close(); - } - - /// /// 验证用户名、密码 /// /// @@ -72,6 +62,7 @@ while (reader.Read()) { Utility.userRole = reader[0].ToString(); + LogHelper.Error("测试"); break; } } diff --git a/FrmMaterialSel.cs b/FrmMaterialSel.cs index 8645ab3..ca6e5fe 100644 --- a/FrmMaterialSel.cs +++ b/FrmMaterialSel.cs @@ -157,7 +157,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); +// LogHelper.WriteLog(typeof(FrmMaterialSel), ex.Message); + LogHelper.Error(ex.Message); } } diff --git a/FrmpipeMaterialGather.cs b/FrmpipeMaterialGather.cs index abbc336..5ca8144 100644 --- a/FrmpipeMaterialGather.cs +++ b/FrmpipeMaterialGather.cs @@ -58,10 +58,9 @@ for (int i = 0; i < pipeLayerNames.Count; i++) { clbPipeLine.Items.Add(pipeLayerNames[i]); - GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); - if (layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; + GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(pipeLayerNames[i]); + if (layer == null || layer.Dataset == null || !layer.Dataset.IsFeatureDataset || layer.Type != EnumLayerType.FeatureLayer) continue; - string name = layer.Name; GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures feats = flayer.GetAllFeatures(); @@ -205,7 +204,7 @@ { chart1.Series.Add(clbPipeLine.CheckedItems[i].ToString()); GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption(clbPipeLine.CheckedItems[i].ToString()); - if (layer != null && layer is GSOFeatureLayer) + if (layer is GSOFeatureLayer) { GSOFeatureLayer flayer = layer as GSOFeatureLayer; GSOFeatures features = flayer.GetAllFeatures(); @@ -240,10 +239,9 @@ labeStyleAxisX.Enabled = true; chart1.ChartAreas["ChartArea1"].AxisX.LabelStyle = labeStyleAxisX; - Dictionary dic1 = new Dictionary(); for (int j = 0; j < chart1.Series.Count; j++) { - dic1 = new Dictionary(); + Dictionary dic1 = new Dictionary(); foreach (string key in dic.Keys) { if (key.Contains(chart1.Series[j].Name)) diff --git a/Frmpipediameterstatis.cs b/Frmpipediameterstatis.cs index 2f407dc..be8b099 100644 --- a/Frmpipediameterstatis.cs +++ b/Frmpipediameterstatis.cs @@ -202,8 +202,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); +// LogHelper.WriteLog(typeof(Frmpipediameterstatis), ex.Message); //MessageBox.Show(ex.Message); + LogHelper.Error(ex.Message); LogError.PublishError(ex); } } diff --git a/LineBuilder.cs b/LineBuilder.cs index 33a216c..e8eabec 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,7 +43,8 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { - LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + //LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); + LogHelper.Error("出现数据无法入库:" + f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/LogHelper.cs b/LogHelper.cs index 9ef5f27..04573cf 100644 --- a/LogHelper.cs +++ b/LogHelper.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using log4net; using log4net.Config; @@ -7,35 +8,82 @@ { public class LogHelper { - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, Exception ex) - public static void WriteLog(Type t, Exception ex) + private static ILog _logdebug = log4net.LogManager.GetLogger("logdebug"); + private static ILog _loginfo = log4net.LogManager.GetLogger("loginfo"); + private static ILog _logwarn = log4net.LogManager.GetLogger("logwarn"); + private static ILog _logerror = log4net.LogManager.GetLogger("logerror"); + private static ILog _logfatal = log4net.LogManager.GetLogger("logfatal"); + + public static void Debug(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error("Error", ex); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg); + } + public static void Debug(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logdebug.Debug(msg, e); } - #endregion - /// - /// 输出日志到Log4Net - /// - /// - /// - #region static void WriteLog(Type t, string msg) - - public static void WriteLog(Type t, string msg) + public static void Info(string msg) { - ILog log = log4net.LogManager.GetLogger(t); - log.Error(msg); + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg); + } + public static void Info(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _loginfo.Info(msg, e); } - #endregion + + public static void Warn(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg); + } + public static void Warn(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logwarn.Warn(msg, e); + } + + + public static void Error(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg); + } + public static void Error(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logerror.Error(msg, e); + } + + + public static void Fatal(string msg) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg); + } + public static void Fatal(string msg, Exception e) + { + StackFrame sf = new StackFrame(1); + msg = string.Format("{0}.{1}:{2}", sf.GetMethod().ReflectedType.FullName, sf.GetMethod().Name, msg); + _logfatal.Fatal(msg, e); + } + } diff --git a/MainFrm.cs b/MainFrm.cs index 68ae617..87fb2a4 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -1592,7 +1592,8 @@ GSOLayer lsLayer = node.Tag as GSOLayer; if (lsLayer == null) { - LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); +// LogHelper.WriteLog(typeof(MainFrm), "要定位的临时图层不存在：" + node.Text); + LogHelper.Error("要定位的临时图层不存在：" + node.Text); return; } double x = lsLayer.LatLonBounds.Center.X; @@ -7211,7 +7212,8 @@ catch (Exception ex) { redSH = false; - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("",ex); } } void addRedLineDataToDataGridView(List dt, DataGridView dataGridView) @@ -7333,7 +7335,8 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(MainFrm), ex); +// LogHelper.WriteLog(typeof(MainFrm), ex); + LogHelper.Debug("", ex); } } } @@ -7365,7 +7368,8 @@ GSOLayer layer = globeControl1.Globe.Layers.Add(strDataPath); if (layer == null) {//wxl - LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); +// LogHelper.WriteLog(typeof(MainFrm), "buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); + LogHelper.Error("buttonItemHX1_Click操作中，" + strDataPath + "的layer为空"); continue; } GSOFeatures redFeatures = layer.GetAllFeatures(); diff --git a/Utility.cs b/Utility.cs index 39d47cc..c65bf59 100644 --- a/Utility.cs +++ b/Utility.cs @@ -598,7 +598,10 @@ #endregion } - + /// + /// 获取Config.xml配置文件中的roleurl配置，并返回 + /// + /// 请求综合信息平台的服务地址 public static string GetRoleServer() { string roleserver = ""; @@ -617,7 +620,9 @@ } catch (Exception ex) { - LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + //LogHelper.WriteLog(typeof(Utility),"在config.xml配置文件中读取roleurl时出错"); + + LogHelper.Error("在config.xml配置文件中读取roleurl时出错"); } finally { diff --git a/ValidateInfo.cs b/ValidateInfo.cs index de75391..3a184e0 100644 --- a/ValidateInfo.cs +++ b/ValidateInfo.cs @@ -192,7 +192,8 @@ } if (!isSuccess) { - LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); +// LogHelper.WriteLog(typeof(FieldUniqueValidate), logStr); + LogHelper.Error(logStr); } return isSuccess; } @@ -247,7 +248,8 @@ err += "未找到字段或其类型匹配:" + unFoundField.label + ":" + unFoundField.type + "\r\n"; } - LogHelper.WriteLog(typeof(FieldCountValidate), err); +// LogHelper.WriteLog(typeof(FieldCountValidate), err); + LogHelper.Error(err); return false; } return true; @@ -316,7 +318,8 @@ { err += "字段:" + field.label + "出错\r\n"; } - LogHelper.WriteLog(typeof(FieldOrderValidate), err); +// LogHelper.WriteLog(typeof(FieldOrderValidate), err); + LogHelper.Error(err); return false; } return true; @@ -388,8 +391,9 @@ } if (isSuccess == false) { - LogHelper.WriteLog(typeof(FieldEmptyValidate), - "字段为空检查失败:\r\n" + err); +// LogHelper.WriteLog(typeof(FieldEmptyValidate), +// "字段为空检查失败:\r\n" + err); + LogHelper.Error("字段为空检查失败:\r\n" + err); } return isSuccess; } diff --git a/bin/x86/Debug/config/log4net.config b/bin/x86/Debug/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/bin/x86/Debug/config/log4net.config +++ b/bin/x86/Debug/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x86/Debug/log/2016/201611/20161129_ERROR.txt b/bin/x86/Debug/log/2016/201611/20161129_ERROR.txt new file mode 100644 index 0000000..d5ef05f --- /dev/null +++ b/bin/x86/Debug/log/2016/201611/20161129_ERROR.txt @@ -0,0 +1,8 @@ + + +��¼ʱ�䣺2016-11-29 16:55:49,203 +�߳�ID:[8] +��־���� ERROR +�����ࣺCyberpipe.FrmLogin property: [(null)] - +����������������־���� + diff --git a/bin/x86/Debug/log/2016/201611/20161129_WARN.txt b/bin/x86/Debug/log/2016/201611/20161129_WARN.txt new file mode 100644 index 0000000..aba186f --- /dev/null +++ b/bin/x86/Debug/log/2016/201611/20161129_WARN.txt @@ -0,0 +1,8 @@ + + +RECORDTIME��2016-11-29 16:55:49,203 +THREADID:[8] +LEVEL�� ERROR +ERRORCLASS��Cyberpipe.FrmLogin property: [(null)] - +ERRORDESC��������־���� + diff --git a/config/log4net.config b/config/log4net.config index 80f9b25..6fbcfa7 100644 --- a/config/log4net.config +++ b/config/log4net.config @@ -3,29 +3,118 @@
- - - - - - - - - - - - - - - + + + -property: [%property{NDC}] - %n错误描述：%message%newline %n"/> - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +